[gtk-osx] Fix up building pygobject with gtk+-3

[John Ralls <jralls src gnome org>]

commit 3c7a89bcb1e370a2e748eed1d3e8cf3c8dae95df
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jul 5 15:52:04 2012 +0100

    Fix up building pygobject with gtk+-3
    
    Includes new meta-gtk-osx-python-gtk3, other adjustments.

 modulesets-unstable/gtk-osx-python.modules |   49 ++++++++++++++++++++--------
 1 files changed, 35 insertions(+), 14 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 350f5e1..9ab1a65 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -5,9 +5,8 @@
 
   <repository type="git" name="git.gnome.org" default="yes" 
               href="git://git.gnome.org/"/>
-  <repository type="cvs" name="cairographics" 
-              cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/cairo"
-              password=""/>
+  <repository type="git" name="cairographics" 
+              href="git://git.cairographics.org/git/"/>
   <repository type="tarball" name="python"
 	      href="http://www.python.org/ftp/python/"/>
   <repository type="tarball" name="oracle"
@@ -16,14 +15,23 @@
 
   <metamodule id="meta-gtk-osx-python">
     <dependencies>
-      <dep package="pycairo"/>
+      <dep package="py2cairo"/>
       <dep package="pygobject"/>
       <dep package="pygtk"/>
       <dep package="gtk-mac-integration-python"/>
    </dependencies>
   </metamodule>
 
-   <autotools id="berkeleydb4.7" autogen-sh="dist/configure"
+  <metamodule id="meta-gtk-osx-python-gtk3">
+    <dependencies>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="py2cairo"/>
+      <dep package="pygobject"/>
+      <dep package="gtk-mac-integration-python"/>
+    </dependencies>
+  </metamodule>
+
+  <autotools id="berkeleydb4.7" 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">
 
@@ -76,8 +84,19 @@
 
 
 
-<!-- Pycairo >1.8.4 requires Python 2.6. PyCairo 1.8.10 requires
-      Python2.7. -->
+<!--Py2cairo is for Python2 and pycairo is for Python3 -->
+ <autotools id="py2cairo" >
+    <branch module="py2cairo" repo="cairographics" />
+    <dependencies>
+      <dep package="cairo"/>
+    </dependencies>
+    <after>
+      <dep package="python2.7"/>
+      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk3"/>
+    </after>
+  </autotools>
+
  <autotools id="pycairo" >
     <branch module="pycairo" repo="cairographics" />
     <dependencies>
@@ -86,25 +105,28 @@
     <after>
       <dep package="python2.7"/>
       <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk3"/>
     </after>
   </autotools>
 
   <autotools id="pygobject">
     <branch />
     <dependencies>
-      <dep package="meta-gtk-osx-core"/>
     </dependencies>
     <after>
       <dep package="python2.7"/>
+      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk3"/>
     </after>
   </autotools>
 
+
   <autotools id="pygtk" autogenargs="--disable-introspection">
     <branch />
     <dependencies>
       <dep package="pygobject"/>
       <dep package="meta-gtk-osx-core"/>
-      <dep package="pycairo"/>
+      <dep package="py2cairo"/>
     </dependencies>
     <after>
       <dep package="libglade"/>
@@ -119,13 +141,12 @@
   </autotools>
 
   <autotools id="gtk-mac-integration-python">
-    <branch/>
-    <dependencies>
-      <dep package="pygobject"/>
-      <dep package="gtk+"/>
-    </dependencies>
+    <branch module="gtk-mac-integration"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="gtk+"/>
+      <dep package="gtk+-3.0"/>
+      <dep package="pygobject"/>
     </after>
   </autotools>