[jhbuild] [2.32] More updates to remove gtk+-3 from the build

[Vincent Untz <vuntz src gnome org>]

commit 5f9efc6bd91955a640aa9780c1240c135180b999
Author: Vincent Untz <vuntz gnome org>
Date:   Sun Aug 8 17:43:17 2010 +0200

    [2.32] More updates to remove gtk+-3 from the build
    
    Move libunique-3 and libpeas to gnome-2.32 (out of gnome-external-2.32).
    
    Remove gtk+-3 dependency for avahi, libcanberra and libnotify.
    
    Correctly update the dependencies of gnome-color-manager to not use the
    GTK+ 3-based libraries.
    
    Use gnome-2-32 branch for gnome-packagekit and totem.
    
    Use gnome-2-28 branch for glade3.
    
    Remove vte-3 from gnome-suites.

 modulesets/gnome-2.32.modules               |   26 ++++++++++++++++++++++
 modulesets/gnome-external-deps-2.32.modules |   31 +--------------------------
 modulesets/gnome-suites-2.32.modules        |   31 ++++++++------------------
 3 files changed, 37 insertions(+), 51 deletions(-)
---
diff --git a/modulesets/gnome-2.32.modules b/modulesets/gnome-2.32.modules
index c2bb03c..4a69d66 100644
--- a/modulesets/gnome-2.32.modules
+++ b/modulesets/gnome-2.32.modules
@@ -2522,4 +2522,30 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libunique-3">
+    <branch module="libunique/2.90/libunique-2.90.1.tar.bz2" repo="gnome.org"
+            version="2.90.1" checkoutdir="libunique-2.90.1"
+            hash="sha256:94c46006557b9f981b801f90c1ce324dcd5385aa6ded5058cb06f39e32119993"
+            md5sum="7778865473d8c81084ad5959a0d9853c" size="344813"/>
+    <dependencies>
+      <dep package="gtk+-3"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libpeas">
+    <branch module="libpeas/0.5/libpeas-0.5.4.tar.bz2" repo="gnome.org"
+            version="0.5.4"
+            hash="sha256:ec8e465627c8e683cce11f15c79c58bd49357a3c7be95afb885c9734ca4af50d"
+            md5sum="39650c59f04d22c200b51da3156e45f4" size="429107"/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+-3"/>
+    </dependencies>
+    <suggests>
+      <dep package="pygobject"/>
+      <dep package="seed"/>
+    </suggests>
+  </autotools>
+
 </moduleset>
diff --git a/modulesets/gnome-external-deps-2.32.modules b/modulesets/gnome-external-deps-2.32.modules
index 86a0e43..0041e31 100644
--- a/modulesets/gnome-external-deps-2.32.modules
+++ b/modulesets/gnome-external-deps-2.32.modules
@@ -36,13 +36,12 @@
 
   <!-- explicit disabling of qt3 and qt4 can be removed once avahi
        correctly detects what is available. -->
-  <tarball autogenargs="--enable-gtk --enable-gtk3 --enable-introspection=no --disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-manpages --disable-python --enable-compat-howl --enable-compat-libdns_sd" id="avahi" version="0.6.26">
+  <tarball autogenargs="--enable-gtk --enable-introspection=no --disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-manpages --disable-python --enable-compat-howl --enable-compat-libdns_sd" id="avahi" version="0.6.26">
     <source href="http://avahi.org/download/avahi-0.6.26.tar.gz";
             hash="sha256:699b450f5c630719789b261a4423c7731103ed96d2e333901627956d6016660f"
             md5sum="2b2b1899fcec5ae74e92f111598913a1" size="1205318"/>
     <dependencies>
       <dep package="gtk+"/>
-      <dep package="gtk+-3"/>
       <dep package="libdaemon"/>
       <dep package="dbus-python"/>
       <dep package="pygtk"/>
@@ -786,7 +785,6 @@
     </dependencies>
     <after>
       <dep package="gtk+"/>
-      <dep package="gtk+-3"/>
       <dep package="pulseaudio"/>
       <dep package="gstreamer"/>
     </after>
@@ -976,7 +974,6 @@
             md5sum="9aa027e78d3c0141600c659f02740100" size="309886"/>
     <dependencies>
       <dep package="gtk+"/>
-      <dep package="gtk+-3"/>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
     </dependencies>
@@ -1233,32 +1230,6 @@
     </dependencies>
   </tarball>
 
-  <autotools id="libunique-3">
-    <branch module="libunique/2.90/libunique-2.90.1.tar.bz2" repo="gnome.org"
-            version="2.90.1" checkoutdir="libunique-2.90.1"
-            hash="sha256:94c46006557b9f981b801f90c1ce324dcd5385aa6ded5058cb06f39e32119993"
-            md5sum="7778865473d8c81084ad5959a0d9853c" size="344813"/>
-    <dependencies>
-      <dep package="gtk+-3"/>
-      <dep package="dbus-glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libpeas">
-    <branch module="libpeas/0.5/libpeas-0.5.4.tar.bz2" repo="gnome.org"
-            version="0.5.4"
-            hash="sha256:ec8e465627c8e683cce11f15c79c58bd49357a3c7be95afb885c9734ca4af50d"
-            md5sum="39650c59f04d22c200b51da3156e45f4" size="429107"/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+-3"/>
-    </dependencies>
-    <suggests>
-      <dep package="pygobject"/>
-      <dep package="seed"/>
-    </suggests>
-  </autotools>
-
   <tarball id="folks" version="0.1.12">
     <source href="http://download.gnome.org/sources/folks/0.1/folks-0.1.12.tar.bz2";
             hash="sha256:4ec70d4810bc1ad894997f2ea7b114f161cb1c50b6b11ee38592e880a4e477d9"
diff --git a/modulesets/gnome-suites-2.32.modules b/modulesets/gnome-suites-2.32.modules
index ef35e2a..953a5e7 100644
--- a/modulesets/gnome-suites-2.32.modules
+++ b/modulesets/gnome-suites-2.32.modules
@@ -673,9 +673,9 @@
   <autotools id="gnome-color-manager">
     <branch revision="gnome-2-32"/>
     <dependencies>
-      <dep package="gtk+-3"/>
-      <dep package="gnome-desktop-3"/>
-      <dep package="vte-3"/>
+      <dep package="gtk+"/>
+      <dep package="gnome-desktop"/>
+      <dep package="vte"/>
       <dep package="libnotify"/>
       <dep package="lcms2"/>
       <dep package="libcanberra"/>
@@ -853,10 +853,10 @@
   </autotools>
 
   <autotools id="gnome-packagekit">
-    <branch/>
+    <branch revision="gnome-2-32"/>
     <dependencies>
       <dep package="PackageKit"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="libnotify"/>
       <dep package="gnome-menus"/>
@@ -892,7 +892,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gnome-panel"/>
       <dep package="libgnome-keyring"/>
       <dep package="gconf"/>
@@ -1441,18 +1441,17 @@
   </autotools>
 
   <autotools id="totem">
-    <branch/>
+    <branch revision="gnome-2-32"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gconf"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
       <dep package="libmusicbrainz"/>
       <dep package="iso-codes"/>
       <dep package="totem-pl-parser"/>
-      <dep package="libpeas"/>
     </dependencies>
     <suggests>
       <dep package="libepc"/>
@@ -1498,16 +1497,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="vte-3" autogenargs="--with-gtk=3.0 --enable-introspection=yes">
-    <branch checkoutdir="vte-3" module="vte"/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gtk+-3"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="yelp-xsl">
     <branch/>
     <dependencies>
@@ -1782,10 +1771,10 @@
   </autotools>
 
   <autotools id="glade3">
-    <branch/>
+    <branch revision="gnome-2-28"/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libxml2"/>
     </dependencies>
   </autotools>