[gtk-osx] Remove gobject-introspection-10

[John Ralls <jralls src gnome org>]

commit 19882738e6e9be6deb813a40a67af26068b79ce0
Author: John Ralls <jralls ceridwen us>
Date:   Tue Mar 1 08:59:00 2016 -0800

    Remove gobject-introspection-10
    
    Also ensure that gtk+ depends on gobject-introspection in all 3
    modulesets.

 modulesets-stable/gtk-osx.modules   |   17 -----------------
 modulesets-unstable/gtk-osx.modules |    1 +
 modulesets/gtk-osx.modules          |   16 ++--------------
 3 files changed, 3 insertions(+), 31 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index c6b6c96..fca4bc8 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -109,20 +109,6 @@
     </dependencies>
   </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. Note 
that in the unlikely event you need to introspect Gtk+-2.0, you need to build Glib 1.28 and use this 
gobject-introspection. The default is to *not* introspect Gtk+-2.0 and to use the latest GLib and 
Gobject-Introspection with Gtk3 -->
-  <autotools id="gobject-introspection-10" autogen-sh="configure">
-    <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"/>
-      <dep package="cairo"/>
-     <dep package="libffi"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gobject-introspection" autogen-sh="configure">
     <branch module="gobject-introspection/1.44/gobject-introspection-1.44.0.tar.xz"
             version="1.44.0"
@@ -149,7 +135,6 @@
      </dependencies>
     <after>
       <dep package="gobject-introspection"/>
-      <dep package="gobject-introspection-10"/>
       <dep package="meta-gtk-osx-freetype"/>
       <dep package="glib"/>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -165,7 +150,6 @@
       <dep package="glib"/>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="gobject-introspection"/>
-      <dep package="gobject-introspection-10"/>
     </after>
   </autotools>
 
@@ -175,7 +159,6 @@
     <after>
       <dep package="pango"/>
       <dep package="gobject-introspection"/>
-      <dep package="gobject-introspection-10"/>
     </after>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 39c2062..39dfdee 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -155,6 +155,7 @@
             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="pango"/>
       <dep package="gdk-pixbuf"/>
       <dep package="atk"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 8effe7b..19e9104 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -97,15 +97,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gobject-introspection-10">
-    <branch tag="GOBJECT_INTROSPECTION_0_10_1"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="libffi"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gobject-introspection">
     <branch tag="gnome-3-16" module="gobject-introspection"/>
     <dependencies>
@@ -126,7 +117,6 @@
     <after>
       <dep package="gobject-introspection"/>
       <dep package="meta-gtk-osx-freetype"/>
-      <dep package="gobject-introspection-10"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </autotools>
@@ -139,7 +129,6 @@
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="gobject-introspection"/>
-      <dep package="gobject-introspection-10"/>
     </after>
   </autotools>
 
@@ -149,21 +138,20 @@
     <after>
       <dep package="pango"/>
       <dep package="gobject-introspection"/>
-      <dep package="gobject-introspection-10"/>
     </after>
   </autotools>
 
-
   <autotools id="gtk+" autogenargs="--with-gdktarget=quartz --enable-introspection=no 
--enable-quartz-relocation">
     <branch revision="gtk-2-24"/>
     <dependencies>
+      <dep package="glib"/>
       <dep package="pango"/>
       <dep package="atk"/>
       <dep package="gdk-pixbuf"/>
+      <dep package="gobject-introspection"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="gobject-introspection-10"/>
     </after>
   </autotools>