[128498] trunk/dports/gnome/gtk3

[cal at macports.org]

Revision: 128498
          https://trac.macports.org/changeset/128498
Author:   cal at macports.org
Date:     2014-11-22 05:08:38 -0800 (Sat, 22 Nov 2014)
Log Message:
-----------
gtk3: Cherry-pick patch that fixes problems with +quartz, closes #45966

Modified Paths:
--------------
    trunk/dports/gnome/gtk3/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gtk3/files/
    trunk/dports/gnome/gtk3/files/0b8f666e022d983db2cefaffb24315dc34b26673.patch

Modified: trunk/dports/gnome/gtk3/Portfile
===================================================================
--- trunk/dports/gnome/gtk3/Portfile	2014-11-22 12:15:55 UTC (rev 128497)
+++ trunk/dports/gnome/gtk3/Portfile	2014-11-22 13:08:38 UTC (rev 128498)
@@ -58,6 +58,9 @@
     lib/libpango-1.0.dylib \
     lib/libtiff.dylib
 
+patch.pre_args      -p1
+patchfiles          0b8f666e022d983db2cefaffb24315dc34b26673.patch
+
 configure.args      --enable-static \
                     --disable-glibtest \
                     --enable-introspection \

Added: trunk/dports/gnome/gtk3/files/0b8f666e022d983db2cefaffb24315dc34b26673.patch
===================================================================
--- trunk/dports/gnome/gtk3/files/0b8f666e022d983db2cefaffb24315dc34b26673.patch	                        (rev 0)
+++ trunk/dports/gnome/gtk3/files/0b8f666e022d983db2cefaffb24315dc34b26673.patch	2014-11-22 13:08:38 UTC (rev 128498)
@@ -0,0 +1,36 @@
+From 0b8f666e022d983db2cefaffb24315dc34b26673 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi at gnome.org>
+Date: Mon, 10 Nov 2014 14:08:20 +0000
+Subject: window: GtkPlug is conditionally supported on X11 only
+
+We cannot do a type check on it if we don't have the X11 backend
+compiled in.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=739885
+
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index e846c41..7f5aae7 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -1601,10 +1601,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);
+-- 
+cgit v0.10.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141122/4245dcda/attachment.html>