[gtk-osx] Bring modulesets core and python modulesets up to date with modulesets-stable.

[John Ralls <jralls src gnome org>]

commit c560e4f7ca25781df34764c22e826c211b3c1236
Author: John Ralls <jralls ceridwen us>
Date:   Fri Oct 28 13:24:58 2011 -0700

    Bring modulesets core and python modulesets up to date with modulesets-stable.

 modulesets/gtk-osx-python.modules |   64 ++++++++++++++++++++++-------
 modulesets/gtk-osx.modules        |   79 +++++++++++++++++++++++++++++++------
 2 files changed, 114 insertions(+), 29 deletions(-)
---
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index f029fdf..0715b2d 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -5,11 +5,10 @@
 
   <repository type="git" name="git.gnome.org" default="yes" 
               href="git://git.gnome.org/"/>
-  <repository type="cvs" name="cairographics-cvs" 
-              cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/cairo"
-              password=""/>
-  <repository type="git" name="cairographics"
-              href="git://anongit.freedesktop.org/git/"/>
+  <repository type="tarball" name="cairographics"
+              href="http://cairographics.org/releases/"/>
+<!--  <repository type="git" name="cairographics"
+              href="git://anongit.freedesktop.org/git/"/> -->
   <repository type="tarball" name="python"
 	      href="http://www.python.org/ftp/python/"/>
   <repository type="tarball" name="oracle"
@@ -24,6 +23,15 @@
     </dependencies>
   </metamodule>
 
+  <metamodule id="meta-gtk-osx-python-gtk3">
+    <dependencies>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="pycairo-python2.6"/>
+      <dep package="pygobject3"/>
+      <dep package="gtk-mac-integration-python"/>
+    </dependencies>
+  </metamodule>
+
   <autotools id="berkeleydb" autogen-sh="dist/configure"
          autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" makeargs="-C build_unix"
          makeinstallargs="-C build_unix install">
@@ -44,8 +52,14 @@
  <!-- 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. -->
- <autotools id="pycairo" >
-    <branch module="pycairo" repo="cairographics" tag="1.8.22"/>
+<!-- PyCairo moved their repo from cvs.freedesktop.org to
+     git.freedesktop.org after the release of 1.8.6 without copying
+     history, so releases before that are available only as
+     tarballs. Moreover, they don't use branches nor do they
+     tag. There's no point in using repos here, so we don't. -->
+  <autotools id="pycairo" autogen-sh="configure">
+    <branch module="pycairo-1.8.2.tar.gz" repo="cairographics"
+            version="1.8.2" md5sum="bbfc0c2fef08dfb0c5b8baa5f0b67a87"/>
     <dependencies>
       <dep package="cairo"/>
     </dependencies>
@@ -55,20 +69,24 @@
     </after>
   </autotools>
 
-  <autotools id="pycairo-python2.6" >
-    <!-- These guys don't use tags -->
-    <branch module="pycairo" repo="cairographics" tag="1.8.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"
+            version="1.8.8"
+	    hash="md5:054da6c125cb427a003f5fd6c54f853e"/>
     <dependencies>
       <dep package="cairo"/>
     </dependencies>
     <after>
       <dep package="python"/>
       <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk3"/>
     </after>
   </autotools>
 
+
   <autotools id="pygobject" autogenargs="--disable-introspection">
-    <branch tag="d9bab3b185bb59bd29e3c3f6225f3636f58ec45e"/>
+    <branch tag="pygobject-2-28"/>
     <dependencies>
       <dep package="meta-gtk-osx-core"/>
     </dependencies>
@@ -77,8 +95,21 @@
     </after>
   </autotools>
 
+  <autotools id="pygobject3" autogenargs="--disable-introspection">
+    <branch tag="pygobject-3-0" module="pygobject" checkoutdir="pygobject3"/>
+    <dependencies>
+      <dep package="meta-gtk-osx-gtk3"/>
+    </dependencies>
+    <after>
+      <dep package="python"/>
+    </after>
+  </autotools>
+
+<!-- PyGtk is maintenance-only, since it's unecessary for Gtk3. There
+     is no pygtk-2-24 branch; all maintenance is occuring on
+     master. -->
   <autotools id="pygtk" autogenargs="--disable-introspection">
-    <branch tag="PYGTK_2_22_0"/>
+    <branch tag="master"/>
     <dependencies>
       <dep package="pygobject"/>
       <dep package="meta-gtk-osx-core"/>
@@ -90,12 +121,13 @@
   </autotools>
 
   <autotools id="gtk-mac-integration-python">
-    <branch tag="gtk-mac-integration-1.0.1" />
+    <branch tag="gtk-mac-integration-1.0.1" module="gtk-mac-integration"
+	    checkoutdir="gtk-mac-integration"/>
     <dependencies>
-      <dep package="gtk+"/>
-    </dependencies>
+     </dependencies>
     <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="pygtk"/>
+      <dep package="pygobject3"/>
     </after>
   </autotools>
 
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index bdecc2e..2ba3b58 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -50,16 +50,37 @@
     </after>
   </metamodule>
 
+  <metamodule id="meta-gtk-osx-gtk3">
+    <dependencies>
+      <dep package="gtk+-3.0"/>
+      <dep package="gtk-mac-integration"/>
+    </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-bootstrap"/>
+    </after>
+  </metamodule>
+
   <autotools id="glib">
-    <branch tag="2.27.3"/>
+    <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"/>
+    <dependencies>
+     <dep package="libffi"/>
+    </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="gtk-doc"/> <!-- FIXME: http://bugs.gnome.org/546640 -->
+      <dep package="gtk-doc"/>
     </after>
   </autotools>
 
-  <autotools id="libffi">
-    <branch module="atgreen/libffi" repo="github" tag="v3.0.9"/>
+  <autotools id="libffi" autogenargs="--disable-builddir">
+    <branch module="atgreen/libffi" repo="github" tag="v3.0.10"/>
   </autotools>
 
   <autotools id="gobject-introspection">
@@ -67,19 +88,47 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
-     <dep package="libffi"/>
+      <dep package="libffi"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gobject-introspection-gtk3">
+    <branch tag="gnome-3-2" module="gobject-introspection"/>
+    <dependencies>
+      <dep package="glib-gtk3"/>
+      <dep package="cairo"/>
     </dependencies>
   </autotools>
 
   <autotools id="pango"
              autogenargs="--without-x --with-included-modules=basic-atsui"
              makeargs="-k -C modules; make">
-    <branch tag="1.28.3"/>
+    <branch tag="1.28"/>
     <dependencies>
+      <dep package="cairo"/>
+      <dep package="fontconfig"/>
+      <dep package="freetype"/>
+    </dependencies>
+    <after>
       <dep package="glib"/>
+      <dep package="glib-gtk3"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gobject-introspection-gtk3"/>
+      <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"/>
@@ -87,17 +136,18 @@
   </autotools>
 
  <autotools id="atk">
-    <branch revision="gnome-2-30"/>
+    <branch revision="gnome-3-2"/>
     <dependencies>
-      <dep package="glib"/>
     </dependencies>
     <after>
+      <dep package="glib"/>
+      <dep package="glib-gtk3"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </autotools>
 
   <autotools id="gdk-pixbuf">
-    <branch tag="2.23.0"/>
+    <branch tag="gdk-pixbuf-2-24"/>
     <after>
       <dep package="pango"/>
     </after>
@@ -119,9 +169,11 @@
 	     autogenargs="--enable-quartz-backend --disable-colord">
     <branch module="gtk+" checkoutdir="gtk+-3.0" revision="quartz-integration"/>
     <dependencies>
-      <dep package="pango"/>
+      <dep package="glib-gtk3"/>
+      <dep package="pango-gtk3"/>
+      <dep package="atk"/>
       <dep package="gdk-pixbuf"/>
-     <dep package="atk"/>
+      <dep package="gobject-introspection-gtk3"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -129,7 +181,7 @@
   </autotools>
 
   <autotools id="pixman" autogenargs="--disable-gtk">
-    <branch repo="cairographics" module="pixman" tag="pixman-0.21.4"/>
+    <branch repo="cairographics" module="pixman" tag="0.22"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
@@ -150,9 +202,10 @@
   <autotools id="gtk-mac-integration" autogenargs="--disable-python">
     <branch tag="gtk-mac-integration-1.0.1" />
     <dependencies>
-      <dep package="gtk+"/>
     </dependencies>
     <after>
+      <dep package="gtk+"/>
+      <dep package="gtk+-3.0"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </autotools>