[gtk-osx] Update of stable modulesets to use the most current working versions of everything.



commit 3f32bab5be75075cf7af1d2e88b556467025abba
Author: John Ralls <jralls ceridwen us>
Date:   Thu Sep 29 14:36:24 2011 -0700

    Update of stable modulesets to use the most current working versions of everything.
    
    Not everything has been brought up-to-date for compatibility reasons. When that's the case there are comments in the moduleset.
    
    Note that bootstrap.modules has changed, so either run gtk-osx-build-setup.sh again or hand-copy bootstrap.modules into ~/Source/jhbuild/modulesets.
    
    Note also that patch files now pull from git.gnome.org.

 modulesets-stable/bootstrap.modules           |   22 ++---
 modulesets-stable/gtk-osx-bootstrap.modules   |   28 ++++---
 modulesets-stable/gtk-osx-gstreamer.modules   |   22 +++---
 modulesets-stable/gtk-osx-gtkmm.modules       |   32 +++++---
 modulesets-stable/gtk-osx-python.modules      |   25 +++---
 modulesets-stable/gtk-osx-random.modules      |   76 ++++++++++++++----
 modulesets-stable/gtk-osx-unsupported.modules |   59 ++++++++-----
 modulesets-stable/gtk-osx.modules             |  107 ++++++++++++++++---------
 8 files changed, 234 insertions(+), 137 deletions(-)
---
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 2b8021e..92e68a2 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -29,20 +29,18 @@
   </autotools>
 
   <autotools id='readline' >
-    <branch repo="ftp.gnu.org" module="readline/readline-6.0.tar.gz"
-	    version="6.0"/>
+    <branch repo="ftp.gnu.org" module="readline/readline-6.2.tar.gz"
+	    version="6.2"/>
   </autotools>
 
   <autotools id="m4" autogen-sh="configure">
     <branch repo="ftp.gnu.org"
-	    module="m4/m4-1.4.11.tar.bz2" version="1.4.11"
-	    size="928910" md5sum="96ec473c2a6f203976c028e896a01b28" />
+	    module="m4/m4-1.4.16.tar.bz2" version="1.4.16"/>
   </autotools>
 
   <autotools id="autoconf" autogen-sh="configure">
     <branch repo="ftp.gnu.org"
-            module="autoconf/autoconf-2.65.tar.bz2" version="2.65"
-            size="1332522" md5sum="a6de1cc6434cd64038b0a0ae4e252b33" />
+            module="autoconf/autoconf-2.68.tar.bz2" version="2.68"/>
     <dependencies>
       <dep package="m4"/>
     </dependencies>
@@ -50,10 +48,7 @@
 
   <autotools id="libtool" autogen-sh="configure">
     <branch repo="ftp.gnu.org"
-            module="libtool/libtool-2.2.6a.tar.gz" version="2.2.6a"
-            size="2870524" md5sum="8ca1ea241cd27ff9832e045fe9afe4fd"
-            checkoutdir="libtool-2.2.6">
-    </branch>
+            module="libtool/libtool-2.4.tar.gz" version="2.4"/>
   </autotools>
 
   <autotools id="automake-1.8" autogen-sh="configure">
@@ -77,14 +72,15 @@
 	    size="1066685" md5sum="c2972c4d9b3e29c03d5f2af86249876f" />
   </autotools>
 
+<!-- Pkg-config 0.26 and later requires glib, which requires
+     pkg-config, which, well, you get the idea. -->
   <autotools id="pkg-config" autogen-sh="configure">
     <branch repo="pkgconfig"
-            module="pkg-config-0.25.tar.gz" version="0.25"
-            size="988899" md5sum="a3270bab3f4b69b7dc6dbdacbcae9745" />
+            module="pkg-config-0.25.tar.gz" version="0.25"/>
   </autotools>
 
    <autotools id="libxml2" autogen-sh="configure">
-    <branch version="2.7.7" module="libxml2-2.7.7.tar.gz"
+    <branch version="2.7.8" module="libxml2-2.7.8.tar.gz"
 	    repo="xmlsoft.org"/>
   </autotools>
 
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 3695c06..f907cbb 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -14,27 +14,29 @@
   <repository type="tarball" name="libtiff"
 	      href="http://download.osgeo.org/"/>
   <repository type="tarball" name="fontconfig"
-	      href="http://www.fontconfig.org/release/"/>
+	      href="http://www.freedesktop.org/software/fontconfig/release/"/>
   <repository type="tarball" name="icon-theme"
 	      href="http://icon-theme.freedesktop.org/releases/"/>
   <repository type="tarball" name="ftp.gnu.org"
               href="http://ftp.gnu.org/gnu/"/>
 
+<!-- Libpng-1.5 has made private struct definitions; gdk-pixbuf 2-23
+     hasn't adjusted -->
   <autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch version="1.2.40" module="libpng/libpng-1.2.40.tar.bz2"
+    <branch version="1.4.8" module="libpng/libpng-1.4.8.tar.bz2"
 	    repo="sourceforge"/>
   </autotools>
 
   <autotools id="libjpeg">
-    <branch module="jpegsrc.v7.tar.gz" version="7"
+    <branch module="jpegsrc.v8c.tar.gz" version="8c"
             repo="jpeg"
-            checkoutdir="jpeg-7">
+            checkoutdir="jpeg-8">
     </branch>
   </autotools>
 
   <autotools id="libtiff" autogen-sh="configure"
 	     autogenargs="--without-x --without-apple-opengl-framework">
-    <branch version="3.9.1" module="libtiff/tiff-3.9.1.tar.gz"
+    <branch version="3.9.5" module="libtiff/tiff-3.9.5.tar.gz"
 	    repo="libtiff"/>
     <dependencies>
       <dep package="libjpeg"/>
@@ -73,14 +75,14 @@
 
   <autotools id="freetype"
 	     autogen-template="%(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s">
-    <branch module="freetype/freetype-2.3.11.tar.gz" version="2.3.11"
+    <branch module="freetype/freetype-2.4.6.tar.gz" version="2.4.6"
             repo="sourceforge">
     </branch>
   </autotools>
 
   <autotools id="fontconfig" autogen-sh="configure"
 	     autogenargs="--disable-docs">
-    <branch repo="fontconfig" version="2.7.3" module="fontconfig-2.7.3.tar.gz"/>
+    <branch repo="fontconfig" version="2.8.0" module="fontconfig-2.8.0.tar.gz"/>
     <dependencies>
       <dep package="expat"/>
       <dep package="freetype"/>
@@ -89,8 +91,8 @@
 
   <perl id="perl-xml-parser" makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include">
     <branch repo="cpan"
-        module="authors/id/C/CH/CHORNY/XML-Parser-2.40.tar.gz"
-	version="2.40"/>
+        module="authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz"
+	version="2.41"/>
     <dependencies>
       <dep package="expat"/>
     </dependencies>
@@ -107,15 +109,15 @@
 
   <!-- Needed for building Gnome apps from the repository -->
   <autotools id="gnome-common" autogen-sh="configure">
-    <branch module="gnome-common/2.28/gnome-common-2.28.0.tar.bz2"
-	    version="2.28.0" hash="sha256:dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1"/>
+    <branch module="gnome-common/2.34/gnome-common-2.34.0.tar.bz2"
+	    version="2.34.0" hash="sha256:7a9c4f9ab975501c36be3192aa61641abca045a215d519d7d00527706f1de1df"/>
   </autotools>
 
   <autotools id="gtk-doc" autogenargs="--disable-scrollkeeper --with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog"
 	     makeargs="-k -i" makeinstallargs="-k -i install"
 	     autogen-sh="configure">
-    <branch version="1.16" module="gtk-doc/1.16/gtk-doc-1.16.tar.bz2"
-	    hash="sha256:552fd0a5e2bb104a9d8d5afebcf2292fbee83cd115e9f903df89e4518343eefb"/>
+    <branch version="1.18" module="gtk-doc/1.18/gtk-doc-1.18.tar.bz2"
+	    hash="sha256:a634d2e93d70468237033c06a17c97f29cf71a35ac5cc01c016324c965d42f73"/>
     <dependencies>
       <dep package="gtk-osx-docbook"/>
       <dep package="gnome-doc-utils"/>
diff --git a/modulesets-stable/gtk-osx-gstreamer.modules b/modulesets-stable/gtk-osx-gstreamer.modules
index 7c60cc2..3a42b4b 100644
--- a/modulesets-stable/gtk-osx-gstreamer.modules
+++ b/modulesets-stable/gtk-osx-gstreamer.modules
@@ -2,8 +2,8 @@
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
-  <repository type="tarball" name="gstreamer" default="yes"
-              href="http://gstreamer.freedesktop.org/src/"/>
+  <repository type="tarball" name="ftp.gnome.org" default="yes"
+              href="http://ftp.gnome.org/pub/GNOME/sources/"/>
   <repository type="tarball" name="liboil"
               href="http://liboil.freedesktop.org/download/"/>
   <repository type="tarball" name="sourceforge" 
@@ -22,17 +22,18 @@
 
   <autotools id="gstreamer" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gstreamer/gstreamer-0.10.32.tar.bz2" version="0.10.32"
-            hash="sha256:3bf4e46a186ee9a1f5e212aaf651d67cffb4f5f05345a7c99ae71d5d992be133"/>
+    <branch module="gstreamer/0.10/gstreamer-0.10.35.tar.bz2" version="0.10.35"
+            hash="sha256:817bfea2cd46e2487b97e2ed9218f0299b32a3de1e5e80b4c7868d17e9089786">
+    </branch>
     <after>
       <dep package="glib"/>
     </after>
   </autotools>
-
+<!-- This doesn't build: see https://bugzilla.gnome.org/show_bug.cgi?id=660302-->
   <autotools id="gst-plugins-base" autogenargs="-- --disable-tests --disable-x --disable-xvideo" supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2"
-            version="0.10.32" hash="sha256:e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b"/>
+    <branch module="gst-plugins-base/0.10/gst-plugins-base-0.10.35.tar.bz2"
+            version="0.10.15" hash="256:cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103"/>
     <dependencies>
       <dep package="gstreamer"/>
       <!--dep package="gtk+"/-->
@@ -45,8 +46,8 @@
 
   <autotools id="gst-plugins-good" autogenargs="-- --disable-tests --disable-x --disable-xvideo --disable-osx-video" supports-non-srcdir-builds="no"
     makeargs="ERROR_CFLAGS=" autogen-sh="configure">
-    <branch module="gst-plugins-good/gst-plugins-good-0.10.27.tar.bz2"
-            version="0.10.27" hash="sha256:a9d801c3d42b456a6ebc0b95f68c44f153f756ec0fbd4877197c469cc67771fa:"/>
+    <branch module="gst-plugins-good/0.10/gst-plugins-good-0.10.30.tar.bz2"
+            version="0.10.30" hash="sha256:b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -57,8 +58,9 @@
       removed from gnome sources. -->
 
 
-  <metamodule id="meta-gstreamer">
+  <metamodule id="meta-gtk-osx-gstreamer">
     <dependencies>
+      <dep package="meta-gtk-osx-core"/>
       <dep package="liboil"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
diff --git a/modulesets-stable/gtk-osx-gtkmm.modules b/modulesets-stable/gtk-osx-gtkmm.modules
index e638a57..957fbbc 100644
--- a/modulesets-stable/gtk-osx-gtkmm.modules
+++ b/modulesets-stable/gtk-osx-gtkmm.modules
@@ -16,8 +16,8 @@
   </metamodule>
 
   <autotools id="cairomm" autogen-sh="configure">
-    <branch module="cairomm-1.9.8.tar.gz" version="1.9.8"
-	    hash="sha1:ce27835ac69f5b4bd88653655dabf09c868accf9"
+    <branch module="cairomm-1.10.0.tar.gz" version="1.10.0"
+	    hash="sha1:f08bf8a331067f0d1e876523f07238fba6b26b99"
             repo="cairographics" />
     <dependencies>
       <dep package="cairo"/>
@@ -25,8 +25,8 @@
   </autotools>
 
   <autotools id="glibmm" autogen-sh="configure">
-    <branch module="glibmm/2.27/glibmm-2.27.3.tar.bz2" version="2.27.3"
-            hash="sha256:416885dc79997abd551b68e6882e324f4ef3837bcfac95387d01d462b110a4e2"/>
+    <branch module="glibmm/2.28/glibmm-2.28.2.tar.bz2" version="2.28.2"
+            hash="sha256:7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libsigc++2"/>
@@ -34,8 +34,8 @@
   </autotools>
 
   <autotools id="pangomm" autogen-sh="configure">
-    <branch module="pangomm/2.27/pangomm-2.27.1.tar.bz2" version="2.27.1"
-            hash="sha256:be3a0cf41589dab65e2d0ee3896f025179aa3676be70b87c50e1dd769becc79d"/>
+    <branch module="pangomm/2.28/pangomm-2.28.2.tar.bz2" version="2.28.2"
+            hash="sha256:ec1d97245eada5cf18d0e7af3f6e31498f25623b4a354589d631d2dff92fd88f"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
@@ -44,8 +44,8 @@
   </autotools>
 
   <autotools id="atkmm" autogen-sh="configure">
-    <branch module="atkmm/2.22/atkmm-2.22.2.tar.bz2" version="2.22.2"
-	    hash="sha256:b94666ae0acebea53241fa0b2444468ff66e8a7790dfc7491489a9ad2eeefa34"/>
+    <branch module="atkmm/2.22/atkmm-2.22.5.tar.bz2" version="2.22.5"
+	    hash="sha256:61e03e5e67952c8fd9919049fae680bd0f2a1547344394f36b98b05b34b7be6c"/>
   </autotools>
 
 <!-- libsigc++ depends on doxygen for documentation, but doxygen
@@ -59,9 +59,21 @@
             hash="sha256:0fd75fd8249e09ae2fd3ffd20c3fbaea11b47d71ba5ba2340ed98b6bdca40ea8"/>
   </autotools>
 
+  <autotools id="gtkmm3" autogen-sh="configure">
+    <branch module="gtkmm/3.0/gtkmm-3.0.1.tar.bz2" version="3.0.1"
+            hash="sha256:fb2d982095919e58ab5757042bf72e2a6243e77825c8ae6f46c41ab66cb68498"/>
+    <dependencies>
+      <dep package="glibmm"/>
+      <dep package="cairomm"/>
+      <dep package="pangomm"/>
+      <dep package="atkmm"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gtkmm" autogen-sh="configure">
-    <branch module="gtkmm/2.22/gtkmm-2.22.0.tar.bz2" version="2.22.0"
-            hash="sha256:8478d80d8d4793c2e1c459a71bad6a767a43eaf2664da06a9bd65a2b98bb07b1"/>
+    <branch module="gtkmm/2.24/gtkmm-2.24.2.tar.bz2" version="2.24.2"
+            hash="sha256:771a69c3252d06b20d4e8be4822bd7fa3b58424458733e3526218a128f1fea34"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index fb88f36..1db94ef 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -21,7 +21,7 @@
       <dep package="pycairo-python2.6"/>
       <dep package="pygobject"/>
       <dep package="pygtk"/>
-      <dep package="ige-mac-integration-python"/>
+      <dep package="gtk-mac-integration-python"/>
     </dependencies>
   </metamodule>
 
@@ -61,7 +61,8 @@
 <!-- Pycairo 1.8.10 (and later, presumably) requires Python3. -->
   <autotools id="pycairo-python2.6" autogen-sh="configure">
     <branch module="pycairo-1.8.8.tar.gz" repo="cairographics.org"
-            version="1.8.8" md5sum="054da6c125cb427a003f5fd6c54f853e"/>
+            version="1.8.8"
+	    hash="md5:054da6c125cb427a003f5fd6c54f853e"/>
     <dependencies>
       <dep package="cairo"/>
     </dependencies>
@@ -73,8 +74,8 @@
 
   <autotools id="pygobject" autogen-sh="configure"
 	     autogenargs="--disable-introspection">
-    <branch version="2.27.0" module="pygobject/2.27/pygobject-2.27.0.tar.bz2"
-            hash="sha256:7594bd86c5b92a4ba1f26927800f1b29e1ec5c246cad67aa085c279d6425b8a2"/>
+    <branch version="2.28.6" module="pygobject/2.28/pygobject-2.28.6.tar.bz2"
+            hash="sha256:e4bfe017fa845940184c82a4d8949db3414cb29dfc84815fb763697dc85bdcee"/>
     <dependencies>
       <dep package="meta-gtk-osx-core"/>
     </dependencies>
@@ -83,12 +84,10 @@
     </after>
   </autotools>
 
-<!-- The patch addresses bug 640738. -->
   <autotools id="pygtk" autogen-sh="configure" 
-	     autogenargs="--disable-introspection">
-    <branch version="2.22.0" module="pygtk/2.22/pygtk-2.22.0.tar.bz2"
-            hash="sha256:4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8">
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/pygtk-signal-watch.patch"; strip="1"/>
+	     autogenargs="CFLAGS=&quot;$CFLAGS -xobjectivec&quot; lt_cv_sys_global_symbol_pipe=&quot;'sed -n -e '\''s/^.*[ ]\([BCDEGRST][BCDEGRST]*\)[ ][ ]*_\([_A-Za-z][_A-Za-z0-9]*\)$/\1 _\2 \2/p'\'' | sed '\''/ __gnu_lto/d'\'''&quot;">
+    <branch version="2.4.0" module="pygtk/2.24/pygtk-2.24.0.tar.bz2"
+            hash="sha256:cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912">
     </branch>
     <dependencies>
       <dep package="pygobject"/>
@@ -100,11 +99,11 @@
     </after>
   </autotools>
 
-  <autotools id="ige-mac-integration-python" autogen-sh="configure"
+  <autotools id="gtk-mac-integration-python" autogen-sh="configure"
              autogenargs="--enable-python">
-    <branch repo="sourceforge"
-	    module="gtk-osx/ige-mac-integration-0.9.8.tar.bz2"
-            version="0.9.8" />
+    <branch module="gtk-mac-integration/1.0/gtk-mac-integration-1.0.0.tar.bz2"
+            version="1.0.0"
+	    hash="sha256:6bd3137b3f2e034e769343329dabbdbe1184f272e270613019a82035e5905feb"/>
     <dependencies>
       <dep package="pygtk"/>
     </dependencies>
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index e145332..2eaa858 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -74,8 +74,8 @@ Libglade itself is deprecated. This is the last release. -->
   </autotools>
 
     <autotools id="vala" autogen-sh="configure">
-    <branch repo="ftp.gnome.org" module="vala/0.10/vala-0.10.3.tar.bz2"
-            version="0.10.3" hash="sha256:338b9869ad5c585b58540ffc9b576cbe44709864da2582c7ebc7a5d817004974"/>
+    <branch repo="ftp.gnome.org" module="vala/0.14/vala-0.14.0.tar.bz2"
+            version="0.14.0" hash="sha256:4cbca602e2e2a09803ae33fd7324219bc2c611db5a62a52e733e7d8806acb6f5"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-core"/>
@@ -97,10 +97,11 @@ Libglade itself is deprecated. This is the last release. -->
     </dependencies>
   </autotools>
 
+<!-- Glade 3.8 is the last stable series for Gtk+-2 -->
   <autotools id="glade3" autogen-sh="configure" 
 	     autogenargs="--disable-scrollkeeper">
-    <branch module="glade3/3.6/glade3-3.6.7.tar.bz2" version="3.6.7"
-            hash="sha256:117905d5b52781e0ffa861e38f47acda0e6bff992c5015408be74a7669769f81"/>
+    <branch module="glade3/3.8/glade3-3.8.0.tar.bz2" version="3.8.0"
+            hash="sha256:ad3f726ccd34d210dbec9cc2787cab91f7b4c4b9e7518c00bc72b6d52c9858bb"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
@@ -108,6 +109,20 @@ Libglade itself is deprecated. This is the last release. -->
     </after>
   </autotools>
 
+<!-- Glade 3.10 is the first stable series for Gtk+-3. Note the name
+     change back to just "glade"-->
+  <autotools id="glade" autogen-sh="configure" 
+	     autogenargs="--disable-scrollkeeper">
+    <branch module="glade/3.10/glade3-3.10.0.tar.bz2" version="3.10.0"
+            hash="sha256:7e6a1423f1697d8b40618d0b01f0ebff572ccb80f5818a36af0971c5d1d94253"/>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-themes"/>
+      <dep package="meta-gtk-osx-core"/>
+    </after>
+  </autotools>
+
+<!-- gtksourceview-2.10.5 is the last version that supports Gtk+-2 -->
   <autotools id="gtksourceview" autogen-sh="configure">
     <branch module="gtksourceview/2.10/gtksourceview-2.10.5.tar.bz2"
             version="2.10.5" hash="sha256:c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"/>
@@ -117,6 +132,16 @@ Libglade itself is deprecated. This is the last release. -->
     </after>
   </autotools>
 
+
+  <autotools id="gtksourceview3" autogen-sh="configure">
+    <branch module="gtksourceview/3.2/gtksourceview-3.2.0.tar.bz2"
+            version="3.2.0" hash="sha256:82b1028d69fcb24650ebc801454eb688dc3a01c6061c1d77d1cf665f048f050a"/>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-core"/>
+    </after>
+  </autotools>
+
   <autotools id="libIDL" autogen-sh="configure">
     <branch module="libIDL/0.8/libIDL-0.8.14.tar.bz2" version="0.8.14"
             hash="sha256:c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220"/>
@@ -142,8 +167,8 @@ Libglade itself is deprecated. This is the last release. -->
 	   --with-session-socket-dir=/var/tmp">
     <branch module="dbus/dbus-1.4.1.tar.gz"  version="1.4.1"
 	    repo="dbus.freedesktop.org">
-      <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/dbus-install.patch"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/dbus-msg-nosignal.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/dbus-install.patch"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/dbus-msg-nosignal.patch"; strip="1"/>
     </branch>
     <after>
       <dep package="gtk+"/>
@@ -168,7 +193,7 @@ Libglade itself is deprecated. This is the last release. -->
 	     autogenargs="--disable-defaults-service">
      <branch module="GConf/2.28/GConf-2.28.0.tar.bz2" version="2.28.0"
 	     hash="sha256:d057dcfe2bfb2a80e592349c2a78d7dce12d19542aeced466c64fb701c806ac8">
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/GConf-characters.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/GConf-characters.patch"; strip="1"/>
      </branch>
 <!-- GConf-2.32 uses gdbus, which doesn't work for OSX -->
 	   <!--branch module="GConf/2.32/GConf-2.32.1.tar.bz2" version="2.32.1"
@@ -180,8 +205,8 @@ Libglade itself is deprecated. This is the last release. -->
   </autotools>
 
   <autotools id="lcms" autogen-sh="configure">
-    <branch module="lcms/lcms-1.19.tar.gz" version="1.19" repo="sourceforge"
-            checkoutdir="lcms-1.19"/>
+    <branch module="lcms/lcms2-2.2.tar.gz" version="2.2" repo="sourceforge"
+            />
   </autotools>
 
   <autotools id="shared-mime-info"  autogen-sh="configure"
@@ -213,8 +238,8 @@ Libglade itself is deprecated. This is the last release. -->
   </autotools>
 
     <autotools id='readline' >
-    <branch repo="ftp.gnu.org" module="readline/readline-6.0.tar.gz"
-	    version="6.0"/>
+    <branch repo="ftp.gnu.org" module="readline/readline-6.2.tar.gz"
+	    version="6.2"/>
   </autotools>
 
 <autotools id="babl" >
@@ -232,7 +257,7 @@ Libglade itself is deprecated. This is the last release. -->
 
   <autotools id="poppler"  autogen-sh="configure"
            autogenargs="--disable-qt --disable-qt4 --without-x --disable-gtk-test --enable-xpdf-headers">
-    <branch module="poppler-0.16.2.tar.gz" version="0.16.2"
+    <branch module="poppler-0.16.7.tar.gz" version="0.16.7"
             repo="poppler.freedesktop.org"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -242,17 +267,26 @@ Libglade itself is deprecated. This is the last release. -->
 
 <!-- SQLite3 is provided by MacOSX in /usr/lib/libsqlite.3.dylib -->
   <autotools id="sqlite" autogenargs="--disable-tcl --enable-threadsafe" >
-    <branch module="sqlite-autoconf-3070500.tar.gz" version='3.7.5'
+    <branch module="sqlite-autoconf-3070800.tar.gz" version='3.7.8'
 	    repo="sqlite"/>
   </autotools>
 
   <autotools id="goocanvas">
-    <branch module="goocanvas/2.0/goocanvas-2.0.0.tar.bz2" version="2.0.0"/>
+    <branch module="goocanvas/1.0/goocanvas-1.0.0.tar.bz2" version="1.0.0"
+	    hash="sha256:1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e"/>
     <dependencies>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
+<!-- Goocanvas has numbering issues, because 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+"/>
+    </dependencies>
+  </autotools>
 
 <!-- Libart_lgpl is deprecated by gnome. This is probably the last release. -->
   <autotools id="libart_lgpl">
@@ -265,7 +299,7 @@ Libglade itself is deprecated. This is the last release. -->
   </autotools>
 
   <autotools id="hunspell" autogen-sh="configure">
-    <branch module="hunspell/hunspell-1.2.14.tar.gz" version="1.2.14"
+    <branch module="hunspell/hunspell-1.3.2.tar.gz" version="1.3.2"
 	    repo="sourceforge"/>
   </autotools>
 
@@ -283,8 +317,8 @@ Libglade itself is deprecated. This is the last release. -->
   </autotools>
 
   <autotools id="gmp">
-    <!--branch repo="ftp.gnu.org" module="gmp/gmp-5.0.0.tar.bz2" version="5.0.0"/-->
-    <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.1.tar.bz2" version="4.3.1"/>
+    <!--branch repo="ftp.gnu.org" module="gmp/gmp-5.0.2.tar.bz2" version="5.0.2"/-->
+    <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.2.tar.bz2" version="4.3.2"/>
   </autotools>
 
   <autotools id="guile" autogen-sh="configure">
@@ -295,5 +329,13 @@ Libglade itself is deprecated. This is the last release. -->
     </dependencies>
   </autotools>
 
+  <autotools id="guile2" autogen-sh="configure">
+    <branch repo="ftp.gnu.org" module="guile/guile-2.0.2.tar.gz"
+	    version="2.0.2"/>
+    <dependencies>
+      <dep package="gmp"/>
+    </dependencies>
+  </autotools>
+
 
 </moduleset>
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index b153340..44c5911 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -52,9 +52,9 @@
 	    module="libpng/zlib-1.2.5.tar.gz"/>
   </autotools>
 
-  <autotools id="gnutls" autogen-sh="configure" autogenargs="--with-libgcrypt">
-    <branch repo='ftp.gnu.org' version='2.12.6'
-            module="gnutls/gnutls-2.12.6.tar.bz2"/>
+  <autotools id="gnutls" autogen-sh="configure" autogenargs="--with-libgcrypt --without-p11-kit">
+    <branch repo='ftp.gnu.org' version='2.12.11'
+            module="gnutls/gnutls-2.12.11.tar.bz2"/>
     <dependencies>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
@@ -64,20 +64,23 @@
   </autotools>
 
 <!-- Libsoup doesn't work with newer versions of libproxy -->
-  <autotools id='libproxy'>
-    <branch version='0.3.1' module='libproxy-0.3.1.tar.bz2'
+  <cmake id='libproxy'>
+    <branch version='0.4.7' module='libproxy-0.4.7.tar.gz'
             repo='libproxy.google.com'/>
-  </autotools>
+  </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/2.32/gnome-keyring-2.32.1.tar.bz2"
-	    version="2.32.1" hash="sha256:31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9" -->
-    <branch module="gnome-keyring/2.28/gnome-keyring-2.28.2.tar.bz2"
-	    version="s.28.2"
-	    hash="sha256:d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6">
-      <!-- This patch is for gnome-keyring 2.32.1
-	   patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gnome-keyring-dumb-typo.patch"; strip="1"/-->
+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"/>
     </branch>
     <dependencies>
       <dep package="gtk+"/>
@@ -86,15 +89,25 @@ branch module="gnome-keyring/2.32/gnome-keyring-2.32.1.tar.bz2"
     </dependencies>
   </autotools>
 
-  <autotools id="libsoup" autogen-sh="configure" >
-    <branch module="libsoup/2.32/libsoup-2.32.2.tar.bz2"
-            version="2.32.2" hash="sha256:96e6973c8b7459523c0f44e7aec69528ff2fbd388e8ddc415f91bcc42f50777f" />
+  <autotools id="glib-networking" autogen-sh="configure"
+	     autogenargs="--without-ca-certificates">
+    <branch module="glib-networking/2.28/glib-networking-2.28.7.tar.bz2"
+	    version="2.28.7" hash="sha256:98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c"/>
+    <dependencies>
+      <dep package="gnutls"/>
+      <dep package="libgcrypt"/>
+    </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" />
     <dependencies>
       <dep package="glib"/>
+      <dep package="glib-networking"/>
       <dep package="gnutls"/>
       <dep package='gconf'/>
       <dep package="libproxy"/>
-      <dep package="gnome-keyring"/>
       <dep package='sqlite'/>
     </dependencies>
   </autotools>
@@ -113,9 +126,9 @@ branch module="gnome-keyring/2.32/gnome-keyring-2.32.1.tar.bz2"
 	    module="gcrypt/libgpg-error/libgpg-error-1.10.tar.bz2"/>
   </autotools>
 
-  <autotools id="libgcrypt" autogen-sh="configure">
-    <branch repo='ftp.gnupg.org' version='1.4.6'
-	    module='gcrypt/libgcrypt/libgcrypt-1.4.6.tar.bz2'/>
+  <autotools id="libgcrypt" autogen-sh="configure" autogenargs="--disable-asm">
+    <branch repo='ftp.gnupg.org' version='1.5.0'
+	    module='gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2'/>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>
@@ -135,10 +148,10 @@ branch module="gnome-keyring/2.32/gnome-keyring-2.32.1.tar.bz2"
   <autotools id="WebKit" autogen-sh="configure"
 	     autogenargs="--with-target=quartz --disable-video --with-font-backend=pango">
     <!--branch repo="webkit.org" module="webkit-1.1.12.tar.gz" version="1.1.12">
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/webkit.patch"; strip="1"/ -->
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit.patch"; strip="1"/ -->
     <branch repo="webkit.org" module="webkit-1.1.15.4.tar.gz" version="1.1.15">
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/webkit-1.1.15.patch"; strip="1"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/webkit-disallowctype.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.1.15.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/webkit-disallowctype.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="libsoup"/>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 6b22f47..40e3f3a 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -10,9 +10,8 @@
               href="http://cairographics.org/releases/"/>
   <repository type="tarball" name="ftp.gnu.org"
               href="http://ftp.gnu.org/gnu/"/>
-  <repository type="tarball" name="github.com"
-              href="https://github.com/"/>
-
+  <repository type="tarball" name="sourceware.org"
+              href="ftp://sourceware.org/pub/"/>
   <!-- This module set works a bit differently than for example the
        GNOME ones do. It's split up in seperate pieces:
 
@@ -48,7 +47,7 @@
   <metamodule id="meta-gtk-osx-core">
     <dependencies>
       <dep package="gtk+"/>
-      <dep package="ige-mac-integration"/>
+      <dep package="gtk-mac-integration"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -56,8 +55,8 @@
   </metamodule>
 
   <autotools id="glib" autogen-sh="configure">
-    <branch module="glib/2.27/glib-2.27.3.tar.bz2"  version="2.27.3"
-            hash="sha256:c44177b635e88639361eb1daf7aaa33315a00aaf46db5accf2f11920c7ff1919"/>
+    <branch module="glib/2.28/glib-2.28.8.tar.bz2"  version="2.28.8"
+            hash="sha256:222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="gtk-doc"/>
@@ -65,15 +64,16 @@
   </autotools>
 
   <autotools id="libffi">
-    <branch module="atgreen/libffi/tarball/v3.0.9" repo="github.com"
-            version="3.0.9" checkoutdir="atgreen-libffi-873d687"/>
+    <branch module="libffi/libffi-3.0.10.tar.gz" repo="sourceware.org"
+            version="3.0.10" checkoutdir="atgreen-libffi-873d687"/>
   </autotools>
 
+<!-- This is the latest 0.10 version. Later versions are 1.29 and intended to work with glib 2.29; the minor version of gobject-introspection will track the minor version of glib that it's intended to work with. -->
   <autotools id="gobject-introspection">
-    <branch module="gobject-introspection/0.10/gobject-introspection-0.10.1.tar.bz2"
-            version="0.10.1"
-            hash="sha256:59033bcb428fd507f9b8399424e847ab24d5e1fe5d587f6915be9940fde69890">
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/girscanner-objc.patch"; strip="1"/>
+    <branch module="gobject-introspection/0.10/gobject-introspection-0.10.8.tar.bz2"
+            version="0.10.8"
+            hash="sha256:5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/girscanner-objc.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -87,11 +87,11 @@
              autogenargs="--without-x --with-included-modules=basic-atsui"
              makeargs="-k -C modules; make">
     <!-- The last version that will build on Tiger is 1.24.5 -->
-    <branch version="1.28.3" module="pango/1.28/pango-1.28.3.tar.bz2"
-            hash="sha256:5e278bc9430cc7bb00270f183360d262c5006b51248e8b537ea904573f200632">
+    <branch version="1.28.4" module="pango/1.28/pango-1.28.4.tar.bz2"
+            hash="sha256:7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f">
 <!--    <branch version="1.24.5" module="pango/1.24/pango-1.24.5.tar.bz2"
             hash="sha256:0f733d1ec3e8dafcae152d7ac58f1090bee1fd856176c8fee0e81b0e42392f4e">-->
-  <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/pangoatsui-fontname.patch"; strip="1"/>
+  <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/pangoatsui-fontname.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -106,8 +106,19 @@
   </autotools>
 
  <autotools id="atk" autogen-sh="configure">
-    <branch module="atk/1.32/atk-1.32.0.tar.bz2" version="1.32.0"
-            hash="sha256:e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e"/>
+    <branch module="atk/1.33/atk-1.33.6.tar.bz2" version="1.33.6"
+            hash="sha256:e61c9a7bb2605a6ba698285f5593590c90818592f3d122101b9d42697fd2b0b6"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+    </after>
+  </autotools>
+
+ <autotools id="atk2" autogen-sh="configure">
+    <branch module="atk/2.0/atk-2.0.1.tar.bz2" version="2.0.1"
+            hash="sha256:3d81c7d70fc66e5b129567a7706b6f8ff5db18281a818b29d4dd5bcefa3d4a17"/>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
@@ -127,21 +138,39 @@
   <autotools id="gtk+" autogen-sh="configure"
              autogenargs="--with-gdktarget=quartz"
              autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
-    <branch module="gtk+/2.24/gtk+-2.24.0.tar.bz2" version="2.24.0"
-            hash="sha256:cbed1a7b8cd1e471388a00f22557dd061334698a0c1aece11b7ed6541d115606">
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gtkselection.patch"; strip="1"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gtk-introspection.patch"; strip="1"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gtk-keyhash.patch"; strip="1"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gtk-relocation.patch"; strip="1"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gdk-deadkeys.patch"; strip="1"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gdkeventloop.patch"; strip="1"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gtkdndmemory.patch"; strip="1"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gtkselection_deref.patch"; strip="1"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gtk-borderless.patch"; strip="1"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gtk2-lion-resize.patch"; strip="1"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gdk-quartz-version.patch"; strip="1"/>
-      <patch file="https://raw.github.com/jralls/gtk-osx-build/master/patches/gdk-quartz-norects.patch"; strip="1"/>
+    <branch module="gtk+/2.24/gtk+-2.24.6.tar.bz2" version="2.24.6"
+            hash="sha256:6f45bdbf9ea27eb3b5f977d7ee2365dede0d0ce454985680c26e5210163bbf37">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Backport-acf1345-Fix-refresh-of-static-autorelease_p.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0002-Bug-628396-Gtk-build-fails-because-of-objective-c-el.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0003-Bug-658772-Implement-relocatable-paths-for-quartz-si.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0005-Bug-657770-Write-to-released-memory-in-gtkdnd-quartz.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0007-Bug-658767-Drag-and-Drop-NSEvent-capture-is-racy.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0009-Implement-recent-items-in-Filechooser.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0010-Bug-617583-Dead-accents-keys-don-t-work-in-GTK-appli.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0011-bgo-514843-filechooser-Deal-with-corrupted-.gtk-book.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0012-Bug-605799-Option-MOD1-and-Command-SUPER-modifiers-a.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0013-Bug-659406-Abstract-what-triggers-a-context-menu.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0014-Bug-659907-gdk_quartz_draw_opaque_stippled_pattern-c.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0015-Bug-653450-gtkfilechooser-crashes-when-adding-favori.patch"; strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="pango"/>
+      <dep package="atk"/>
+      <dep package="gdk-pixbuf"/>
+    </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+    </after>
+  </autotools>
 
+  <autotools id="gtk+-3" autogen-sh="configure"
+             autogenargs="--with-gdktarget=quartz"
+             autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
+    <branch module="gtk+/3.2/gtk+-3.2.0.tar.bz2" version="3.2.0"
+            hash="sha256:b285074ffefb4ff4364f6dd50fe68c7e85b11293e0c1dd3bdeac56052344dadb">
     </branch>
     <dependencies>
       <dep package="pango"/>
@@ -154,8 +183,9 @@
   </autotools>
 
   <autotools id="pixman" autogenargs="--disable-gtk" autogen-sh="configure">
-    <branch version="0.20.2" module="pixman-0.20.2.tar.gz"
-            repo="cairographics"/>
+    <branch version="0.22.2" module="pixman-0.22.2.tar.gz"
+            repo="cairographics"
+            hash="sha1:b42a7aec5119b1e5ce8eed06452645fa3a4892ac"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
@@ -164,7 +194,8 @@
   <autotools id="cairo"  autogen-sh="configure"
              autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
     <branch module="cairo-1.10.2.tar.gz"  version="1.10.2"
-            repo="cairographics"/>
+            repo="cairographics"
+            hash="sha1:ccce5ae03f99c505db97c286a0c9a90a926d3c6e"/>
     <dependencies>
       <dep package="pixman"/>
     </dependencies>
@@ -175,11 +206,11 @@
     </after>
   </autotools>
 
-  <autotools id="ige-mac-integration" autogen-sh="configure"
+  <autotools id="gtk-mac-integration" autogen-sh="configure"
              autogenargs="--disable-python">
-    <branch repo="sourceforge"
-	    module="gtk-osx/ige-mac-integration-0.9.8.tar.bz2"
-            version="0.9.8">
+    <branch module="gtk-mac-integration/1.0/gtk-mac-integration-1.0.0.tar.bz2"
+            version="1.0.0"
+            hash="sha256:6bd3137b3f2e034e769343329dabbdbe1184f272e270613019a82035e5905feb">
     </branch>
     <dependencies>
       <dep package="gtk+"/>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]