[gtk-osx] Core update. For most core packages further updates will require Meson.

[John Ralls <jralls src gnome org>]

commit 7b7c44661b078857bb5af4961193ee2b9addb3fc
Author: John Ralls <jralls ceridwen us>
Date:   Thu Mar 21 18:04:43 2019 -0700

    Core update. For most core packages further updates will require Meson.
    
    Note as well that gtk-doc and gobject-introspection now REQUIRE PYTHON3.

 modulesets-stable/gtk-osx.modules   | 17 +++++++----------
 modulesets-unstable/gtk-osx.modules | 12 ++++++------
 modulesets/gtk-osx.modules          | 21 +++++++++------------
 3 files changed, 22 insertions(+), 28 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 1481357..92f20db 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -86,8 +86,8 @@
   </metamodule>
 
   <autotools id="glib" autogenargs="--with-pcre=internal">
-    <branch module="glib/2.58/glib-2.58.1.tar.xz"  version="2.58.1"
-            hash="sha256:97d6a9d926b6aa3dfaadad3077cfb43eec74432ab455dff14250c769d526d7d6">
+    <branch module="glib/2.58/glib-2.58.3.tar.xz"  version="2.58.3"
+            hash="sha256:8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481">
     </branch>
     <dependencies>
         <dep package="libffi"/>
@@ -105,20 +105,17 @@
 
 
   <autotools id="gobject-introspection" autogen-sh="configure">
-    <branch module="gobject-introspection/1.58/gobject-introspection-1.58.0.tar.xz"
-            version="1.58.0"
-            hash="sha256:27c1590a32749de0a5481ce897772547043e94bccba4bc0a7edb3d8513e401ec">
+    <branch module="gobject-introspection/1.60/gobject-introspection-1.60.0.tar.xz"
+            version="1.60.0"
+            hash="sha256:9efe4090cb59717126701e97062e784773f800b8d47af14c4d278ebf194df35d">
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/girscanner-objc.patch"; 
strip="1"/>
             <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gi_cairo_library_path.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
+      <dep package='python3'/>
     </dependencies>
-      <after>
-        <dep package='python'/>
-        <dep package='python3'/>
-      </after>
   </autotools>
 
   <autotools id="fribidi" autogenargs="--disable-docs">
@@ -233,7 +230,7 @@
 
   <autotools id="gtk+-3.0" autogen-sh="autogen.sh"
              autogenargs="--enable-quartz-backend --enable-quartz-relocation">
-    <branch module="gtk+/3.24/gtk+-3.24.2.tar.xz" version="3.24.2"
+    <branch module="gtk+/3.24/gtk+-3.24.7.tar.xz" version="3.24.2"
             hash="sha256:5b3b05e427cc928d103561ed2e91b2b2881fe88b1f167b0b1c9990da6aac8892">
       <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master//patches/gtk3-quartz-3-24-2-fixes.patch"; strip="1"/>
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/IMQuartz-GdkWindow.patch"; 
strip="1"/>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 5dd2e29..c4bbc1e 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -66,7 +66,7 @@
   </metamodule>
 
   <autotools id="glib" autogenargs="--disable-dtrace --with-pcre=insternal">
-    <branch />
+    <branch revision="glib-2-58"/>
     <dependencies>
       <dep package="libffi"/>
     </dependencies>
@@ -78,7 +78,7 @@
   </autotools>
 
   <autotools id="gobject-introspection">
-    <branch/>
+    <branch revision='72c670ce' /> <!-- Next one drops autotools -->
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
@@ -95,7 +95,7 @@
   </autotools>
 
   <autotools id="pango">
-    <branch />
+    <branch tag="1.42.4"/>
     <dependencies>
       <dep package="cairo"/>
       <dep package="glib"/>
@@ -109,7 +109,7 @@
   </autotools>
 
  <autotools id="atk" supports-non-srcdir-builds="no">
-    <branch />
+    <branch revision="gnome-3-28"/>
     <dependencies>
     </dependencies>
     <after>
@@ -120,7 +120,7 @@
   </autotools>
 
   <autotools id="gdk-pixbuf">
-    <branch />
+    <branch revision="gdk-pixbuf-2-36"/>
     <after>
       <dep package="pango"/>
       <dep package="gobject-introspection"/>
@@ -164,7 +164,7 @@
 
   <autotools id="gtk+-3.0"
              autogenargs="--enable-quartz-backend --enable-quartz-relocation --disable-colord">
-    <branch module="gtk+" checkoutdir="gtk+-3.0" revision="gtk-3-22"/>
+    <branch module="gtk" checkoutdir="gtk+-3.0" revision="gtk-3-24"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="pango"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 1c51dbb..18578cc 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -66,7 +66,7 @@
   </metamodule>
 
   <autotools id="glib" autogenargs="--with-pcre=internal">
-    <branch tag="glib-2-52"/>
+    <branch tag="glib-2-58"/>
     <dependencies>
       <dep package="libffi"/>
     </dependencies>
@@ -81,19 +81,17 @@
   </autotools>
 
   <autotools id="gobject-introspection">
-    <branch tag="gnome-3-24" module="gobject-introspection"/>
+    <branch tag="1.60.0" module="gobject-introspection"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
+      <dep package='python3'/>
     </dependencies>
-    <after>
-      <dep package='python'/>
-    </after>
   </autotools>
 
-  <!-- Pango seems to be releasing from master these days. -->
-  <autotools id="pango">
-    <branch tag="1.40.7"/>
+  <!-- Last autotools release -->
+  <autotools id="pango.">
+    <branch tag="1.42.4"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
@@ -106,7 +104,7 @@
   </autotools>
 
   <autotools id="atk">
-    <branch tag="gnome-3-24"/>
+    <branch tag="gnome-3-28"/>
     <dependencies>
     </dependencies>
     <after>
@@ -117,8 +115,7 @@
   </autotools>
 
   <autotools id="gdk-pixbuf">
-    <!--gdk-pixbuf is releasing from master-->
-    <branch/>
+    <branch revision="gdk-pixbuf-2-36"/>
     <dependencies>
       <dep package="pango"/>
       <dep package="gobject-introspection"/>
@@ -153,7 +150,7 @@
 
   <autotools id="gtk+-3.0"
             autogenargs="--enable-quartz-backend --disable-colord  --enable-quartz-relocation">
-    <branch module="gtk+" checkoutdir="gtk+-3.0" revision="gtk-3-22"/>
+    <branch module="gtk+" checkoutdir="gtk+-3.0" revision="gtk-3-24"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="pango"/>