From 4d8c13e468717f2cf25acedd2ffc5fc0c6a58947 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Wed, 26 Nov 2014 10:21:34 +0200 Subject: [PATCH] gtk+: Fix wayland-only build --- .../gtk+/files/gtk+-3.14.5-fix-wayland-only.patch | 36 ++++++++++++++++++++++ x11-libs/gtk+/gtk+-3.14.5.ebuild | 3 ++ 2 files changed, 39 insertions(+) create mode 100644 x11-libs/gtk+/files/gtk+-3.14.5-fix-wayland-only.patch diff --git a/x11-libs/gtk+/files/gtk+-3.14.5-fix-wayland-only.patch b/x11-libs/gtk+/files/gtk+-3.14.5-fix-wayland-only.patch new file mode 100644 index 0000000..ae1902a --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-3.14.5-fix-wayland-only.patch @@ -0,0 +1,36 @@ +From 0b8f666e022d983db2cefaffb24315dc34b26673 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +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 + diff --git a/x11-libs/gtk+/gtk+-3.14.5.ebuild b/x11-libs/gtk+/gtk+-3.14.5.ebuild index 122f8e6..37cadb8 100644 --- a/x11-libs/gtk+/gtk+-3.14.5.ebuild +++ b/x11-libs/gtk+/gtk+-3.14.5.ebuild @@ -129,6 +129,9 @@ src_prepare() { fi gnome2_src_prepare + + # bug 530718 + epatch "${FILESDIR}/${P}"-fix-wayland-only.patch } multilib_src_configure() { -- 2.1.3