[gtk-osx] Update core platform modules

[John Ralls <jralls src gnome org>]

commit 6bf119db1cccecbb84f04fc8dfceebc0ec5bfbc8
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Apr 17 00:12:35 2015 -0700

    Update core platform modules
    
    This updates GLib, GTK, ATK, and gobject-introspection to their Gnome
    3.16 versions.
    
    GTK 3.16 pulls in xorg-util-macros and libepoxy, as it previously did on
    modulesets-unstable.

 modulesets-stable/gtk-osx.modules                  |   36 ++++++++++++++-----
 modulesets/gtk-osx.modules                         |   22 ++++++++++--
 ...ug-is-conditionally-supported-on-X11-only.patch |   23 ------------
 patches/patch status                               |    3 --
 4 files changed, 44 insertions(+), 40 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 2bb8d29..1460cfa 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -12,6 +12,9 @@
               href="http://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="sourceware.org"
               href="ftp://sourceware.org/pub/"/>
+  <repository type="tarball" name="freedesktop"
+              href="ftp://ftp.freedesktop.org/pub/"/>
+  <repository type="git" name="github" href="git://github.com/"/>
 
   <!-- This module set works a bit differently than for example the
        GNOME ones do. It's split up in seperate pieces:
@@ -68,8 +71,8 @@
   </metamodule>
 
   <autotools id="glib" autogen-sh="autoreconf">
-    <branch module="glib/2.42/glib-2.42.1.tar.xz"  version="2.42.1"
-            hash="sha256:8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a">
+    <branch module="glib/2.44/glib-2.44.0.tar.xz"  version="2.44.0"
+            hash="sha256:f2d362b106a08fa801770d41829a06fcfe287a00421018869eebf5efc796f5b9">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Fix-g_get_monotonic_time-on-non-Intel-Darwin.patch";
 strip="1"/>
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-724590-GSlice-slab_stack-corruption.patch"; 
strip="1"/>
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gio-in-reserved-in-gcc-48.patch"; 
strip="1"/>
@@ -88,6 +91,19 @@
             version="3.2.1"/>
   </autotools>
 
+  <autotools id="xorg-util-macros">
+    <branch repo="freedesktop" version="1.19.0"
+            module="xorg/individual/util/util-macros-1.19.0.tar.bz2"/>
+  </autotools>
+
+  <!-- There is no stable release yet that works here, so use master -->
+  <autotools id="libepoxy">
+    <branch repo="github" module="anholt/libepoxy"/>
+    <dependencies>
+      <dep package="xorg-util-macros"/>
+    </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"
@@ -103,9 +119,9 @@
   </autotools>
 
   <autotools id="gobject-introspection" autogen-sh="configure">
-    <branch module="gobject-introspection/1.42/gobject-introspection-1.42.0.tar.xz"
-            version="1.42.0"
-            hash="sha256:3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7">
+    <branch module="gobject-introspection/1.44/gobject-introspection-1.44.0.tar.xz"
+            version="1.44.0"
+            hash="sha256:6f0c2c28aeaa37b5037acbf21558098c4f95029b666db755d3a12c2f1e1627ad">
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/girscanner-objc.patch"; strip="1"/>
     </branch>
     <dependencies>
@@ -133,8 +149,8 @@
   </autotools>
 
  <autotools id="atk" autogen-sh="configure">
-    <branch module="atk/2.14/atk-2.14.0.tar.xz" version="2.14.0"
-            hash="sha256:2875cc0b32bfb173c066c22a337f79793e0c99d2cc5e81c4dac0d5a523b8fbad"/>
+    <branch module="atk/2.16/atk-2.16.0.tar.xz" version="2.16.0"
+            hash="sha256:095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562"/>
     <dependencies>
     </dependencies>
     <after>
@@ -175,9 +191,8 @@
 
   <autotools id="gtk+-3.0" autogen-sh="autogen.sh"
              autogenargs="--enable-quartz-backend --enable-quartz-relocation">
-    <branch module="gtk+/3.14/gtk+-3.14.5.tar.xz" version="3.14.5"
-            hash="sha256:ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2">
-      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/gtk+-Bug-739885-GtkPlug-is-conditionally-supported-on-X11-only.patch";
 strip="1"/>
+    <branch module="gtk+/3.16/gtk+-3.16.0.tar.xz" version="3.16.0"
+            hash="sha256:ce617318fe18092383cf6ed5d8c688a95a97f2d4c68481317a6a531e288c26ea">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-707945-GTK2-Quartz-typeahead-find-in-GtkTreeView.patch";
 strip="1"/>
     </branch>
     <dependencies>
@@ -186,6 +201,7 @@
       <dep package="atk"/>
       <dep package="gdk-pixbuf"/>
       <dep package="gobject-introspection"/>
+      <dep package="libepoxy"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 7181687..206f239 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -65,7 +65,7 @@
   </metamodule>
 
   <autotools id="glib">
-    <branch tag="glib-2-42"/>
+    <branch tag="glib-2-44"/>
     <dependencies>
       <dep package="libffi"/>
     </dependencies>
@@ -78,6 +78,19 @@
     <branch module="atgreen/libffi" repo="github" tag="v3.2.1"/>
   </autotools>
 
+  <autotools id="xorg-util-macros">
+    <branch repo="freedesktop" module="xorg/util/macros"
+            tag="util-macros-1.19.0"/>
+  </autotools>
+
+  <!-- There is no stable release yet that works here, so use master -->
+  <autotools id="libepoxy">
+    <branch repo="github" module="anholt/libepoxy"/>
+    <dependencies>
+      <dep package="xorg-util-macros"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gobject-introspection-10">
     <branch tag="GOBJECT_INTROSPECTION_0_10_1"/>
     <dependencies>
@@ -88,7 +101,7 @@
   </autotools>
 
   <autotools id="gobject-introspection">
-    <branch tag="master" module="gobject-introspection"/> <!--No gnome-3-14 branch-->
+    <branch tag="gnome-3-16" module="gobject-introspection"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
@@ -113,7 +126,7 @@
   </autotools>
 
   <autotools id="atk">
-    <branch tag="gnome-3-14"/>
+    <branch tag="gnome-3-16"/>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
@@ -146,13 +159,14 @@
 
   <autotools id="gtk+-3.0"
             autogenargs="--enable-quartz-backend --disable-colord  --enable-quartz-relocation">
-    <branch module="gtk+" checkoutdir="gtk+-3.0" revision="gtk-3-14"/>
+    <branch module="gtk+" checkoutdir="gtk+-3.0" revision="gtk-3-16"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="pango"/>
       <dep package="atk"/>
       <dep package="gdk-pixbuf"/>
       <dep package="gobject-introspection"/>
+      <dep package="libepoxy"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
diff --git a/patches/patch status b/patches/patch status
index 4f9229e..3e91cb0 100644
--- a/patches/patch status      
+++ b/patches/patch status      
@@ -17,9 +17,6 @@ gtk2:         0004-Bug-571582-GtkSelection-implementation-for-quartz.patch
                0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch
                gtk+-Bug-655065-autotestkeywords-ldadd.patch
 
-gtk3:          gtk+-Bug-739885-GtkPlug-is-conditionally-supported-on-X11-only.patch
-               (Only needed for modulesets-stable, 3.14.5.)
-
 cairo:                 Cairo-44584-llvm-no-flto.patch Rejected. Cairo maintainer wants
                optimization suppressed instead.