[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (04cf5707dea83f478e0ac67887d06558a8a8d188)

Vlad Glagolev scm at sourcemage.org
Fri Oct 21 08:27:27 EDT 2011


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 dev/null                                                                          |binary
 devel/xmlto/DETAILS                                                               |    2 -
 devel/xmlto/HISTORY                                                               |    3 ++
 e-17/embryo/DETAILS                                                               |    2 -
 e-17/embryo/HISTORY                                                               |    3 ++
 fonts-x11/cantarell-fonts/DETAILS                                                 |    2 -
 fonts-x11/cantarell-fonts/HISTORY                                                 |    3 ++
 fonts-x11/cantarell-fonts/cantarell-fonts-0.0.6.tar.bz2.sig                       |    0 
 fonts-x11/cantarell-fonts/cantarell-fonts-0.0.7.tar.bz2.sig                       |binary
 ftp/transmission/DEPENDS                                                          |    4 +-
 ftp/transmission/DETAILS                                                          |    2 -
 ftp/transmission/HISTORY                                                          |    4 ++
 ftp/transmission/transmission-2.41.tar.bz2.sig                                    |    0 
 ftp/transmission/transmission-2.42.tar.bz2.sig                                    |binary
 gnome2-apps/evolution/DEPENDS                                                     |    5 ---
 gnome2-apps/evolution/HISTORY                                                     |    3 ++
 gnome2-apps/gedit/DEPENDS                                                         |    4 +-
 gnome2-apps/gedit/HISTORY                                                         |    4 ++
 gnome2-apps/giggle/DEPENDS                                                        |    7 ++--
 gnome2-apps/giggle/DETAILS                                                        |    2 -
 gnome2-apps/giggle/HISTORY                                                        |    5 +++
 gnome2-apps/giggle/giggle-0.5.tar.bz2.sig                                         |    0 
 gnome2-apps/giggle/giggle-0.6.tar.bz2.sig                                         |binary
 gnome2-apps/gnome-disk-utility/DEPENDS                                            |    4 +-
 gnome2-apps/gnome-disk-utility/HISTORY                                            |    4 ++
 gnome2-libs/gnome-control-center/DEPENDS                                          |    6 +++-
 gnome2-libs/gnome-control-center/HISTORY                                          |    2 -
 gnome2-libs/gnome-icon-theme/DETAILS                                              |    2 -
 gnome2-libs/gnome-icon-theme/HISTORY                                              |    3 ++
 gnome2-libs/gnome-icon-theme/gnome-icon-theme-3.2.0.tar.bz2.sig                   |    0 
 gnome2-libs/gnome-icon-theme/gnome-icon-theme-3.2.1.2.tar.bz2.sig                 |binary
 gnome2-libs/gnome-panel/DEPENDS                                                   |    5 ---
 gnome2-libs/gnome-panel/HISTORY                                                   |    3 ++
 gnome2-libs/gnome-terminal/DETAILS                                                |    2 -
 gnome2-libs/gnome-terminal/HISTORY                                                |    3 ++
 gnome2-libs/gnome-terminal/gnome-terminal-3.2.0.tar.bz2.sig                       |    0 
 gnome2-libs/gnome-terminal/gnome-terminal-3.2.1.tar.bz2.sig                       |binary
 gnome2-libs/pango/HISTORY                                                         |    3 ++
 gnome2-libs/pango/PRE_BUILD                                                       |    3 +-
 gnome3-libs/gnome-icon-theme-symbolic/DETAILS                                     |    2 -
 gnome3-libs/gnome-icon-theme-symbolic/HISTORY                                     |    3 ++
 gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.0.tar.bz2.sig |    0 
 gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.1.tar.bz2.sig |binary
 gnome3-libs/pygobject3/DEPENDS                                                    |    6 ----
 gnome3-libs/pygobject3/HISTORY                                                    |    3 ++
 gnome3-libs/vte3/DETAILS                                                          |    2 -
 gnome3-libs/vte3/HISTORY                                                          |    3 ++
 gnome3-libs/vte3/vte-0.30.0.tar.bz2.sig                                           |    0 
 gnome3-libs/vte3/vte-0.30.1.tar.bz2.sig                                           |binary
 graphics-libs/openjpeg/BUILD                                                      |    1 
 graphics-libs/openjpeg/DETAILS                                                    |    1 
 graphics-libs/openjpeg/HISTORY                                                    |    5 +++
 mail/claws-mail/HISTORY                                                           |    3 ++
 mail/claws-mail/PRE_BUILD                                                         |    7 ++++
 net/quagga/DETAILS                                                                |    1 
 net/quagga/HISTORY                                                                |    4 ++
 shell-term-fm/x3270/DETAILS                                                       |    4 +-
 shell-term-fm/x3270/HISTORY                                                       |    3 ++
 utils/avahi/BUILD                                                                 |    3 ++
 utils/avahi/HISTORY                                                               |    4 ++
 utils/avahi/PRE_SUB_DEPENDS                                                       |    2 +
 utils/avahi/REPAIR^0219b41c8d42a21a6d61fb3e7b5f23c0^PRE_SUB_DEPENDS               |   15 ++++++++++
 utils/avahi/SUB_DEPENDS                                                           |    3 ++
 video/totem/DEPENDS                                                               |    6 ++--
 video/totem/HISTORY                                                               |    4 ++
 65 files changed, 139 insertions(+), 41 deletions(-)

New commits:
commit f6ed8e930e3a860d841c8d4050b7cd1ba1a4d352
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    giggle: => 0.6

commit 42b5191f571be1bab22e52c24bde62fac7b5c153
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    transmission: => 2.42

commit 85da38670d30adeec2cea60efb8ab0d0cd4dbb75
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    pango: don't install extra files (for disabled gtk-doc support)

commit 41dcd137711895d8acbaa13a8a9376880c197ab2
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    quagga: security bump

commit a00fe84bb60e5913e5af810b11f2779a99a8fccf
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    evolution: Removed gtkimageview, current version not supported #308

commit 5bf6b40ddb2eab7af305506ee4d27f770672df9a
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    avahi: Disable QT3 support (won't work with qt4's implementation)
    
    avahi tries to build QT3 support unless you specifically disable it.
    
    grep QT3 /etc/sorcery/local/depends/qt4.p
    	QT_QT3="-qt3support"
    
    ...
    checking for QT3... no
    configure: error: Package requirements ( qt-mt >= 3.0.0 ) were not met:
    
    No package 'qt-mt' found

commit c5935232defbde113f5d4097076e32f83ce3e5a7
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gnome-disk-utility: Requires avahi built with gtk+3 support for Avahi UI
    Depends on gtk+3, not gtk+2

commit fe5fde4b284311fd742933e70a14cf3c4b999f82
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    avahi: Allow requiring gtk+3 optional dependency

commit 7f75bb1b6f8583f721beff504307331ea2ffcf87
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    embryo: No longer hosted on SF, moved to enlightenment.org

commit a06e3da9c5aaa197ded19044a58022f7015789f4
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    openjpeg: Link against -lm or -Wl,--as-needed may break #306
    PATCHLEVEL++

commit 8b125e6734c9bf6a0c0f27e9a8e8aa2c3911e1bc
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "openjpeg: Link against -lm or -Wl,--as-needed may break #306"
    
    This reverts commit f14ccd4838a537bb2b23e8cd16db01f70381fa95.
    
    Forgot PATCHLEVEL++

commit f14ccd4838a537bb2b23e8cd16db01f70381fa95
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    openjpeg: Link against -lm or -Wl,--as-needed may break #306

commit ff1c5847b5f5ad2f064174cc4af15f70c68e78bf
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    cantarell-fonts 0.0.7

commit ca5f92f02b42dae3ce47e11ff5dc78353034e362
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gnome-icon-theme-symbolic 3.2.1

commit c526421285ce8480eccc23a8e514584f739606c4
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gnome-icon-theme 3.2.1.2

commit f8d9a4cb7b53a1e575116da7d1120de0f3cd4304
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gnome-panel: Does not use policykit-gnome anymore
    
    configure: WARNING: unrecognized options: --enable-polkit

commit 844178858f8ec904c0275c99f0dca22d3001f6d5
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    xmlto: WEB_SITE moved to https://fedorahosted.org/xmlto/

commit 4ac861c5346a841f5ff1b6d7618c8b1fd91c9b23
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gedit: Requires gtksourceview3 not gtksourceview
    
    checking for GEDIT... no
    configure: error: Package requirements (
            libxml-2.0 >= 2.5.0
            glib-2.0 >= 2.28.0
            gthread-2.0 >= 2.13.0
            gio-2.0 >= 2.26.0
            gtk+-3.0 >= 3.1.6
            gtksourceview-3.0 >= 3.0.0
            libpeas-1.0 >= 0.7.3
            libpeas-gtk-1.0 >= 1.1.0
            gsettings-desktop-schemas
    ) were not met:
    
    No package 'gtksourceview-3.0' found

commit 723a2442d66aeaeca3972ae7f3b4d019d415e126
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gedit: Requires pygobject3 not pygobject
    
    checking for PYTHON... no
    configure: error: Package requirements (pygobject-3.0 >= 2.90.2) were
    not met:
    
    No package 'pygobject-3.0' found

commit 35e63a70fe51569486fd50e133dfc216167de5a0
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    pygobject3: gobject-introspection is now required
    
    configure: WARNING: unrecognized options: --enable-introspection
    
    Without gobject-introspection installed:
    checking for GIO... yes
    checking for GI... no
    configure: error: Package requirements (glib-2.0 >= 2.24.0
        gobject-introspection-1.0 >= 1.29.0
    ) were not met:
    
    No package 'gobject-introspection-1.0' found

commit e7ba30ee0517e2631060cb7bf0cb820c810b5b3b
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    totem: Still depends on dbus-glib (links), but does not know --with-dbus
    
    configure: WARNING: unrecognized options: --with-dbus

commit 05c57de90d48a00f4564a90534f0d9f44b2052fa
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    totem: Python support required pygobject3
    
    checking for python extension module directory...
    ${exec_prefix}/lib/python2.7/site-packages
    checking for PYGOBJECT... no
    configure: error: python >= 2.3 or pygobject-3.0 >= 2.90.3 not found

commit ed3e4231232a70047f56232597bc7f57785c5955
Author: Tommy Boatman <tboatman_smgl at live.com>
Commit: Tommy Boatman <tboatman_smgl at live.com>

       x3270: version bump 3.3.12ga7

commit 837f4d856dd6fb18ea3f58002e12dd2d8d6b0265
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    gnome-control-center: added missing optional dep on cups

commit 0316caa0a20759d9be63c0e5ef894461d388e92e
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gnome-terminal 3.2.1

commit 132a7f01fe26d06b455091ecb060412e786b5b86
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    vte3 0.30.1

commit 3e1fe68065f78e947a18f0e574e4bbe332b43df0
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    mail/claws-mail: fixed compilation with gnutls 3.0.x

diff --git a/devel/xmlto/DETAILS b/devel/xmlto/DETAILS
index 918866e..ed9b555 100755
--- a/devel/xmlto/DETAILS
+++ b/devel/xmlto/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
  SOURCE_HINTS[0]="no-check-certificate"
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
 SOURCE2_HINTS[0]="no-check-certificate"
-        WEB_SITE=http://cyberelk.net/tim/xmlto/
+        WEB_SITE=https://fedorahosted.org/xmlto/
          ENTERED=20030619
      SOURCE_HASH=sha512:f503b30f7bda2bc8e5c3cf422503c2c73148b6a74959df2e01107509c8a6d30cbc3204e45b212ed7c459ac6a631e72559b950a0a7916ae89815d3c8fab5141bd
 #      SOURCE_GPG=xmlto.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/devel/xmlto/HISTORY b/devel/xmlto/HISTORY
index f9f6f25..d7f6d09 100644
--- a/devel/xmlto/HISTORY
+++ b/devel/xmlto/HISTORY
@@ -1,3 +1,6 @@
+2011-10-20 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: WEB_SITE moved to https://fedorahosted.org/xmlto/
+
 2011-10-14 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed long description wrap (scripted)
 
diff --git a/e-17/embryo/DETAILS b/e-17/embryo/DETAILS
index 6294b97..9fa354d 100755
--- a/e-17/embryo/DETAILS
+++ b/e-17/embryo/DETAILS
@@ -15,7 +15,7 @@ else
          VERSION=1.0.0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
+   SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
      SOURCE_HASH=sha512:9d311d4c78d717458b471c49e3cc3a15aaba501e1fef718d43117d241766b25169e7909be182b68015b86c754663e25bbb3cdcd6a37c4df8b6962cb31c8649c8
 fi
       LICENSE[0]=BSD
diff --git a/e-17/embryo/HISTORY b/e-17/embryo/HISTORY
index a151917..e7dfab1 100644
--- a/e-17/embryo/HISTORY
+++ b/e-17/embryo/HISTORY
@@ -1,3 +1,6 @@
+2011-10-20 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: No longer hosted on SF, moved to enlightenment.org
+
 2011-09-22 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
 
diff --git a/fonts-x11/cantarell-fonts/DETAILS b/fonts-x11/cantarell-fonts/DETAILS
index 7258724..4615679 100755
--- a/fonts-x11/cantarell-fonts/DETAILS
+++ b/fonts-x11/cantarell-fonts/DETAILS
@@ -1,5 +1,5 @@
            SPELL=cantarell-fonts
-         VERSION=0.0.6
+         VERSION=0.0.7
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/fonts-x11/cantarell-fonts/HISTORY b/fonts-x11/cantarell-fonts/HISTORY
index 7086860..00d01cf 100644
--- a/fonts-x11/cantarell-fonts/HISTORY
+++ b/fonts-x11/cantarell-fonts/HISTORY
@@ -1,3 +1,6 @@
+2011-10-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.0.7
+
 2011-04-14 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: spell created, version 0.0.6
 
diff --git a/fonts-x11/cantarell-fonts/cantarell-fonts-0.0.6.tar.bz2.sig b/fonts-x11/cantarell-fonts/cantarell-fonts-0.0.6.tar.bz2.sig
deleted file mode 100644
index 4711c5e..0000000
Binary files a/fonts-x11/cantarell-fonts/cantarell-fonts-0.0.6.tar.bz2.sig and /dev/null differ
diff --git a/fonts-x11/cantarell-fonts/cantarell-fonts-0.0.7.tar.bz2.sig b/fonts-x11/cantarell-fonts/cantarell-fonts-0.0.7.tar.bz2.sig
new file mode 100644
index 0000000..d08d0ef
Binary files /dev/null and b/fonts-x11/cantarell-fonts/cantarell-fonts-0.0.7.tar.bz2.sig differ
diff --git a/ftp/transmission/DEPENDS b/ftp/transmission/DEPENDS
index 894f3b1..0015ea7 100755
--- a/ftp/transmission/DEPENDS
+++ b/ftp/transmission/DEPENDS
@@ -12,8 +12,8 @@ fi &&
 runtime_depends zlib &&
 
 optional_depends gtk+2 \
-                 "--enable-gtk" \
-                 "--disable-gtk" \
+                 "--with-gtk" \
+                 "--without-gtk" \
                  "for GTK+2 client" &&
 
 if is_depends_enabled $SPELL gtk+2; then
diff --git a/ftp/transmission/DETAILS b/ftp/transmission/DETAILS
index b675ec7..925261b 100755
--- a/ftp/transmission/DETAILS
+++ b/ftp/transmission/DETAILS
@@ -1,5 +1,5 @@
            SPELL=transmission
-         VERSION=2.41
+         VERSION=2.42
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://download.transmissionbt.com/files/$SOURCE
diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY
index fdfa98c..e512dbf 100644
--- a/ftp/transmission/HISTORY
+++ b/ftp/transmission/HISTORY
@@ -1,3 +1,7 @@
+2011-10-21 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.42
+	* DEPENDS: renewed gtk flags
+
 2011-10-10 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.41; updated SOURCE_URL
 
diff --git a/ftp/transmission/transmission-2.41.tar.bz2.sig b/ftp/transmission/transmission-2.41.tar.bz2.sig
deleted file mode 100644
index 69d620c..0000000
Binary files a/ftp/transmission/transmission-2.41.tar.bz2.sig and /dev/null differ
diff --git a/ftp/transmission/transmission-2.42.tar.bz2.sig b/ftp/transmission/transmission-2.42.tar.bz2.sig
new file mode 100644
index 0000000..76e6816
Binary files /dev/null and b/ftp/transmission/transmission-2.42.tar.bz2.sig differ
diff --git a/gnome2-apps/evolution/DEPENDS b/gnome2-apps/evolution/DEPENDS
index ad6ced9..a3044ae 100755
--- a/gnome2-apps/evolution/DEPENDS
+++ b/gnome2-apps/evolution/DEPENDS
@@ -64,11 +64,6 @@ optional_depends  rarian                                  \
                   "--disable-scrollkeeper"                \
                   "Register with rarian?"                 &&
 
-optional_depends  gtkimageview                            \
-                  "--enable-image-inline"                 \
-                  "--disable-image-inline"                \
-                  "for image-inline plugin"               &&
-
 optional_depends  readpst                                 \
                   "--enable-pst-import"                   \
                   "--disable-pst-import"                  \
diff --git a/gnome2-apps/evolution/HISTORY b/gnome2-apps/evolution/HISTORY
index de1ec1d..93e8fda 100644
--- a/gnome2-apps/evolution/HISTORY
+++ b/gnome2-apps/evolution/HISTORY
@@ -1,3 +1,6 @@
+2011-10-20 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Removed gtkimageview, current version not supported #308
+
 2011-10-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.2.0
 
diff --git a/gnome2-apps/gedit/DEPENDS b/gnome2-apps/gedit/DEPENDS
index 6bdc8a4..da6ca4c 100755
--- a/gnome2-apps/gedit/DEPENDS
+++ b/gnome2-apps/gedit/DEPENDS
@@ -3,7 +3,7 @@ depends libxml2          &&
 depends glib2            &&
 depends gtk+3            &&
 depends gconf2           &&
-depends gtksourceview    &&
+depends gtksourceview3   &&
 
 depends libgtkhtml       &&
 depends gnome-doc-utils  &&
@@ -32,7 +32,7 @@ optional_depends  gtk-doc                   \
 
 if is_depends_enabled $SPELL python; then
   depends  gnome-python-desktop  &&
-  depends  pygobject             &&
+  depends  pygobject3            &&
   depends  pygtk2                &&
   depends  pygtksourceview
 fi
diff --git a/gnome2-apps/gedit/HISTORY b/gnome2-apps/gedit/HISTORY
index 0699e40..8046c55 100644
--- a/gnome2-apps/gedit/HISTORY
+++ b/gnome2-apps/gedit/HISTORY
@@ -1,3 +1,7 @@
+2011-10-20 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Requires pygobject3 not pygobject
+	  Requires gtksourceview3 not gtksourceview
+
 2011-10-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.2.0
 
diff --git a/gnome2-apps/giggle/DEPENDS b/gnome2-apps/giggle/DEPENDS
index 4d321f3..8de385f 100755
--- a/gnome2-apps/giggle/DEPENDS
+++ b/gnome2-apps/giggle/DEPENDS
@@ -1,8 +1,9 @@
 depends git &&
 depends glib2 &&
-depends gtk+2 &&
+depends gtk+3 &&
+depends itstool &&
 depends libglade2 &&
-depends gtksourceview &&
+depends gtksourceview3 &&
 
 optional_depends gettext \
                  "--enable-nls" \
@@ -14,7 +15,7 @@ optional_depends evolution-data-server \
                  "--disable-evolution-data-server" \
                  "for Evolution Data Server support" &&
 
-optional_depends vte \
+optional_depends vte3 \
                  "--enable-terminal" \
                  "--disable-terminal" \
                  "for vte terminal widget"
diff --git a/gnome2-apps/giggle/DETAILS b/gnome2-apps/giggle/DETAILS
index ccc7c89..43972aa 100755
--- a/gnome2-apps/giggle/DETAILS
+++ b/gnome2-apps/giggle/DETAILS
@@ -1,5 +1,5 @@
            SPELL=giggle
-         VERSION=0.5
+         VERSION=0.6
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-apps/giggle/HISTORY b/gnome2-apps/giggle/HISTORY
index 7e45834..dded3b6 100644
--- a/gnome2-apps/giggle/HISTORY
+++ b/gnome2-apps/giggle/HISTORY
@@ -1,3 +1,8 @@
+2011-10-21 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.6
+	* DEPENDS: gtk+2 -> gtk+3; gtksourceview -> gtksourceview3; vte -> vte3;
+	  added itstool required dep
+
 2011-05-01 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.5; renewed source and website urls;
 	  quoting paths
diff --git a/gnome2-apps/giggle/giggle-0.5.tar.bz2.sig b/gnome2-apps/giggle/giggle-0.5.tar.bz2.sig
deleted file mode 100644
index 46b3af9..0000000
Binary files a/gnome2-apps/giggle/giggle-0.5.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/giggle/giggle-0.6.tar.bz2.sig b/gnome2-apps/giggle/giggle-0.6.tar.bz2.sig
new file mode 100644
index 0000000..985d0a8
Binary files /dev/null and b/gnome2-apps/giggle/giggle-0.6.tar.bz2.sig differ
diff --git a/gnome2-apps/gnome-disk-utility/DEPENDS b/gnome2-apps/gnome-disk-utility/DEPENDS
index 9943a37..d819279 100755
--- a/gnome2-apps/gnome-disk-utility/DEPENDS
+++ b/gnome2-apps/gnome-disk-utility/DEPENDS
@@ -1,7 +1,7 @@
 depends glib2     &&
-depends gtk+2     &&
+depends gtk+3     &&
 depends udisks    &&
-depends avahi     &&
+depends -sub GTK3  avahi  &&
 depends libnotify &&
 depends unique    &&
 
diff --git a/gnome2-apps/gnome-disk-utility/HISTORY b/gnome2-apps/gnome-disk-utility/HISTORY
index c43c253..1f18cf2 100644
--- a/gnome2-apps/gnome-disk-utility/HISTORY
+++ b/gnome2-apps/gnome-disk-utility/HISTORY
@@ -1,3 +1,7 @@
+2011-10-20 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Requires avahi built with gtk+3 support for Avahi UI
+	  Depends on gtk+3, not gtk+2
+
 2011-07-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.0.2
 
diff --git a/gnome2-libs/gnome-control-center/DEPENDS b/gnome2-libs/gnome-control-center/DEPENDS
index 7204b3e..b80315b 100755
--- a/gnome2-libs/gnome-control-center/DEPENDS
+++ b/gnome2-libs/gnome-control-center/DEPENDS
@@ -38,4 +38,8 @@ optional_depends  xscreensaver                             \
 optional_depends  rarian                                   \
                   '--enable-scrollkeeper'                  \
                   '--disable-scrollkeeper'                 \
-                  'Register with rarian'
+                  'Register with rarian'                   &&
+optional_depends  CUPS                                     \
+                  '--enable-cups'                          \
+                  '--disable-cups'                         \
+                  'for printing support'
diff --git a/gnome2-libs/gnome-control-center/HISTORY b/gnome2-libs/gnome-control-center/HISTORY
index f073aa1..ae0f726 100644
--- a/gnome2-libs/gnome-control-center/HISTORY
+++ b/gnome2-libs/gnome-control-center/HISTORY
@@ -1,5 +1,5 @@
 2011-10-19 Arjan Bouter <abouter at sourcemage.org>
-	* DEPENDS: added missing dep on pulseaudio
+	* DEPENDS: added missing dep on pulseaudio and cups
 
 2011-10-17 Arjan Bouter <abouter at sourcemage.org>
 	* DEPENDS: added missing dep on gnome-online-accounts
diff --git a/gnome2-libs/gnome-icon-theme/DETAILS b/gnome2-libs/gnome-icon-theme/DETAILS
index 11b00fb..3504291 100755
--- a/gnome2-libs/gnome-icon-theme/DETAILS
+++ b/gnome2-libs/gnome-icon-theme/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnome-icon-theme
-         VERSION=3.2.0
+         VERSION=3.2.1.2
           BRANCH=${VERSION:0:3}
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/gnome-icon-theme/HISTORY b/gnome2-libs/gnome-icon-theme/HISTORY
index b49ba01..22476c7 100644
--- a/gnome2-libs/gnome-icon-theme/HISTORY
+++ b/gnome2-libs/gnome-icon-theme/HISTORY
@@ -1,3 +1,6 @@
+2011-10-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.2.1.2
+
 2011-10-01 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.2.0
 
diff --git a/gnome2-libs/gnome-icon-theme/gnome-icon-theme-3.2.0.tar.bz2.sig b/gnome2-libs/gnome-icon-theme/gnome-icon-theme-3.2.0.tar.bz2.sig
deleted file mode 100644
index 1266a7d..0000000
Binary files a/gnome2-libs/gnome-icon-theme/gnome-icon-theme-3.2.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gnome-icon-theme/gnome-icon-theme-3.2.1.2.tar.bz2.sig b/gnome2-libs/gnome-icon-theme/gnome-icon-theme-3.2.1.2.tar.bz2.sig
new file mode 100644
index 0000000..8d64433
Binary files /dev/null and b/gnome2-libs/gnome-icon-theme/gnome-icon-theme-3.2.1.2.tar.bz2.sig differ
diff --git a/gnome2-libs/gnome-panel/DEPENDS b/gnome2-libs/gnome-panel/DEPENDS
index 50cbd16..5b70d73 100755
--- a/gnome2-libs/gnome-panel/DEPENDS
+++ b/gnome2-libs/gnome-panel/DEPENDS
@@ -30,11 +30,6 @@ optional_depends rarian                                        \
                  "--disable-scrollkeeper"                      \
                  "Register with rarian?"                       &&
 
-optional_depends policykit-gnome                               \
-                 "--enable-polkit"                             \
-                 "--disable-polkit"                            \
-                 "Enable PolicyKit support?"                   &&
-
 optional_depends  gtk-doc                                      \
                   '--enable-gtk-doc'                           \
                   '--disable-gtk-doc'                          \
diff --git a/gnome2-libs/gnome-panel/HISTORY b/gnome2-libs/gnome-panel/HISTORY
index 889b4a8..6e528cd 100644
--- a/gnome2-libs/gnome-panel/HISTORY
+++ b/gnome2-libs/gnome-panel/HISTORY
@@ -1,3 +1,6 @@
+2011-10-20 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Does not use policykit-gnome anymore
+
 2011-10-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.2.1
 
diff --git a/gnome2-libs/gnome-terminal/DETAILS b/gnome2-libs/gnome-terminal/DETAILS
index 2a7e82c..8e5416d 100755
--- a/gnome2-libs/gnome-terminal/DETAILS
+++ b/gnome2-libs/gnome-terminal/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnome-terminal
-         VERSION=3.2.0
+         VERSION=3.2.1
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-terminal/HISTORY b/gnome2-libs/gnome-terminal/HISTORY
index f2031ff..398e56b 100644
--- a/gnome2-libs/gnome-terminal/HISTORY
+++ b/gnome2-libs/gnome-terminal/HISTORY
@@ -1,3 +1,6 @@
+2011-10-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.2.1
+
 2011-09-29 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.2.0
 	* DEPENDS: vte -> vte3
diff --git a/gnome2-libs/gnome-terminal/gnome-terminal-3.2.0.tar.bz2.sig b/gnome2-libs/gnome-terminal/gnome-terminal-3.2.0.tar.bz2.sig
deleted file mode 100644
index a8a165e..0000000
Binary files a/gnome2-libs/gnome-terminal/gnome-terminal-3.2.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gnome-terminal/gnome-terminal-3.2.1.tar.bz2.sig b/gnome2-libs/gnome-terminal/gnome-terminal-3.2.1.tar.bz2.sig
new file mode 100644
index 0000000..3ae10e0
Binary files /dev/null and b/gnome2-libs/gnome-terminal/gnome-terminal-3.2.1.tar.bz2.sig differ
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 5ad0a85..73c1f8a 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2011-10-21 Vlad Glagolev <stealth at sourcemage.org>
+	* PRE_BUILD: don't install extra html files when gtk-doc is disabled
+
 2011-10-18 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: removed outdated/broken flags
 	* PRE_BUILD: define GTK_DOC_CHECK m4 function from the file
diff --git a/gnome2-libs/pango/PRE_BUILD b/gnome2-libs/pango/PRE_BUILD
index 2196f02..a65e845 100755
--- a/gnome2-libs/pango/PRE_BUILD
+++ b/gnome2-libs/pango/PRE_BUILD
@@ -2,7 +2,8 @@ default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
 if ! is_depends_enabled $SPELL gtk-doc; then
-  cat "$SPELL_DIRECTORY/fake-gtk-doc-check.m4" >> acinclude.m4
+  cat "$SPELL_DIRECTORY/fake-gtk-doc-check.m4" >> acinclude.m4 &&
+  echo "EXTRA_DIST=" > gtk-doc.make
 fi &&
 
 if ! spell_ok g++; then
diff --git a/gnome3-libs/gnome-icon-theme-symbolic/DETAILS b/gnome3-libs/gnome-icon-theme-symbolic/DETAILS
index f169101..45033c2 100755
--- a/gnome3-libs/gnome-icon-theme-symbolic/DETAILS
+++ b/gnome3-libs/gnome-icon-theme-symbolic/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnome-icon-theme-symbolic
-         VERSION=3.2.0
+         VERSION=3.2.1
           BRANCH=${VERSION:0:3}
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome3-libs/gnome-icon-theme-symbolic/HISTORY b/gnome3-libs/gnome-icon-theme-symbolic/HISTORY
index c49a4df..428561e 100644
--- a/gnome3-libs/gnome-icon-theme-symbolic/HISTORY
+++ b/gnome3-libs/gnome-icon-theme-symbolic/HISTORY
@@ -1,3 +1,6 @@
+2011-10-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.2.1
+
 2011-10-01 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.2.0
 
diff --git a/gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.0.tar.bz2.sig b/gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.0.tar.bz2.sig
deleted file mode 100644
index 790d2f9..0000000
Binary files a/gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.1.tar.bz2.sig b/gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.1.tar.bz2.sig
new file mode 100644
index 0000000..337062c
Binary files /dev/null and b/gnome3-libs/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.2.1.tar.bz2.sig differ
diff --git a/gnome3-libs/pygobject3/DEPENDS b/gnome3-libs/pygobject3/DEPENDS
index 559fd57..5e156c8 100755
--- a/gnome3-libs/pygobject3/DEPENDS
+++ b/gnome3-libs/pygobject3/DEPENDS
@@ -1,7 +1,3 @@
 depends python &&
 depends glib2 &&
-
-optional_depends gobject-introspection      \
-                 "--enable-introspection"   \
-                 "--disable-introspection"  \
-                 "to enable introspection"
+depends gobject-introspection
diff --git a/gnome3-libs/pygobject3/HISTORY b/gnome3-libs/pygobject3/HISTORY
index 664f3d1..9f090ec 100644
--- a/gnome3-libs/pygobject3/HISTORY
+++ b/gnome3-libs/pygobject3/HISTORY
@@ -1,2 +1,5 @@
+2011-10-20 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Requires gobject-introspection
+
 2011-10-09 Ladislav Hagara <hgr at vabo.cz>
 	* *: spell created, based on pygobject
diff --git a/gnome3-libs/vte3/DETAILS b/gnome3-libs/vte3/DETAILS
index 7f94d94..9d8af09 100755
--- a/gnome3-libs/vte3/DETAILS
+++ b/gnome3-libs/vte3/DETAILS
@@ -1,5 +1,5 @@
            SPELL=vte3
-         VERSION=0.30.0
+         VERSION=0.30.1
   SECURITY_PATCH=0
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=vte-$VERSION.tar.bz2
diff --git a/gnome3-libs/vte3/HISTORY b/gnome3-libs/vte3/HISTORY
index c5c31c3..46be690 100644
--- a/gnome3-libs/vte3/HISTORY
+++ b/gnome3-libs/vte3/HISTORY
@@ -1,3 +1,6 @@
+2011-10-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.30.1
+
 2011-09-29 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.30.0
 
diff --git a/gnome3-libs/vte3/vte-0.30.0.tar.bz2.sig b/gnome3-libs/vte3/vte-0.30.0.tar.bz2.sig
deleted file mode 100644
index 06cb991..0000000
Binary files a/gnome3-libs/vte3/vte-0.30.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome3-libs/vte3/vte-0.30.1.tar.bz2.sig b/gnome3-libs/vte3/vte-0.30.1.tar.bz2.sig
new file mode 100644
index 0000000..02b0a16
Binary files /dev/null and b/gnome3-libs/vte3/vte-0.30.1.tar.bz2.sig differ
diff --git a/graphics-libs/openjpeg/BUILD b/graphics-libs/openjpeg/BUILD
index e013b8d..91fa49d 100755
--- a/graphics-libs/openjpeg/BUILD
+++ b/graphics-libs/openjpeg/BUILD
@@ -1 +1,2 @@
+LDFLAGS="-lm $LDFLAGS" &&
 cmake_build
diff --git a/graphics-libs/openjpeg/DETAILS b/graphics-libs/openjpeg/DETAILS
index 73613ea..b806080 100755
--- a/graphics-libs/openjpeg/DETAILS
+++ b/graphics-libs/openjpeg/DETAILS
@@ -7,6 +7,7 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_${VX}
    SOURCE_URL[0]=http://openjpeg.googlecode.com/files/$SOURCE
       LICENSE[0]=BSD
+      PATCHLEVEL=1
         WEB_SITE=http://code.google.com/p/openjpeg/
         KEYWORDS="images graphics libs"
          ENTERED=20070627
diff --git a/graphics-libs/openjpeg/HISTORY b/graphics-libs/openjpeg/HISTORY
index e33cc61..29118b2 100644
--- a/graphics-libs/openjpeg/HISTORY
+++ b/graphics-libs/openjpeg/HISTORY
@@ -1,3 +1,8 @@
+2011-10-20 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* BUILD: Link against -lm or -Wl,--as-needed may break
+	  Fixes #306
+
 2011-10-17 Treeve Jelbert <treeve at sourcemage.org>
 	* PRE_BUILD: added, fix build with libpng-1.5.5
 
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index ad69df6..b0e5680 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,6 @@
+2011-10-20 Pol Vinogradov <vin.public at gmail.com>
+	* PRE_BUILD: added to fix building with gnutls 3.0 branch
+
 2011-10-14 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed long description wrap (scripted)
 
diff --git a/mail/claws-mail/PRE_BUILD b/mail/claws-mail/PRE_BUILD
new file mode 100755
index 0000000..8ad3898
--- /dev/null
+++ b/mail/claws-mail/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+if is_depends_enabled ${SPELL} "gnutls" && [[ $(installed_version "gnutls") == 3.0.* ]]
+then
+  sed -i "s:gnutls_transport_set_lowat:// gnutls_transport_set_lowat:g" src/common/ssl.c
+fi
diff --git a/net/quagga/DETAILS b/net/quagga/DETAILS
index 7ab3488..6de83a2 100755
--- a/net/quagga/DETAILS
+++ b/net/quagga/DETAILS
@@ -1,5 +1,6 @@
            SPELL=quagga
          VERSION=0.99.20
+  SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=${SOURCE}.asc
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/net/quagga/HISTORY b/net/quagga/HISTORY
index 499bbf8..86771ab 100644
--- a/net/quagga/HISTORY
+++ b/net/quagga/HISTORY
@@ -1,3 +1,7 @@
+2011-10-21 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: SECURITY_PATCH=1 (CVEs: 2011-3323, 2011-3324, 2011-3325,
+	  2011-3326, 2011-3327, 2010-1674, 2010-1675 at least)
+
 2011-10-18 Tommy Boatman <tboatman_smgl at live.com>
 	* DETAILS: Update to 0.99.20
 
diff --git a/shell-term-fm/x3270/DETAILS b/shell-term-fm/x3270/DETAILS
index a36415f..d8e4242 100755
--- a/shell-term-fm/x3270/DETAILS
+++ b/shell-term-fm/x3270/DETAILS
@@ -1,11 +1,11 @@
            SPELL=x3270
-         VERSION=3.3.10ga5
+         VERSION=3.3.12ga7
           SOURCE=suite3270-$VERSION-src.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-3.3
    SOURCE_URL[0]=$SOURCEFORGE_URL/x3270/$SOURCE
         WEB_SITE=http://x3270.bgp.nu
          ENTERED=20020411
-     SOURCE_HASH=sha512:1f7c8208f86052c51c76f37b9442527dc1cd8b2a7141a58878bb357a857d56d5cc0b63b5febbb02c94fa708c8de2c466fff32b7638760603632ab54be92e5fd5
+     SOURCE_HASH=sha512:df1f7df4e6839dfbd71714ef480c342b1014c7aa5650b6e4c5f7638a0a681bc71a15977427cdf96e3bbecccc554086e813da9d309c04948dac8fb28e11766f30
       LICENSE[0]=GPL
         KEYWORDS="emulator terminal console"
            SHORT="x3270 is an IBM 3270 terminal emulator for the X Window System."
diff --git a/shell-term-fm/x3270/HISTORY b/shell-term-fm/x3270/HISTORY
index 8996d76..64af27f 100644
--- a/shell-term-fm/x3270/HISTORY
+++ b/shell-term-fm/x3270/HISTORY
@@ -1,3 +1,6 @@
+2011-10-20 Tommy Boatman <tboatman_smgl at live.com>
+	* DETAILS: version 3.3.12ga7
+
 2011-10-14 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed long description wrap (scripted)
 
diff --git a/utils/avahi/BUILD b/utils/avahi/BUILD
index bb5575e..ddb918a 100755
--- a/utils/avahi/BUILD
+++ b/utils/avahi/BUILD
@@ -21,4 +21,7 @@ if [[ "$AVAHI_COMPAT_HOWL" == 'y' ]]; then
   OPTS="$OPTS --enable-compat-howl"
 fi &&
 
+OPTS="--disable-qt3 $OPTS" &&
+
+
 default_build
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index ff72ba1..cb85c10 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,7 @@
+2011-10-20 Eric Sandall <sandalle at sourcemage.org>
+	* *SUB_DEPENDS: Allow requiring gtk+3 optional dependency
+	* BUILD: Disable QT3 support (won't work with qt4's implementation)
+
 2011-10-14 Bor Kraljič <pyrobor at ver.si>
 	* DEPENDS: removed some redundant checking for qt-x11
 
diff --git a/utils/avahi/PRE_SUB_DEPENDS b/utils/avahi/PRE_SUB_DEPENDS
index c8790c5..623730e 100755
--- a/utils/avahi/PRE_SUB_DEPENDS
+++ b/utils/avahi/PRE_SUB_DEPENDS
@@ -5,6 +5,8 @@ case $THIS_SUB_DEPENDS in
     if is_depends_enabled $SPELL qt4; then return 0; fi;;
   GTK2)
     if is_depends_enabled $SPELL gtk+2; then return 0; fi;;
+  GTK3)
+    if is_depends_enabled $SPELL gtk+3; then return 0; fi;;
   COMPAT_LIBDNS_SD)
     if [[ "$AVAHI_COMPAT_LIBDNS_SD" == y ]]; then return 0; fi;;
   COMPAT_HOWL)
diff --git a/utils/avahi/REPAIR^0219b41c8d42a21a6d61fb3e7b5f23c0^PRE_SUB_DEPENDS b/utils/avahi/REPAIR^0219b41c8d42a21a6d61fb3e7b5f23c0^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..623730e
--- /dev/null
+++ b/utils/avahi/REPAIR^0219b41c8d42a21a6d61fb3e7b5f23c0^PRE_SUB_DEPENDS
@@ -0,0 +1,15 @@
+case $THIS_SUB_DEPENDS in
+  MONO)
+    if is_depends_enabled $SPELL mono; then return 0; fi;;
+  QT4)
+    if is_depends_enabled $SPELL qt4; then return 0; fi;;
+  GTK2)
+    if is_depends_enabled $SPELL gtk+2; then return 0; fi;;
+  GTK3)
+    if is_depends_enabled $SPELL gtk+3; then return 0; fi;;
+  COMPAT_LIBDNS_SD)
+    if [[ "$AVAHI_COMPAT_LIBDNS_SD" == y ]]; then return 0; fi;;
+  COMPAT_HOWL)
+    if [[ "$AVAHI_COMPAT_HOWL" == y ]]; then return 0; fi;;
+esac &&
+return 1
diff --git a/utils/avahi/SUB_DEPENDS b/utils/avahi/SUB_DEPENDS
index a7ba6fc..b11282b 100755
--- a/utils/avahi/SUB_DEPENDS
+++ b/utils/avahi/SUB_DEPENDS
@@ -8,6 +8,9 @@ QT4)  echo "qt4 bindings requested, forcing them."  &&
 GTK2) echo "gtk+2 bindings requested, forcing them."  &&
         depends  gtk+2 '--enable-gtk'
         ;;
+GTK3) echo "gtk+3 bindings requested, forcing them."  &&
+        depends  gtk+3 '--enable-gtk3'
+        ;;
 COMPAT_LIBDNS_SD) echo "libdns_sd compatibility layer requested, forcing it."  &&
         AVAHI_COMPAT_LIBDNS_SD=y
         ;;
diff --git a/video/totem/DEPENDS b/video/totem/DEPENDS
index fcb8b97..6d05e3a 100755
--- a/video/totem/DEPENDS
+++ b/video/totem/DEPENDS
@@ -19,7 +19,7 @@ optional_depends  vala  \
                   '--disable-vala' \
                   'Enable vala plugin support?' &&
 
-optional_depends  python  \
+optional_depends  pygobject3  \
                   '--enable-python'  \
                   '--disable-python' \
                   'Enable python plugin support?' &&
@@ -58,8 +58,8 @@ optional_depends  mythtv \
                   "enable mythtv plugin?"  &&
 
 optional_depends  dbus-glib         \
-                  "--with-dbus"     \
-                  "--without-dbus"  \
+                  ""  \
+                  ""  \
                   "for dbus remote control" &&
 
 optional_depends libgdata "" "" "for youtube plugin"
diff --git a/video/totem/HISTORY b/video/totem/HISTORY
index 3db3fce..d8eab2e 100644
--- a/video/totem/HISTORY
+++ b/video/totem/HISTORY
@@ -1,3 +1,7 @@
+2011-10-20 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Python support required pygobject3
+	  Still depends on dbus-glib (links), but does not know --with-dbus
+
 2011-10-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.2.0
 	* PRE_BUILD: updated


More information about the SM-Commit mailing list