[gtk-osx] Update GTK to 3.14, adjust patches and deps

[John Ralls <jralls src gnome org>]

commit 66398487e2457a004e03d6beb803916b87d5d84a
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Nov 20 22:15:09 2014 -0800

    Update GTK to 3.14, adjust patches and deps
    
    This updates GTK to 3.14 on modulesets-stable and modulesets. On stable,
    this obsoletes one patch, but needs another one; only for this minor
    release, though, as it's already fixed on master and backported to the
    stable branch.
    
    On modulesets-unstable, the 3.15 version of GTK now has the start of
    OpenGL support on the X11 and Wayland backends. That does not yet exist
    on the Quartz backend, but even so libepoxy is now a build dependency.
    
    Libepoxy, unfortunately, has a hardcoded dependency on X11. This libepoxy
    module points at a pull request in Github which removes that dependency.
    We still do need a package called xorg-util-macros, but that isn't a
    heavy dependency and doesn't introduce any other dependencies itself.

 modulesets-stable/gtk-osx.modules                  |    6 ++--
 modulesets-unstable/gtk-osx.modules                |   15 ++++++++++-
 modulesets/gtk-osx.modules                         |    2 +-
 patches/0001-gtk3-gtkselection-return-value.patch  |   27 --------------------
 ...ug-is-conditionally-supported-on-X11-only.patch |   23 +++++++++++++++++
 patches/patch status                               |    3 +-
 6 files changed, 43 insertions(+), 33 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 3bbfe9e..eaf94d1 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -172,9 +172,9 @@
 
   <autotools id="gtk+-3.0" autogen-sh="autogen.sh"
              autogenargs="--enable-quartz-backend --enable-quartz-relocation">
-    <branch module="gtk+/3.10/gtk+-3.10.7.tar.xz" version="3.10.7"
-            hash="sha256:b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427">
-      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-gtk3-gtkselection-return-value.patch"; strip="1"/>
+    <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>
     <dependencies>
       <dep package="glib"/>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 14ee130..de0b9e1 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -77,6 +77,17 @@
     <branch module="atgreen/libffi" repo="github"/>
   </autotools>
 
+  <autotools id="xorg-util-macros">
+    <branch repo="freedesktop" module="xorg/util/macros"/>
+  </autotools>
+
+  <autotools id="libepoxy">
+    <branch repo="github" module="Sonicadvance1/libepoxy" revision="OSX-NoX11Support"/>
+    <dependencies>
+      <dep package="xorg-util-macros"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gobject-introspection">
     <branch/>
     <dependencies>
@@ -150,13 +161,15 @@
   </autotools>
 
   <autotools id="gtk+-3.0"
-            autogenargs="--enable-quartz-backend --enable-quartz-relocation --disable-colord 
--without-atk-bridge">
+             autogenargs="--enable-quartz-backend --enable-quartz-relocation --disable-colord">
     <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="libepoxy"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 28791d3..497be42 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -146,7 +146,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-10"/>
+    <branch module="gtk+" checkoutdir="gtk+-3.0" revision="gtk-3-14"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="pango"/>
diff --git a/patches/gtk+-Bug-739885-GtkPlug-is-conditionally-supported-on-X11-only.patch 
b/patches/gtk+-Bug-739885-GtkPlug-is-conditionally-supported-on-X11-only.patch
new file mode 100644
index 0000000..d07fc7d
--- /dev/null
+++ b/patches/gtk+-Bug-739885-GtkPlug-is-conditionally-supported-on-X11-only.patch
@@ -0,0 +1,23 @@
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index 0d0fb88..6cb355b 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -1610,10 +1610,17 @@ gtk_window_constructed (GObject *object)
+ {
+   GtkWindow *window = GTK_WINDOW (object);
+   GtkWindowPrivate *priv = window->priv;
++  gboolean is_plug;
+ 
+   G_OBJECT_CLASS (gtk_window_parent_class)->constructed (object);
+ 
+-  if (priv->type == GTK_WINDOW_TOPLEVEL && !GTK_IS_PLUG (window))
++#ifdef GDK_WINDOWING_X11
++  is_plug = GTK_IS_PLUG (window);
++#else
++  is_plug = FALSE;
++#endif
++
++  if (priv->type == GTK_WINDOW_TOPLEVEL && !is_plug)
+     {
+       priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (object));
+       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->multipress_gesture), 0);
diff --git a/patches/patch status b/patches/patch status
index f5c328e..9ac895f 100644
--- a/patches/patch status      
+++ b/patches/patch status      
@@ -17,7 +17,8 @@ gtk2:         0004-Bug-571582-GtkSelection-implementation-for-quartz.patch
                0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch
                gtk+-Bug-655065-autotestkeywords-ldadd.patch
 
-gtk3:          0001-Bug-571582-GtkSelection-implementation-for-quartz.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.