| 1 |
commit: 2a06072d9ebea366e0057e14b14aa0f06e2ea2cb |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 25 08:25:02 2018 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 25 08:35:52 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a06072d |
| 7 |
|
| 8 |
x11-wm/mutter: fix build with USE=debug |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/645412 |
| 11 |
Package-Manager: Portage-2.3.20, Repoman-2.3.6 |
| 12 |
|
| 13 |
x11-wm/mutter/files/3.24.4-build-debug.patch | 28 ++++++++++++++++++++++++++++ |
| 14 |
x11-wm/mutter/mutter-3.24.4.ebuild | 2 ++ |
| 15 |
2 files changed, 30 insertions(+) |
| 16 |
|
| 17 |
diff --git a/x11-wm/mutter/files/3.24.4-build-debug.patch b/x11-wm/mutter/files/3.24.4-build-debug.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..6cb7b48856f |
| 20 |
--- /dev/null |
| 21 |
+++ b/x11-wm/mutter/files/3.24.4-build-debug.patch |
| 22 |
@@ -0,0 +1,28 @@ |
| 23 |
+From c9937faf1e2c81005289e18974ed5d10b2dc37ab Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Carlos Garnacho <carlosg@×××××.org> |
| 25 |
+Date: Sat, 12 Aug 2017 11:52:28 +0200 |
| 26 |
+Subject: [PATCH] clutter: Fix build with --enable-debug |
| 27 |
+ |
| 28 |
+Message was poking stage_x11, which doesn't exist in this context. |
| 29 |
+Just print the Window that is receiving the event, the event will be |
| 30 |
+emitted into the only existing stage anyway. |
| 31 |
+--- |
| 32 |
+ clutter/clutter/x11/clutter-device-manager-xi2.c | 2 +- |
| 33 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 34 |
+ |
| 35 |
+diff --git a/clutter/clutter/x11/clutter-device-manager-xi2.c b/clutter/clutter/x11/clutter-device-manager-xi2.c |
| 36 |
+index 1ecec02..da3457a 100644 |
| 37 |
+--- a/clutter/clutter/x11/clutter-device-manager-xi2.c |
| 38 |
++++ b/clutter/clutter/x11/clutter-device-manager-xi2.c |
| 39 |
+@@ -1160,7 +1160,7 @@ translate_pad_event (ClutterEvent *event, |
| 40 |
+ event->any.type == CLUTTER_PAD_RING |
| 41 |
+ ? "pad ring " |
| 42 |
+ : "pad strip", |
| 43 |
+- (unsigned int) stage_x11->xwin, |
| 44 |
++ (unsigned int) xev->event, |
| 45 |
+ device->id, |
| 46 |
+ device->device_name, |
| 47 |
+ event->any.time, value); |
| 48 |
+-- |
| 49 |
+libgit2 0.26.0 |
| 50 |
+ |
| 51 |
|
| 52 |
diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild |
| 53 |
index 4f727d079a1..f52fd7fb8eb 100644 |
| 54 |
--- a/x11-wm/mutter/mutter-3.24.4.ebuild |
| 55 |
+++ b/x11-wm/mutter/mutter-3.24.4.ebuild |
| 56 |
@@ -83,6 +83,8 @@ RDEPEND="${COMMON_DEPEND} |
| 57 |
PATCHES=( |
| 58 |
# Fix build with >=gudev-232, bug #630312 |
| 59 |
"${FILESDIR}"/3.24.4-gudev-232.patch |
| 60 |
+ # Fix build with USE=debug, bug #645412 |
| 61 |
+ "${FILESDIR}"/3.24.4-build-debug.patch |
| 62 |
) |
| 63 |
|
| 64 |
src_prepare() { |
Archives