[gtk-osx] Fix several moduleset errors.

[John Ralls <jralls src gnome org>]

commit 32996f07cf0ae375a6c28a2f124d12f32afaab65
Author: John Ralls <jralls ceridwen us>
Date:   Sun Jul 30 16:30:15 2017 +0100

    Fix several moduleset errors.

 modulesets-stable/gtk-osx-gtkmm.modules  |    2 +-
 modulesets-stable/gtk-osx-python.modules |    3 +--
 modulesets-stable/gtk-osx-random.modules |    4 ++--
 modulesets-stable/gtk-osx.modules        |    2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-gtkmm.modules b/modulesets-stable/gtk-osx-gtkmm.modules
index dd807be..618c1de 100644
--- a/modulesets-stable/gtk-osx-gtkmm.modules
+++ b/modulesets-stable/gtk-osx-gtkmm.modules
@@ -75,7 +75,7 @@
      website. If you want the docs, install it separately and renable
      documentation in your jhbuildrc-custom. -->
   <autotools id="libsigc++2" autogen-sh="configure"
-            autogen-args="--disable-documentation">
+            autogenargs="--disable-documentation">
     <branch module="libsigc++/2.10/libsigc++-2.10.0.tar.xz" version="2.10.0"
             hash="sha256:f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81"/>
   </autotools>
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index 772a0b8..4093bf1 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -121,7 +121,7 @@
       <dep package="python3"/>
       <dep package="python"/>
       <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gtk-osx"/>
+      <dep package="meta-gtk-osx-core"/>
     </after>
   </distutils>
 
@@ -146,7 +146,6 @@
     <branch version="3.24.1" module="pygobject/3.24/pygobject-3.24.1.tar.xz"
            hash="sha256:a628a95aa0909e13fb08230b1b98fc48adef10b220932f76d62f6821b3fdbffd"/>
     <dependencies>
-      <dep package="meta-gtk-osx-gtk3"/>
       <dep package="pycairo"/>
     </dependencies>
     <after>
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 7cabf07..ae924c0 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -337,12 +337,12 @@ Libglade itself is deprecated. This is the last release. -->
   </autotools>
 
   <autotools id="libatomic-ops"
-             autogen-template="%(autogen-sh)s &amp;&amp; ./configure --prefix=%(prefix)s> %(autogen-args)s">
+             autogen-template="pushd %(srcdir)s &amp;&amp; ./%(autogen-sh)s &amp;&amp; popd &amp;&amp; 
%(srcdir)s/configure --prefix=%(prefix)s %(autogenargs)s">
     <branch repo="github.com" module="ivmai/libatomic_ops"
            revision="libatomic_ops-7_4_4"/>
   </autotools>
 
-  <autotools id="bdw-gc" autogen-template="pushd %(srcdir)s &amp;&amp; ./autogen.sh &amp;&amp; automake-1.14 
-ac &amp;&amp; popd &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  %(autogenargs)s">
+  <autotools id="bdw-gc" autogen-template="pushd %(srcdir)s &amp;&amp; ./autogen.sh &amp;&amp; automake-1.10 
-ac &amp;&amp; popd &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  %(autogenargs)s">
     <branch repo="github.com" module="ivmai/bdwgc"  revision="gc7_6_0" />
     <dependencies>
       <dep package="libatomic-ops"/>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index cb83c28..e723907 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -120,7 +120,7 @@
  <autotools id="pango"  autogen-sh="autoreconf">
     <branch version="1.40.6" module="pango/1.40/pango-1.40.6.tar.xz"
             hash="sha256:ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573">
-      <patch file="patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/pango-coretext-size-and-scaling.patch"; strip="1"/>
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/pango-coretext-size-and-scaling.patch"; 
strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>