| 1 |
commit: 21f565f494469cfe0c8aecf83237ce94d30353c6 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 28 09:28:00 2020 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 28 09:37:46 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21f565f4 |
| 7 |
|
| 8 |
x11-wm/mutter: try to fix tests without gtk+[wayland] |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/728952 |
| 11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/3.34.6-tests-dontreq-gdkwayland.patch | 51 ++++++++++++++++++++++ |
| 15 |
x11-wm/mutter/mutter-3.34.6-r1.ebuild | 1 + |
| 16 |
2 files changed, 52 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..810801977af |
| 21 |
--- /dev/null |
| 22 |
+++ b/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch |
| 23 |
@@ -0,0 +1,51 @@ |
| 24 |
+From fd10425c598f7b3db16521c2709032fd2ea5a396 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Mart Raudsepp <leio@g.o> |
| 26 |
+Date: Sun, 28 Jun 2020 09:26:33 +0300 |
| 27 |
+Subject: [PATCH] test-client: Fix compilation without GDK_WINDOWING_WAYLAND |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ src/tests/test-client.c | 6 ++++++ |
| 31 |
+ 1 file changed, 6 insertions(+) |
| 32 |
+ |
| 33 |
+diff --git a/src/tests/test-client.c b/src/tests/test-client.c |
| 34 |
+index 83a5ce485..80c239310 100644 |
| 35 |
+--- a/src/tests/test-client.c |
| 36 |
++++ b/src/tests/test-client.c |
| 37 |
+@@ -22,7 +22,9 @@ |
| 38 |
+ #include <gio/gunixinputstream.h> |
| 39 |
+ #include <gtk/gtk.h> |
| 40 |
+ #include <gdk/gdkx.h> |
| 41 |
++#ifdef GDK_WINDOWING_WAYLAND |
| 42 |
+ #include <gdk/gdkwayland.h> |
| 43 |
++#endif |
| 44 |
+ #include <stdarg.h> |
| 45 |
+ #include <stdlib.h> |
| 46 |
+ #include <string.h> |
| 47 |
+@@ -46,8 +48,10 @@ window_export_handle_cb (GdkWindow *window, |
| 48 |
+ { |
| 49 |
+ GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (user_data)); |
| 50 |
+ |
| 51 |
++#ifdef GDK_WINDOWING_WAYLAND |
| 52 |
+ if (!gdk_wayland_window_set_transient_for_exported (gdk_window, |
| 53 |
+ (gchar *) handle_str)) |
| 54 |
++#endif |
| 55 |
+ g_print ("Fail to set transient_for exported window handle %s", handle_str); |
| 56 |
+ gdk_window_set_modal_hint (gdk_window, TRUE); |
| 57 |
+ } |
| 58 |
+@@ -377,11 +381,13 @@ process_line (const char *line) |
| 59 |
+ goto out; |
| 60 |
+ } |
| 61 |
+ |
| 62 |
++#ifdef GDK_WINDOWING_WAYLAND |
| 63 |
+ GdkWindow *parent_gdk_window = gtk_widget_get_window (parent_window); |
| 64 |
+ if (!gdk_wayland_window_export_handle (parent_gdk_window, |
| 65 |
+ window_export_handle_cb, |
| 66 |
+ window, |
| 67 |
+ NULL)) |
| 68 |
++#endif |
| 69 |
+ g_print ("Fail to export handle for window id %s", argv[2]); |
| 70 |
+ } |
| 71 |
+ else if (strcmp (argv[0], "accept_focus") == 0) |
| 72 |
+-- |
| 73 |
+2.20.1 |
| 74 |
+ |
| 75 |
|
| 76 |
diff --git a/x11-wm/mutter/mutter-3.34.6-r1.ebuild b/x11-wm/mutter/mutter-3.34.6-r1.ebuild |
| 77 |
index 722e7bb3d13..bc54061390f 100644 |
| 78 |
--- a/x11-wm/mutter/mutter-3.34.6-r1.ebuild |
| 79 |
+++ b/x11-wm/mutter/mutter-3.34.6-r1.ebuild |
| 80 |
@@ -94,6 +94,7 @@ BDEPEND=" |
| 81 |
PATCHES=( |
| 82 |
"${FILESDIR}"/3.32-eglmesaext-include.patch |
| 83 |
"${FILESDIR}"/${PV}-XInitThreads.patch |
| 84 |
+ "${FILESDIR}"/${PV}-tests-dontreq-gdkwayland.patch |
| 85 |
) |
| 86 |
|
| 87 |
src_configure() { |
Archives