diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2018-01-25 09:25:02 +0100 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2018-01-25 09:35:52 +0100 |
| commit | 2a06072d9ebea366e0057e14b14aa0f06e2ea2cb (patch) | |
| tree | 4402655a3d011a80c041e321ba5445822747b9ba | |
| parent | sys-cluster/pacemaker: drop vulnerable wrt #599194 (diff) | |
| download | gentoo-2a06072d9ebea366e0057e14b14aa0f06e2ea2cb.tar.gz gentoo-2a06072d9ebea366e0057e14b14aa0f06e2ea2cb.tar.bz2 gentoo-2a06072d9ebea366e0057e14b14aa0f06e2ea2cb.zip | |
x11-wm/mutter: fix build with USE=debug
Closes: https://bugs.gentoo.org/645412
Package-Manager: Portage-2.3.20, Repoman-2.3.6
| -rw-r--r-- | x11-wm/mutter/files/3.24.4-build-debug.patch | 28 | ||||
| -rw-r--r-- | x11-wm/mutter/mutter-3.24.4.ebuild | 2 |
2 files changed, 30 insertions, 0 deletions
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 index 000000000000..6cb7b48856f0 --- /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 4f727d079a17..f52fd7fb8eb0 100644 --- 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() { |