[gtk-osx] Fix up dependencies in gtk-osx.modules so that they're the same in all modulesets.

[John Ralls <jralls src gnome org>]

commit ac71718664cf60f20e36c3e5f947a9b4eb5137fc
Author: John Ralls <jralls ceridwen us>
Date:   Tue Mar 1 09:47:29 2016 -0800

    Fix up dependencies in gtk-osx.modules so that they're the same in all modulesets.

 modulesets-stable/gtk-osx.modules   |    3 +--
 modulesets-unstable/gtk-osx.modules |   21 +++++++++++----------
 modulesets/gtk-osx.modules          |    2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index fca4bc8..f578fd6 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -131,12 +131,12 @@
             hash="sha256:1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7">
     </branch>
     <dependencies>
+      <dep package="glib"/>
       <dep package="cairo"/>
      </dependencies>
     <after>
       <dep package="gobject-introspection"/>
       <dep package="meta-gtk-osx-freetype"/>
-      <dep package="glib"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </autotools>
@@ -215,7 +215,6 @@
       <dep package="glib"/>
       <dep package="pango"/>
       <dep package="atk"/>
-      <dep package="cairo"/>
       <dep package="gdk-pixbuf"/>
       <dep package="gobject-introspection"/>
       <dep package="libepoxy"/>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 39dfdee..3534525 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -71,7 +71,6 @@
   <autotools id="glib" autogenargs="--disable-dtrace --with-pcre=insternal">
     <branch />
     <dependencies>
-      <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="libffi"/>
     </dependencies>
   </autotools>
@@ -97,8 +96,10 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
-     <dep package="libffi"/>
     </dependencies>
+    <after>
+      <dep package='python2.7'/>
+    </after>
   </autotools>
 
   <autotools id="pango">
@@ -106,10 +107,10 @@
     <dependencies>
       <dep package="cairo"/>
       <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="meta-gtk-osx-bootstrap"/>
     </dependencies>
     <after>
+      <dep package="gobject-introspection"/>
+      <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-freetype"/>
     </after>
   </autotools>
@@ -117,11 +118,10 @@
  <autotools id="atk" supports-non-srcdir-builds="no">
     <branch />
     <dependencies>
-      <dep package="libffi"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
     </dependencies>
     <after>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </autotools>
@@ -155,10 +155,11 @@
             autogenargs="--with-gdktarget=quartz --enable-introspection=no --enable-quartz-relocation">
     <branch revision="gtk-2-24" checkoutdir="gtk+-2.0"/>
     <dependencies>
-      <dep package="gobject-introspection"/>
+      <dep package="glib"/>
       <dep package="pango"/>
-      <dep package="gdk-pixbuf"/>
       <dep package="atk"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -170,10 +171,10 @@
     <branch module="gtk+" checkoutdir="gtk+-3.0"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gobject-introspection"/>
       <dep package="pango"/>
       <dep package="gdk-pixbuf"/>
       <dep package="atk"/>
+      <dep package="gobject-introspection"/>
       <dep package="libepoxy"/>
     </dependencies>
     <after>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 19e9104..0276202 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -124,9 +124,9 @@
   <autotools id="atk">
     <branch tag="gnome-3-16"/>
     <dependencies>
-      <dep package="glib"/>
     </dependencies>
     <after>
+      <dep package="glib"/>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="gobject-introspection"/>
     </after>