[gtk-osx] [modulesets-stable] Gtk3 updates for random and unsupported modules.

[John Ralls <jralls src gnome org>]

commit 3207d54948561510c6b8d1ad19e835a44f345346
Author: John Ralls <jralls ceridwen us>
Date:   Sat Oct 29 16:41:01 2011 -0700

    [modulesets-stable] Gtk3 updates for random and unsupported modules.

 modulesets-stable/gtk-osx-random.modules      |   28 +++++++++++----
 modulesets-stable/gtk-osx-unsupported.modules |   49 +++++++++++++++++--------
 2 files changed, 54 insertions(+), 23 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 2eaa858..69e746a 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -93,7 +93,19 @@ Libglade itself is deprecated. This is the last release. -->
     </after>
     <dependencies>
       <dep package="WebKit"/>
-      <dep package="libglade"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="devhelp" autogen-sh="configure">
+    <branch module="devhelp/3.2/devhelp-3.2.0.tar.bz2" version="3.2.0"
+            hash="sha256:1341d1060c094956e8496c9ed68334192ca963fa211489737a0b84a4693c232d"/>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-themes"/>
+      <dep package="meta-gtk-osx-gtk3"/>
+    </after>
+    <dependencies>
+      <dep package="WebKit"/>
     </dependencies>
   </autotools>
 
@@ -118,7 +130,7 @@ Libglade itself is deprecated. This is the last release. -->
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk3"/>
     </after>
   </autotools>
 
@@ -138,7 +150,7 @@ Libglade itself is deprecated. This is the last release. -->
             version="3.2.0" hash="sha256:82b1028d69fcb24650ebc801454eb688dc3a01c6061c1d77d1cf665f048f050a"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk3"/>
     </after>
   </autotools>
 
@@ -148,6 +160,7 @@ Libglade itself is deprecated. This is the last release. -->
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk3"/>
     </after>
   </autotools>
 
@@ -271,6 +284,7 @@ Libglade itself is deprecated. This is the last release. -->
 	    repo="sqlite"/>
   </autotools>
 
+<!-- Goocanvas-1 is for gtk+-2. -->
   <autotools id="goocanvas">
     <branch module="goocanvas/1.0/goocanvas-1.0.0.tar.bz2" version="1.0.0"
 	    hash="sha256:1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e"/>
@@ -279,12 +293,12 @@ Libglade itself is deprecated. This is the last release. -->
     </dependencies>
   </autotools>
 
-<!-- Goocanvas has numbering issues, because goocanvas-2 is for gtk+-3. -->
+<!-- Goocanvas-2 is for gtk+-3. -->
   <autotools id="goocanvas2">
     <branch module="goocanvas/2.0/goocanvas-2.0.0.tar.bz2" version="2.0.0"
 	    hash="9f8d7f700ad9617adef37e63f58cb2d038d799443e3756040f368ceea7f01331"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-3.0"/>
     </dependencies>
   </autotools>
 
@@ -312,8 +326,8 @@ Libglade itself is deprecated. This is the last release. -->
   </autotools>
 
   <autotools id="libgsf" autogenargs="--without-python">
-    <branch  module="libgsf/1.14/libgsf-1.14.19.tar.bz2" version="1.14.19"
-	     hash="sha256:8cf82ce95ef97e61bae02099d2f39e4d814747b546899b7c28a695e15391b56c"/>
+    <branch  module="libgsf/1.14/libgsf-1.14.21.tar.bz2" version="1.14.21"
+	     hash="sha256:eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db"/>
   </autotools>
 
   <autotools id="gmp">
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index c146645..9b2faef 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -63,7 +63,6 @@
     </dependencies>
   </autotools>
 
-<!-- Libsoup doesn't work with newer versions of libproxy -->
   <cmake id='libproxy' cmakeargs="-DWITH_PYTHON=OFF">
     <branch version='0.4.7' module='libproxy-0.4.7.tar.gz'
             repo='libproxy.google.com'>
@@ -74,18 +73,9 @@
     </dependencies>
   </cmake>
 
-  <autotools id="gnome-keyring" autogenargs="--disable-pam">
-    <!-- Libsoup doesn't work with anything after 2.28 -->
-<branch module="gnome-keyring/2.32/gnome-keyring-2.32.1.tar.bz2"
-	    version="2.32.1" hash="sha256:31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9">
-    <!-- Libsoup doesn't work with anything after 2.28
-branch module="gnome-keyring/3.2.0/gnome-keyring-3.2.0.tar.bz2"
-	    version="3.2.0" hash="sha256:7c05900c2fc4273611ff9dc9c6b36797b027ba24a479b7c5a333941f57a467f5" -->
-    <!--branch module="gnome-keyring/2.28/gnome-keyring-2.28.2.tar.bz2"
-	    version="2.28.2"
-	    hash="sha256:d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6"-->
-      <!-- This patch is for gnome-keyring 2.32.1 -->
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gnome-keyring-dumb-typo.patch"; strip="1"/>
+  <autotools id="libgnome-keyring" autogenargs="--disable-pam">
+    <branch module="libgnome-keyring/2.32/libgnome-keyring-2.32.0.tar.bz2"
+	    version="2.32.1" hash="sha256:56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c">
     </branch>
     <dependencies>
       <dep package="gtk+"/>
@@ -94,6 +84,17 @@ branch module="gnome-keyring/3.2.0/gnome-keyring-3.2.0.tar.bz2"
     </dependencies>
   </autotools>
 
+  <autotools id="libgnome-keyring-gtk3" autogenargs="--disable-pam">
+    <branch module="libgnome-keyring/3.2/libgnome-keyring-3.2.0.tar.bz2"
+	    version="3.2.0" hash="sha256:2829739072ec3ac0ed53593e0f0b3f754584004ff77bc3e2789c58f54699cfef">
+    </branch>
+    <dependencies>
+      <dep package="gtk+-3.0"/>
+      <dep package="libgcrypt"/>
+      <dep package="libtasn1"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="glib-networking" autogen-sh="configure"
 	     autogenargs="--without-ca-certificates">
     <branch module="glib-networking/2.28/glib-networking-2.28.7.tar.bz2"
@@ -104,12 +105,28 @@ branch module="gnome-keyring/3.2.0/gnome-keyring-3.2.0.tar.bz2"
     </dependencies>
   </autotools>
 
-  <autotools id="libsoup" autogen-sh="configure" autogenargs="--without-gnome">
-    <branch module="libsoup/2.34/libsoup-2.34.3.tar.bz2"
-            version="2.34.3" hash="sha256:940fa2777542e564ba7052252ee065adc6c7982c0cae56a4c541a04329fc7dc7" />
+<!-- Libsoup's gnome-2-32 branch tags versions on 2.32, gnome-3-0 tags
+     2.34, gnome-3-2 tags 2.36 -->
+  <autotools id="libsoup" autogen-sh="configure" autogenargs="">
+    <branch module="libsoup/2.32/libsoup-2.32.2.tar.bz2"
+            version="2.32.2" hash="sha256:96e6973c8b7459523c0f44e7aec69528ff2fbd388e8ddc415f91bcc42f50777f" />
     <dependencies>
       <dep package="glib"/>
+      <dep package="gnutls"/>
+      <dep package='gconf'/>
+      <dep package="libgnome-keyring"/>
+      <dep package="libproxy"/>
+      <dep package='sqlite'/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libsoup-gtk3" autogen-sh="configure" autogenargs="">
+    <branch module="libsoup/2.36/libsoup-2.36.0.tar.bz2" version="2.32.2"
+	    hash="sha256:511501a5b64da6a44eb5e70b85fa11599e6005a56576c7dbc96c236f1bb71eb1" />
+    <dependencies>
+      <dep package="glib-gtk3"/>
       <dep package="glib-networking"/>
+      <dep package="libgnome-keyring-gtk3"/>
       <dep package="gnutls"/>
       <dep package='gconf'/>
       <dep package="libproxy"/>