commit: 21f565f494469cfe0c8aecf83237ce94d30353c6 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sun Jun 28 09:28:00 2020 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sun Jun 28 09:37:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21f565f4
x11-wm/mutter: try to fix tests without gtk+[wayland] Bug: https://bugs.gentoo.org/728952 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> .../files/3.34.6-tests-dontreq-gdkwayland.patch | 51 ++++++++++++++++++++++ x11-wm/mutter/mutter-3.34.6-r1.ebuild | 1 + 2 files changed, 52 insertions(+) diff --git a/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch b/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch new file mode 100644 index 00000000000..810801977af --- /dev/null +++ b/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch @@ -0,0 +1,51 @@ +From fd10425c598f7b3db16521c2709032fd2ea5a396 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <[email protected]> +Date: Sun, 28 Jun 2020 09:26:33 +0300 +Subject: [PATCH] test-client: Fix compilation without GDK_WINDOWING_WAYLAND + +--- + src/tests/test-client.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/tests/test-client.c b/src/tests/test-client.c +index 83a5ce485..80c239310 100644 +--- a/src/tests/test-client.c ++++ b/src/tests/test-client.c +@@ -22,7 +22,9 @@ + #include <gio/gunixinputstream.h> + #include <gtk/gtk.h> + #include <gdk/gdkx.h> ++#ifdef GDK_WINDOWING_WAYLAND + #include <gdk/gdkwayland.h> ++#endif + #include <stdarg.h> + #include <stdlib.h> + #include <string.h> +@@ -46,8 +48,10 @@ window_export_handle_cb (GdkWindow *window, + { + GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (user_data)); + ++#ifdef GDK_WINDOWING_WAYLAND + if (!gdk_wayland_window_set_transient_for_exported (gdk_window, + (gchar *) handle_str)) ++#endif + g_print ("Fail to set transient_for exported window handle %s", handle_str); + gdk_window_set_modal_hint (gdk_window, TRUE); + } +@@ -377,11 +381,13 @@ process_line (const char *line) + goto out; + } + ++#ifdef GDK_WINDOWING_WAYLAND + GdkWindow *parent_gdk_window = gtk_widget_get_window (parent_window); + if (!gdk_wayland_window_export_handle (parent_gdk_window, + window_export_handle_cb, + window, + NULL)) ++#endif + g_print ("Fail to export handle for window id %s", argv[2]); + } + else if (strcmp (argv[0], "accept_focus") == 0) +-- +2.20.1 + diff --git a/x11-wm/mutter/mutter-3.34.6-r1.ebuild b/x11-wm/mutter/mutter-3.34.6-r1.ebuild index 722e7bb3d13..bc54061390f 100644 --- a/x11-wm/mutter/mutter-3.34.6-r1.ebuild +++ b/x11-wm/mutter/mutter-3.34.6-r1.ebuild @@ -94,6 +94,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/3.32-eglmesaext-include.patch "${FILESDIR}"/${PV}-XInitThreads.patch + "${FILESDIR}"/${PV}-tests-dontreq-gdkwayland.patch ) src_configure() {
