[gtk-osx] Update some modulesets versions to better match modulesets-stable

[John Ralls <jralls src gnome org>]

commit 32e55029547acf62a2315b859871be55e4405673
Author: John Ralls <jralls ceridwen us>
Date:   Sun Feb 2 16:19:35 2014 -0800

    Update some modulesets versions to better match modulesets-stable

 modulesets/gtk-osx-bootstrap.modules |    3 ++-
 modulesets/gtk-osx-gtkmm.modules     |    2 +-
 modulesets/gtk-osx-python.modules    |    5 +++--
 modulesets/gtk-osx.modules           |    8 +++++---
 4 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 23e2d68..5e8a6ba 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -126,7 +126,8 @@
   </autotools>
 
 <!-- Another one that won't build in a separate directory -->
-  <autotools id="hicolor-icon-theme" autogen-sh="configure">
+  <autotools id="hicolor-icon-theme" autogen-sh="configure"
+            supports-non-srcdir-builds="no">
     <branch module="hicolor-icon-theme-0.11.tar.gz" repo="icon-theme"
            version="0.11" />
 
diff --git a/modulesets/gtk-osx-gtkmm.modules b/modulesets/gtk-osx-gtkmm.modules
index 2ba9d42..b7c40c5 100644
--- a/modulesets/gtk-osx-gtkmm.modules
+++ b/modulesets/gtk-osx-gtkmm.modules
@@ -63,7 +63,7 @@
      documentation in your jhbuildrc-custom. -->
 <!-- libsigc++'s last stable branch was 2-0 -->
   <autotools id="libsigc++2"  autogen-args="--disable-documentation">
-    <branch tag="2.2.11"/>
+    <branch revision="libsigc-2-2"/>
     <dependencies>
       <dep package="mm-common"/>
     </dependencies>
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index f0f6bae..33b74c1 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -134,7 +134,7 @@
   </autotools>
 
   <autotools id="pygobject3">
-    <branch tag="pygobject-3-4" module="pygobject" checkoutdir="pygobject3"/>
+    <branch tag="pygobject-3-10" module="pygobject" checkoutdir="pygobject3"/>
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
     </dependencies>
@@ -159,7 +159,8 @@
   </autotools>
 
   <autotools id="gtk-mac-integration-python">
-    <branch tag="gtk-mac-integration-2.0.1" module="gtk-mac-integration"
+    <!--gtk-mac-integration releases from master"-->
+    <branch module="gtk-mac-integration"
            checkoutdir="gtk-mac-integration"/>
     <dependencies>
      </dependencies>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index e3cfb39..bd76a53 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -62,7 +62,7 @@
   </metamodule>
 
   <autotools id="glib">
-    <branch tag="glib-2-34"/>
+    <branch tag="glib-2-38"/>
     <dependencies>
       <dep package="libffi"/>
     </dependencies>
@@ -120,7 +120,8 @@
   </autotools>
 
   <autotools id="gdk-pixbuf">
-    <branch tag="gdk-pixbuf-2-26"/>
+<!--gdk-pixbuf is releasing from master-->
+    <branch />
     <after>
       <dep package="pango"/>
     </after>
@@ -175,7 +176,8 @@
   </autotools>
 
   <autotools id="gtk-mac-integration" autogenargs="--disable-python">
-    <branch tag="gtk-mac-integration-2.0.2" />
+<!--gtk-mac-integration releases from master"-->
+    <branch />
     <dependencies>
     </dependencies>
     <after>