GNOME.org
 

[gtk-osx] Bring moduleset versions up to match stable's.

commit 87b2546eaf25fc07023481dfbc533126c8f2eed4
Author: John Ralls <jralls ceridwen us>
Date:   Sat Nov 3 16:34:57 2012 -0700

    Bring moduleset versions up to match stable's.

 modulesets/gtk-osx-gstreamer.modules   |  118 +++++++++++++++++++++++++++-----
 modulesets/gtk-osx-gtkmm.modules       |   35 +++++-----
 modulesets/gtk-osx-python.modules      |   47 +++++++++----
 modulesets/gtk-osx-random.modules      |   56 ++++++---------
 modulesets/gtk-osx-themes.modules      |   11 ++--
 modulesets/gtk-osx-unsupported.modules |   83 +++++++++-------------
 modulesets/gtk-osx.modules             |   74 ++++++++------------
 7 files changed, 242 insertions(+), 182 deletions(-)
---
diff --git a/modulesets/gtk-osx-gstreamer.modules b/modulesets/gtk-osx-gstreamer.modules
index 2554a12..063808a 100644
--- a/modulesets/gtk-osx-gstreamer.modules
+++ b/modulesets/gtk-osx-gstreamer.modules
@@ -25,10 +25,34 @@
     <branch repo="faac.sourceforge.net" module="faad2" tag="FAAD2_2_7" />
   </autotools>
 
-  <autotools id="gstreamer" autogenargs="-- --disable-tests"
+  <autotools id="gstreamer-common">
+    <branch module="common" revision="0.10"/>
+  </autotools>
+
+  <autotools id="gstreamer-common-1.0">
+    <branch module="common" revision="1.0"/>
+  </autotools>
+
+  <autotools id="gstreamer" autogenargs="--disable-tests"
              supports-non-srcdir-builds="no"
-    makeargs="ERROR_CFLAGS=" >
-    <branch tag="RELEASE-0.10.35"/>
+	     makeargs="ERROR_CFLAGS=" >
+    <branch revision="0.10"/>
+    <dependencies>
+      <dep package="gstreamer-common"/>
+    </dependencies>
+    <after>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
+    </after>
+  </autotools>
+
+   <autotools id="gstreamer-1.0" autogenargs="--disable-tests"
+             supports-non-srcdir-builds="no"
+	     makeargs="ERROR_CFLAGS=" >
+    <branch module="gstreamer" revision="1.0"/>
+    <dependencies>
+      <dep package="gstreamer-common-1.0"/>
+    </dependencies>
     <after>
       <dep package="glib"/>
       <dep package="libxml2"/>
@@ -36,12 +60,11 @@
   </autotools>
 
   <autotools id="gst-plugins-base" supports-non-srcdir-builds="no"
-             autogenargs="-- --disable-tests --disable-x --disable-xvideo"
+             autogenargs="--disable-tests --disable-x --disable-xvideo"
              makeargs="ERROR_CFLAGS=" >
-    <branch tag="RELEASE-0.10.35"/>
+    <branch revision="0.10"/>
     <dependencies>
       <dep package="gstreamer"/>
-      <!--dep package="gtk+"/-->
       <dep package="liboil"/>
     </dependencies>
     <after>
@@ -49,28 +72,60 @@
     </after>
   </autotools>
 
+  <autotools id="gst-plugins-base-1.0" supports-non-srcdir-builds="no"
+             autogenargs="--disable-tests --disable-x --disable-xvideo"
+             makeargs="ERROR_CFLAGS=" >
+    <branch module="gst-plugins-base" revision="1.0"/>
+    <dependencies>
+      <dep package="gstreamer-1.0"/>
+      <dep package="liborc"/>
+    </dependencies>
+    <after>
+      <dep package="gnome-vfs"/>
+    </after>
+  </autotools>
+
   <autotools id="gst-plugins-good" supports-non-srcdir-builds="no"
-             autogenargs="-- --disable-tests --disable-x --disable-xvideo --disable-osx-video"
+             autogenargs="--disable-tests --disable-x --disable-xvideo --disable-osx-video"
              makeargs="ERROR_CFLAGS=" >
-    <branch tag="RELEASE-0.10.30"/>
+    <branch revision="0.10"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gst-plugins-ugly" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no"
-    makeargs="ERROR_CFLAGS=" >
-    <branch tag="RElEASE-0.10.18"/>
+  <autotools id="gst-plugins-good-1.0" supports-non-srcdir-builds="no"
+	     autogenargs="--disable-tests --disable-x --disable-xvideo --disable-osx-video"
+             makeargs="ERROR_CFLAGS=" >
+    <branch module="gst-plugins-good" revision="1.0"/>
+    <dependencies>
+      <dep package="gstreamer-1.0"/>
+      <dep package="gst-plugins-base-1.0"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-ugly" autogenargs="--disable-tests"
+	     supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS=" >
+    <branch revision="0.10"/>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-plugins-ugly-1.0" autogenargs="--disable-tests"
+	     supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS=" >
+    <branch module="gst-pugins-ugly" revision="1.0"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gst-plugins-bad" autogenargs="-- --disable-tests --disable-x --disable-xvid" supports-non-srcdir-builds="no"
-    makeargs="ERROR_CFLAGS=" >
-    <branch tag="RELEASE-0.10.22"/>
+  <autotools id="gst-plugins-bad" autogenargs="--disable-tests --disable-x --disable-xvid"
+	     supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS=" >
+    <branch revision="0.10"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -78,18 +133,36 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gst-ffmpeg" autogenargs="-- --disable-tests --disable-mmx"
+  <autotools id="gst-plugins-bad-1.0" autogenargs="--disable-tests --disable-x --disable-xvid"
+	     supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS=" >
+    <branch module="gst-plugins-bad" revision="1.0"/>
+    <dependencies>
+      <dep package="gstreame-1.0r"/>
+      <dep package="gst-plugins-base-1.0"/>
+      <dep package="faad2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gst-ffmpeg" autogenargs="--disable-tests --disable-mmx"
              supports-non-srcdir-builds="no" >
-    <branch tag="RELEASE-0.10.12"/>
+    <branch revision="0.10"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
   </autotools>
 
+  <autotools id="gst-ffmpeg-1.0" autogenargs="--disable-tests --disable-mmx"
+             supports-non-srcdir-builds="no" >
+    <branch module="gst-ffmpeg" revision="1.0"/>
+    <dependencies>
+      <dep package="gstreamer-1.0"/>
+      <dep package="gst-plugins-base-1.0"/>
+    </dependencies>
+  </autotools>
+
   <metamodule id="meta-gstreamer">
     <dependencies>
-      <dep package="liboil"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
@@ -99,4 +172,15 @@
     </dependencies>
   </metamodule>
 
+  <metamodule id="meta-gstreamer-1.0">
+    <dependencies>
+      <dep package="gstreamer-1.0"/>
+      <dep package="gst-plugins-base-1.0"/>
+      <dep package="gst-plugins-good-1.0"/>
+      <!--dep package="gst-plugins-ugly-1.0"/-->
+      <dep package="gst-plugins-bad-1.0"/>
+      <dep package="gst-ffmpeg-1.0"/>
+    </dependencies>
+  </metamodule>
+
 </moduleset>
diff --git a/modulesets/gtk-osx-gtkmm.modules b/modulesets/gtk-osx-gtkmm.modules
index fd48de2..63e4ddb 100644
--- a/modulesets/gtk-osx-gtkmm.modules
+++ b/modulesets/gtk-osx-gtkmm.modules
@@ -13,9 +13,15 @@
     </dependencies>
   </metamodule>
 
+  <metamodule id="meta-gtk-osx-gtkmm3">
+    <dependencies>
+      <dep package="gtkmm3"/>
+    </dependencies>
+  </metamodule>
+
 <!-- mm-common is C++ glue code needed only to build from git. -->
   <autotools id="mm-common">
-    <branch module="mm-common" tag="0.9.5"/>
+    <branch module="mm-common" tag="0.9.6"/>
   </autotools>
 
   <autotools id="cairomm" >
@@ -28,7 +34,7 @@
   </autotools>
 
   <autotools id="glibmm" >
-    <branch tag="glibmm-2-28"/>
+    <branch tag="glibmm-2-34"/>
     <dependencies>
       <dep package="libsigc++2"/>
     </dependencies>
@@ -37,19 +43,9 @@
     </after>
   </autotools>
 
-  <autotools id="glibmm3" >
-    <branch tag="glibmm-2-30" module="glibmm"/>
-    <dependencies>
-      <dep package="libsigc++2"/>
-    </dependencies>
-    <after>
-      <dep package="glib-gtk3"/>
-    </after>
-  </autotools>
-
 <!-- Pangomm's last stable branch was 2-24 -->
   <autotools id="pangomm" >
-     <branch tag="2.28.2"/>
+     <branch tag="2.28.4"/>
     <dependencies>
        <dep package="cairomm"/>
     </dependencies>
@@ -57,13 +53,17 @@
       <dep package="glibmm"/>
       <dep package="glibmm3"/>
       <dep package="pango"/>
-      <dep package="pango-gtk3"/>
     </after>
   </autotools>
 
+<!-- libsigc++ depends on doxygen for documentation, but doxygen
+     doesn't build correctly under gtk-osx. It builds fine on its own,
+     of course, and there are OSX binaries available on their
+     website. If you want the docs, install it separately and renable
+     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.8"/>
+    <branch tag="2.2.11"/>
     <dependencies>
       <dep package="mm-common"/>
     </dependencies>
@@ -71,7 +71,7 @@
 
 <!-- atkmm doesn't branch -->
   <autotools id="atkmm">
-    <branch module="atkmm" tag="2.22.5"/>
+    <branch module="atkmm" tag="2.22.6"/>
     <dependencies>
       <dep package="atk"/>
     </dependencies>
@@ -88,9 +88,8 @@
     </dependencies>
   </autotools>
 
-<!-- Note: This doesn't build at the moment. See https://bugzilla.gnome.org/show_bug.cgi?id=662975. There's a patch for modulesets-stable. -->
   <autotools id="gtkmm3" >
-    <branch revision="gtkmm-3-2" module="gtkmm"/>
+    <branch revision="gtkmm-3-6" module="gtkmm"/>
     <dependencies>
       <dep package="glibmm3"/>
       <dep package="cairomm"/>
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 87e63a3..722058d 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
 
-  <repository type="git" name="git.gnome.org" default="yes" 
+  <repository type="git" name="git.gnome.org" default="yes"
               href="git://git.gnome.org/"/>
   <repository type="tarball" name="cairographics"
               href="http://cairographics.org/releases/"/>
@@ -20,6 +20,7 @@
       <dep package="pycairo-python2.6"/>
       <dep package="pygobject"/>
       <dep package="pygtk"/>
+      <dep package="gtk-mac-integration-python"/>
     </dependencies>
   </metamodule>
 
@@ -42,13 +43,20 @@
 
   <autotools id="python" autogenargs="--enable-shared" autogen-sh="configure">
     <branch repo="python"
-	    module="2.7.2/Python-2.7.2.tar.bz2" version="2.7.2">
+	    module="2.7.3/Python-2.7.3.tar.xz" version="2.7.3">
     </branch>
     <after>
       <dep package="berkeleydb"/>
     </after>
   </autotools>
 
+  <autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
+    <branch repo="python" module="3.3.0/Python-3.3.0.tar.xz" version="3.3.0"/>
+    <after>
+      <dep package="berkeleydb"/>
+    </after>
+  </autotools>
+
  <!-- Pycairo 1.8.4+ requires Python 2.6. Leopard comes only with 2.5,
      so pycairo is by default held at 1.8.2. Use pycairo-python2.6 if
      you want a more recent version. -->
@@ -69,21 +77,34 @@
     </after>
   </autotools>
 
-<!-- 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"
-            version="1.8.8"
-	    hash="md5:054da6c125cb427a003f5fd6c54f853e"/>
+<!-- Cairographics have changed the name to py2cairo for python 2 holdouts. -->
+<!-- They also broke configure (left install-sh out of the tarball) but waf works -->
+  <waf id="pycairo-python2.6">
+    <branch module="py2cairo-1.10.0.tar.bz2" repo="cairographics.org"
+            version="1.10.0"
+	    hash="sha1:2efa8dfafbd6b8e492adaab07231556fec52d6eb"/>
     <dependencies>
       <dep package="cairo"/>
     </dependencies>
     <after>
       <dep package="python"/>
       <dep package="meta-gtk-osx-core"/>
-      <dep package="meta-gtk-osx-gtk3"/>
     </after>
-  </autotools>
+  </waf>
 
+<!-- Pycairo-python3 for those who've made the leap. -->
+  <autotools id="pycairo-python3" autogen-sh="configure">
+    <branch module="pycairo-1.10.0.tar.bz2" repo="cairographics.org"
+            version="1.10.0"
+	    hash="sha1:2efa8dfafbd6b8e492adaab07231556fec52d6eb"/>
+    <dependencies>
+      <dep package="cairo"/>
+    </dependencies>
+    <after>
+      <dep package="python"/>
+      <dep package="meta-gtk-osx-core"/>
+    </after>
+  </autotools>
 
   <autotools id="pygobject" autogenargs="--disable-introspection">
     <branch tag="pygobject-2-28"/>
@@ -95,8 +116,8 @@
     </after>
   </autotools>
 
-  <autotools id="pygobject3" autogenargs="--disable-introspection">
-    <branch tag="pygobject-3-0" module="pygobject" checkoutdir="pygobject3"/>
+  <autotools id="pygobject3">
+    <branch tag="pygobject-3-4" module="pygobject" checkoutdir="pygobject3"/>
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
     </dependencies>
@@ -121,7 +142,7 @@
   </autotools>
 
   <autotools id="gtk-mac-integration-python">
-    <branch tag="gtk-mac-integration-2.0.0" module="gtk-mac-integration"
+    <branch tag="gtk-mac-integration-2.0.1" module="gtk-mac-integration"
 	    checkoutdir="gtk-mac-integration"/>
     <dependencies>
      </dependencies>
@@ -132,7 +153,7 @@
   </autotools>
 
   <autotools id="pygtk-extras">
-    <branch module="gnome-python-extras" revision="gnome-2-24"/>
+    <branch module="gnome-python-extras" revision="gnome-2-26"/>
     <dependencies>
       <dep package="pygtk"/>
       <dep package="gtkspell"/>
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index 36645b1..34d40ab 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -5,17 +5,14 @@
   <repository type="git" name="git.gnome.org" default="yes"
               href="git://git.gnome.org/"/>
   <repository type="git" name="github" href="git://github.com/"/>
-  <repository type="tarball" name="ftp.gnome.org" 
+  <repository type="tarball" name="ftp.gnome.org"
 	      href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
   <repository type="tarball" name="ftp.gnu.org"
 	      href="ftp://ftp.gnu.org/gnu/"/>
-    <repository type="git" name="git.freedesktop.org"
+  <repository type="git" name="git.freedesktop.org"
               href="git://anongit.freedesktop.org/"/>
   <repository type="tarball" name="dbus.freedesktop.org"
 	      href="http://dbus.freedesktop.org/releases/"/>
-  <repository type="cvs" name="mime.freedesktop.org"
-              cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/mime"
-              password=""/>
   <repository type="tarball" name="sourceforge"
               href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository type="tarball" name="sqlite" href="http://www.sqlite.org/"/>
@@ -77,21 +74,14 @@
     </dependencies>
   </autotools>
 -->
-    <autotools id="vala" autogen-sh="configure">
-    <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"/>
-    </after>
+
+<!-- Vala-bootstrap is the current stable vala precompiled to C. -->
+  <autotools id="vala">
+    <branch module="vala-bootstrap"/>
   </autotools>
-  <!-- Vala requires an installed vala compiler to build from git. The
-       above release is coordinated with stable, as usual. -->
-  <autotools id="vala-git">
-    <branch/>
-    <dependencies>
-      <dep package="vala" module="vala" tag="0.14"/>
-    </dependencies>
+
+  <autotools id="unique">
+    <branch tag="3.0.2"/>
   </autotools>
 
   <autotools id="devhelp">
@@ -103,11 +93,12 @@
     </after>
     <dependencies>
       <dep package="WebKit"/>
+      <dep package="unique"/>
     </dependencies>
   </autotools>
 
   <autotools id="devhelp-gtk3">
-    <branch tag="gnome-3-2" module="devhelp"/>
+    <branch tag="gnome-3-6" module="devhelp"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
@@ -129,7 +120,7 @@
   </autotools>
 
   <autotools id="glade" autogenargs="--disable-scrollkeeper">
-    <branch revision="glade-3-10"/>
+    <branch revision="glade-3-14"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
@@ -146,7 +137,7 @@
   </autotools>
 
   <autotools id="gtksourceview-gtk3">
-    <branch revision="gnome-3-2" module="gtksourceview"/>
+    <branch revision="gnome-3-6" module="gtksourceview"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-gtk3"/>
@@ -216,8 +207,8 @@
   </autotools>
 
   <autotools id="shared-mime-info" supports-non-srcdir-builds="no" >
-    <branch module="shared-mime-info" tag="RELEASE-0-9"
-            repo="mime.freedesktop.org"/>
+    <branch module="xdg/shared-mime-info" tag="Release-1-0"
+            repo="git.freedesktop.org"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -228,7 +219,7 @@
              autogenargs="--disable-python --disable-print --without-x
                           --without-dbus --without-gnomevfs4echo  --without-wmf"
              makeargs='LDFLAGS="-framework Carbon"'>
-    <branch revision="gimp-2-6"/>
+    <branch revision="gimp-2-8"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-core"/>
@@ -241,12 +232,11 @@
   </autotools>
 
    <autotools id="babl">
-<!-- Release 0.1.2; there are newer ones, but this is the latest tarball -->
-     <branch tag="BABL_0_1_2"/>
+     <branch tag="BABL_0_1_10"/>
   </autotools>
 
   <autotools id="gegl">
-    <branch tag="GEGL_0_1_2"/>
+    <branch tag="GEGL_0_2_0"/>
     <dependencies>
       <dep package="babl"/>
     </dependencies>
@@ -255,7 +245,7 @@
  <autotools id="poppler"
            autogenargs="--disable-qt --disable-qt4 --without-x --disable-gtk-test --enable-xpdf-headers">
     <branch repo="git.freedesktop.org" module="poppler/poppler"
-            revision="poppler-0.16"/>
+            revision="poppler-0.20"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-core"/>
@@ -266,7 +256,7 @@
   <autotools id="sqlite" autogenargs="--disable-tcl --enable-threadsafe" >
     <!-- Another package with a non-standard repository structure. Tarballs
     are easier.-->
-    <branch module="sqlite-autoconf-3070800.tar.gz" version='3.7.8'
+    <branch module="sqlite-autoconf-3071401.tar.gz" version='3.7.14'
 	    repo="sqlite"/>
   </autotools>
 
@@ -280,8 +270,8 @@
 
 <!-- Goocanvas 2.0 is for Gtk+-3, and uses the master branch. -->
   <autotools id="goocanvas2">
-    <!-- No tags, so this is release 2.0.0 -->
-    <branch revision="20e61391912cb930924c62a102c5482011d2d411"
+    <!-- No tags, so this is release 2.0.1 -->
+    <branch revision="533e446e584f0da3a21e38f412557986c131e0ad"
 	    module="goocanvas"/>
     <dependencies>
       <dep package="gtk+-3"/>
@@ -318,7 +308,7 @@
   <!-- gmp uses Mercurial, so we stick with the tarball to avoid
        having to install yet another vcs tool. -->
  <autotools id="gmp">
-    <!--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-5.0.5.tar.bz2" version="5.0.2"/-->
     <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.2.tar.bz2" version="4.3.2"/>
   </autotools>
 
diff --git a/modulesets/gtk-osx-themes.modules b/modulesets/gtk-osx-themes.modules
index 2c0a718..eecc3ca 100644
--- a/modulesets/gtk-osx-themes.modules
+++ b/modulesets/gtk-osx-themes.modules
@@ -46,7 +46,7 @@
   </autotools>
 
   <autotools id="gnome-icon-theme">
-    <branch revision="gnome-2-30"/>
+    <branch tag="3.6.0"/>
     <dependencies>
       <dep package="hicolor-icon-theme"/>
       <dep package="icon-naming-utils"/>
@@ -65,15 +65,15 @@
   </autotools>
 
   <autotools id="librsvg">
-    <branch module="librsvg" rebision="gnoe-2-32"/>
+    <branch module="librsvg" tag="2.36.4"/>
   </autotools>
 
   <autotools id="libcroco">
-    <branch revision="libcroco-0-6-0"/>
+    <branch tag="0.6.8"/>
   </autotools>
 
   <autotools id="libcss" autogenargs="--disable-examples">
-    <branch module="ccss" repo="freedesktop.org"/>
+    <branch module="ccss" repo="freedesktop.org" tag="ccss-0.5.0"/>
     <dependencies>
       <dep package="libcroco"/>
     </dependencies>
@@ -90,8 +90,7 @@
   </autotools>
 
   <autotools id="gtk-quartz-engine">
-    <branch module="jralls/gtk-quartz-engine"
-            repo="github.com" tag="v0.1" />
+    <branch />
     <after>
       <dep package="meta-gtk-osx-core"/>
     </after>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 437ca0c..e506b45 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -28,6 +28,22 @@
     </dependencies>
   </metamodule>
 
+  <metamodule id="meta-gtk-osx-webkit">
+    <dependencies>
+      <dep package="meta-gtk-osx-core"/>
+      <dep package="libsoup"/>
+      <dep package="WebKit"/>
+    </dependencies>
+  </metamodule>
+
+  <metamodule id="meta-gtk-osx-webkit-gtk3">
+    <dependencies>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="libsoup-gtk3"/>
+      <dep package="WebKit"/>
+    </dependencies>
+  </metamodule>
+
   <autotools id="gnome-mime-data">
    <branch tag="GNOME_MIME_DATA_2_18_0"/>
     <dependencies>
@@ -37,17 +53,18 @@
   </autotools>
 
   <autotools id="iso-codes" >
-    <branch repo="git.debian.org" tag="iso-codes/3.37"
+    <branch repo="git.debian.org" tag="iso-codes/3.39"
             module="iso-codes/iso-codes"/>
 
   </autotools>
 
   <autotools id="zlib">
-    <branch repo="sourceforge" version="1.2.5"
-	    module="libpng/zlib-1.2.5.tar.gz"/>
+    <branch repo="sourceforge" version="1.2.7"
+	    module="libpng/zlib-1.2.7.tar.gz"/>
   </autotools>
 
-  <autotools id="gnutls" autogen-sh="configure">
+  <autotools id="gnutls" autogen-sh="configure"
+	     autogenargs="--with-libgcrypt --without-p11-kit">
     <branch repo='git.gnu.org' tag='gnutls_2_12_x'/>
     <!--branch repo='ftp.gnu.org' version='2.12.11'
             module="gnutls/gnutls-2.12.11.tar.bz2"/-->
@@ -55,33 +72,19 @@
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
       <dep package="zlib"/>
-   <!--   <dep package="opencdk" /> -->
     </dependencies>
   </autotools>
 
-<!-- Libproxy needs patches to build correctly.
   <cmake id='libproxy' cmakeargs="-DWITH_PYTHON=OFF">
-    <branch version='0.4.7' module='libproxy-0.4.7.tar.gz'
+    <branch revision="libproxy-0.4.10"
             repo='libproxy.google.com'/>
     <dependencies>
       <dep package="cmake"/>
     </dependencies>
   </cmake>
--->
-
-  <cmake id='libproxy' cmakeargs="-DWITH_PYTHON=OFF">
-    <branch version='0.4.7' module='libproxy-0.4.7.tar.gz'
-            repo='libproxy.google.com'>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libproxy-Bug-052-POSIX_C_SOURCE.patch"; strip="1"/>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-168-libproxy-pc-file.patch"; strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="cmake"/>
-    </dependencies>
-  </cmake>
 
   <autotools id="libgnome-keyring">
-    <branch revision="gnome-2-32"/>
+    <branch tag="3.6.0"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="libgcrypt"/>
@@ -89,42 +92,26 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libsoup">
-    <branch revision="gnome-2-32"/>
+  <autotools id="glib-networking" autogenargs="--without-ca-certificates">
+    <branch revision="glib-2-34"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gnutls"/>
       <dep package='libproxy'/>
-      <dep package='gconf'/>
-      <dep package='sqlite'/>
-      <!-- dep package="libxml2"/ -->
-      <dep package="libgnome-keyring"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgnome-keyring-gtk3">
-    <branch revision="gnome-3-2" module="libgnome-keyring"/>
-    <dependencies>
-      <dep package="gtk+-3.0"/>
-      <dep package="libgcrypt"/>
-      <dep package="libtasn1"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libsoup-gtk3">
-    <branch revision="gnome-3-2" module="libsoup"/>
+  <autotools id="libsoup">
+    <branch revision="gnome-3-6"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gnutls"/>
-      <dep package='libproxy'/>
-      <dep package='gconf'/>
+      <dep package="glib-networking"/>
+      <dep package="libgnome-keyring"/>
       <dep package='sqlite'/>
-      <!-- dep package="libxml2"/ -->
-      <dep package="libgnome-keyring-gtk3"/>
     </dependencies>
   </autotools>
 
-   <autotools id="enchant" >
+  <autotools id="enchant" >
     <branch repo="abisource/enchant" module="enchant"
 	    tag="enchant-1-6-0"/>
     <dependencies>
@@ -142,8 +129,8 @@
 
 <!-- CVS version requires fig2dev, an X11 utility.
      <branch repo='git.gnupg.org' tag="libgcrypt-1.4.4" module='libgcrypt'/> -->
-    <branch repo='ftp.gnupg.org' version='1.4.6'
-	    module='gcrypt/libgcrypt/libgcrypt-1.4.6.tar.bz2'/>
+    <branch repo='ftp.gnupg.org' version='1.5.0'
+	    module='gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2'/>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>
@@ -152,8 +139,8 @@
   <autotools id="libtasn1" supports-non-srcdir-builds="no" >
     <!-- Git repository is missing files required to build libtasn1
     <branch repo="git.gnu.org" tag="libtasn1_2_2"  module="libtasn1"/> -->
-    <branch repo="ftp.gnu.org" version='2.9'
-	    module="libtasn1/libtasn1-2.9.tar.gz"/>
+    <branch repo="ftp.gnu.org" version='2.14'
+	    module="libtasn1/libtasn1-2.14.tar.gz"/>
   </autotools>
 
   <autotools id="WebKit"
@@ -163,13 +150,11 @@
     <dependencies>
       <dep package="libsoup"/>
       <dep package="enchant"/>
-      <!--dep package="libgail"/-->
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-core"/>
       <dep package="libcurl"/>
       <dep package="bison"/>
-      <!--dep package="gst-plugins-base"/-->
     </after>
   </autotools>
 
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 7f0428d..0e013e4 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -61,17 +61,9 @@
   </metamodule>
 
   <autotools id="glib">
-    <branch tag="glib-2-28"/>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="gtk-doc"/>
-    </after>
-  </autotools>
-
-  <autotools id="glib-gtk3">
-    <branch tag="glib-2-30" module="glib" checkoutdir="glib-gtk3"/>
+    <branch tag="glib-2-34"/>
     <dependencies>
-     <dep package="libffi"/>
+      <dep package="libffi"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -80,10 +72,10 @@
   </autotools>
 
   <autotools id="libffi" autogenargs="--disable-builddir">
-    <branch module="atgreen/libffi" repo="github" tag="v3.0.10"/>
+    <branch module="atgreen/libffi" repo="github" tag="v3.0.11"/>
   </autotools>
 
-  <autotools id="gobject-introspection">
+  <autotools id="gobject-introspection-10">
     <branch tag="GOBJECT_INTROSPECTION_0_10_1"/>
     <dependencies>
       <dep package="glib"/>
@@ -92,10 +84,10 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gobject-introspection-gtk3">
-    <branch tag="gnome-3-2" module="gobject-introspection"/>
+  <autotools id="gobject-introspection">
+    <branch tag="gnome-3-6" module="gobject-introspection"/>
     <dependencies>
-      <dep package="glib-gtk3"/>
+      <dep package="glib"/>
       <dep package="cairo"/>
     </dependencies>
   </autotools>
@@ -103,40 +95,21 @@
   <autotools id="pango"
              autogenargs="--without-x --with-included-modules=basic-atsui"
              makeargs="-k -C modules; make">
-    <branch tag="1.28"/>
+    <branch tag="1.32.1"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
-      <dep package="fontconfig"/>
-      <dep package="freetype"/>
     </dependencies>
     <after>
-      <dep package="glib-gtk3"/>
       <dep package="gobject-introspection"/>
-      <dep package="gobject-introspection-gtk3"/>
+      <dep package="meta-gtk-osx-freetype"/>
+      <dep package="gobject-introspection-10"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </autotools>
 
-  <autotools id="pango-gtk3"
-             autogenargs="--without-x --with-included-modules=basic-atsui"
-             makeargs="-k -C modules; make">
-<!-- Gtk+-3.2.0 is dependent upon pango 1.29.x, but the master branch of pango is dependent upon the master branch of glib. Don't want to go there, so setting this on the 1.29.1 release. -->
-    <branch tag="1.29.1" module="pango" checkoutdir="pango-gtk3"/>
-    <dependencies>
-      <dep package="cairo"/>
-      <dep package="fontconfig"/>
-      <dep package="freetype"/>
-      <dep package="glib-gtk3"/>
-      <dep package="gobject-introspection-gtk3"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-    </after>
-  </autotools>
-
- <autotools id="atk">
-    <branch revision="gnome-3-2"/>
+  <autotools id="atk">
+    <branch tag="ATK_2_6_0"/>
     <dependencies>
     </dependencies>
     <after>
@@ -153,6 +126,14 @@
     </after>
   </autotools>
 
+
+  <autotools id="gdk-pixbuf-gtk3">
+    <branch tag="2.26.4"/>
+    <after>
+      <dep package="pango"/>
+    </after>
+  </autotools>
+
   <autotools id="gtk+" autogenargs="--with-gdktarget=quartz --enable-introspection=no --enable-quartz-relocation">
     <branch revision="gtk-2-24"/>
     <dependencies>
@@ -162,18 +143,19 @@
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="gobject-introspection-10"/>
     </after>
   </autotools>
 
   <autotools id="gtk+-3.0"
 	     autogenargs="--enable-quartz-backend --disable-colord  --enable-quartz-relocation">
-    <branch module="gtk+" checkoutdir="gtk+-3.0" revision="gtk-3-2"/>
+    <branch module="gtk+" checkoutdir="gtk+-3.0" revision="gtk-3-6"/>
     <dependencies>
-      <dep package="glib-gtk3"/>
-      <dep package="pango-gtk3"/>
+      <dep package="glib"/>
+      <dep package="pango"/>
       <dep package="atk"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gobject-introspection-gtk3"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -181,14 +163,14 @@
   </autotools>
 
   <autotools id="pixman" autogenargs="--disable-gtk">
-    <branch repo="cairographics" module="pixman" tag="0.22"/>
+    <branch repo="cairographics" module="pixman" tag="0.26"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </autotools>
 
   <autotools id="cairo" autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
-    <branch repo="cairographics" module="cairo" revision="1.10"/>
+    <branch repo="cairographics" module="cairo" revision="1.12"/>
     <dependencies>
       <dep package="pixman"/>
     </dependencies>
@@ -200,7 +182,7 @@
   </autotools>
 
   <autotools id="gtk-mac-integration" autogenargs="--disable-python">
-    <branch tag="gtk-mac-integration-2.0.0" />
+    <branch tag="gtk-mac-integration-2.0.1" />
     <dependencies>
     </dependencies>
     <after>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]