diff options
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/Manifest.gz | bin | 9803 -> 9798 bytes | |||
-rw-r--r-- | x11-wm/mutter/Manifest | 3 | ||||
-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 |
4 files changed, 32 insertions, 1 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz Binary files differindex 463f260f62f6..2097c386556d 100644 --- a/x11-wm/Manifest.gz +++ b/x11-wm/Manifest.gz diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 4cbdce1440f2..e501cd52fd42 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -3,9 +3,10 @@ AUX 3.22.4-wayland-clipboard-fix.patch 1283 BLAKE2B 294a69b435ead3f25f454ee1f94a AUX 3.22.4-wayland-crash-fix.patch 1149 BLAKE2B 5269eeb85bf39b176d41cf4c62d87c447a19ad08e12810c3697defaa5bea1a8d25916d488e6d378c5886e5de76f7623a7374505d086fe94d2e965da2460bd821 SHA512 68b629b25be5e019581aba2883f2409b65279758d814ce8f854b9052357adf44e3f2a649ef4aa8ef398afa8e4a58117fe1a8ccc6040c3578acfefbcb721cdf4a AUX 3.22.4-wayland-ensure-pending-geometry.patch 1744 BLAKE2B 7bfa1bc1b1111829af18e0ae991449c9e93b1a09fcd528492cc6d514827170346c911567256a2d6e5bbdcab155b6f00cf9e5760bca2ee535e6c1e00301daa2ee SHA512 e84319db9c0541b71dec03bd466b64f6e71637034bc91263d25fcf6546469435a4d77acaa32b24532e540fe62b079521f4d60c5cc2e1f0571b2f3cbc4917c964 AUX 3.22.4-wayland-size-hints.patch 2281 BLAKE2B 022782665cfd36da1bb60ff7ee459041e10d41d59b99cf1a806bc76c207f6e168e96e0980e72b6bdf12307874343a9f27cd83961ce01ce88a331fd88671e0107 SHA512 cf2afdb822f67a729713df571db446e955b111ac5d56342ba318646a6b3302a8cac394d63166c4043b94678360d19e3d35ddf60102794c038fdfc9039729318a +AUX 3.24.4-build-debug.patch 1159 BLAKE2B 1ceb783c5c1c8117c7b4e9809a370d2b46ebd4fa59b401a99f60c7a8c06ba88fdef6a382149fa6ae0b0d05344b24640d730d56736dfe38b645578f3b01c41528 SHA512 e0ae9b9ed1dc74b4b2a641f03589408d078ac7a2250e75fb024dd765dc755a6dcd1917d62cb271f541db5cd97ca8417433f8cfe8e40250331adc5609bbf1ffc6 AUX 3.24.4-gudev-232.patch 1034 BLAKE2B 8f6bfbaa50dca872c6ad21eaef5b23af8d75749140f16f595deaec1aa47021650da569e2f46b0fc4c446cf86f735c3b3a5a04df72737d175a51eacb52c0b7891 SHA512 a73aabd388c73a6a4ab91f69cdd647e5e2b1295f67c1576725f7cbaa8dc24afeb77a7f4e3880f6b2e8fc604aeefb4b44f30cc80f3f2f88b0d0c03b49dd6bbfe2 DIST mutter-3.22.4.tar.xz 3536792 BLAKE2B e395dec6a8f5f46864ab5d7da3c345c20adf65f7609547d296036b0cb4be79e451387395f32d3d9a736a5b8c4be5a03a9fa56d5fbebeedaef3c35ea6e5c16302 SHA512 849e98186cecb4ffcab3da055febf72ef76fa87ecbdc506c696c2c7debd5183361c4b3b31d00d3c85e45d7f47aa5abf748d999571b147c831eb999116919023c DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3 EBUILD mutter-3.22.4-r1.ebuild 4117 BLAKE2B 4d526168d3a2f353d03a3b7ce40f6f4d7cb26bfa11127b7c4c776c62db73e2510ff7703ba2ea6fd82b31dbec51606098213b3fcaa70a590fd26f24aae2c66b60 SHA512 36e28f4334d87b8d2319c19ec384593b2d8bba8e206b21d13e043ba3381cb8215ee5836d8427e0b4bb025efa23ea0f89175e6c04c278cb340f40d6961152d8a7 -EBUILD mutter-3.24.4.ebuild 3635 BLAKE2B b620e35dfd2ffae3497ae561f01bc2f46de62a10f35010e00a12c72442bcb324c71568dad8f499335adbec3989da377972d695f1dc92f8f80dc0c9e29e5b42c1 SHA512 7c448c93505c1804cc6e28de3799b40ec2c9c3d3a4938b1eb76f6e145921f864d3f9b04c94417b8aa00e1d273502deb7d7de4ad3e00c3dc8d736730e7087f202 +EBUILD mutter-3.24.4.ebuild 3716 BLAKE2B d3dbc0238d89b4e85640c26e0edcb7989bcfe76048c67b826b80a6be32206992126e518a8f0b8f6bcc90f083932f9b9e07abea68ffeaa83b117b91b0cc8f6e79 SHA512 700111bb0ab9547013f42438de65aa025ea7c7c04058f08a7c2c39f42c8ad7d65a841fa0aed1e3708f834046ce07200e12cc366e27dca1b4d563f7d61ae5f95a MISC metadata.xml 325 BLAKE2B 3ee20e50b2bbbab4ac5083cf64dd2817b397a0e8a77895f5aa7197f016af1e958d6debe92e6e69c10319b1d468f80f16831aa57a0dda1f57173732056b5856c4 SHA512 2732e366e7870b21a854e6bccf57d479c754fe5a9cf17673c3a78e231a1b476b684fd97497f8ab51c57137d066f9bfa6590458f56e5f42c5c38e1cd00962fe80 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() { |