x11-wm/mutter: fix build with USE=debug

Closes: https://bugs.gentoo.org/645412
Package-Manager: Portage-2.3.20, Repoman-2.3.6

diff --git a/x11-wm/mutter/files/3.24.4-build-debug.patch b/x11-wm/mutter/files/3.24.4-build-debug.patch
new file mode 100644 (file)
index 0000000..6cb7b48
--- /dev/null
+++ b/x11-wm/mutter/files/3.24.4-build-debug.patch
@@ -0,0 +1,28 @@
+From c9937faf1e2c81005289e18974ed5d10b2dc37ab Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Sat, 12 Aug 2017 11:52:28 +0200
+Subject: [PATCH] clutter: Fix build with --enable-debug
+
+Message was poking stage_x11, which doesn't exist in this context.
+Just print the Window that is receiving the event, the event will be
+emitted into the only existing stage anyway.
+---
+ clutter/clutter/x11/clutter-device-manager-xi2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clutter/clutter/x11/clutter-device-manager-xi2.c b/clutter/clutter/x11/clutter-device-manager-xi2.c
+index 1ecec02..da3457a 100644
+--- a/clutter/clutter/x11/clutter-device-manager-xi2.c
++++ b/clutter/clutter/x11/clutter-device-manager-xi2.c
+@@ -1160,7 +1160,7 @@ translate_pad_event (ClutterEvent       *event,
+                 event->any.type == CLUTTER_PAD_RING
+                 ? "pad ring  "
+                 : "pad strip",
+-                (unsigned int) stage_x11->xwin,
++                (unsigned int) xev->event,
+                 device->id,
+                 device->device_name,
+                 event->any.time, value);
+--
+libgit2 0.26.0
+

diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild
index 4f727d079a177c8ea1524cb5e8147dd8b7a7e6a5..f52fd7fb8eb0d15a7ed18c9e101afa971059e2ff 100644 (file)
--- a/x11-wm/mutter/mutter-3.24.4.ebuild
+++ b/x11-wm/mutter/mutter-3.24.4.ebuild
@@ -83,6 +83,8 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
        # Fix build with >=gudev-232, bug #630312
        "${FILESDIR}"/3.24.4-gudev-232.patch
+       # Fix build with USE=debug, bug #645412
+       "${FILESDIR}"/3.24.4-build-debug.patch
 )
 
 src_prepare() {