From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- x11-wm/mutter/Manifest | 7 +++-- x11-wm/mutter/files/3.26.2-non-wayland-build.patch | 33 ++++++++++++++++++++++ x11-wm/mutter/mutter-3.22.4-r1.ebuild | 3 +- x11-wm/mutter/mutter-3.24.4.ebuild | 3 +- x11-wm/mutter/mutter-3.26.2-r1.ebuild | 3 ++ 5 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 x11-wm/mutter/files/3.26.2-non-wayland-build.patch (limited to 'x11-wm/mutter') diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 6e7266798d83..dc69739c50b1 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -5,11 +5,12 @@ AUX 3.22.4-wayland-ensure-pending-geometry.patch 1744 BLAKE2B 7bfa1bc1b1111829af 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 +AUX 3.26.2-non-wayland-build.patch 1035 BLAKE2B 7c9beb268c2f1b5784bbb2b44d8199f9821462c0be7678b69c9feb05171f46a2ccf96c18e8ed45b32c7ce576a7693839d03a90b4beb787f5291e7853b28b514c SHA512 88bda28953ba08bb6cf7847de49356d7896d554169d0039b599963eb333a0c688b49dc9d55c8b8e497b15d54ad3bed495bf18ded00d09d6510bb399d20750ca0 DIST mutter-3.22.4.tar.xz 3536792 BLAKE2B e395dec6a8f5f46864ab5d7da3c345c20adf65f7609547d296036b0cb4be79e451387395f32d3d9a736a5b8c4be5a03a9fa56d5fbebeedaef3c35ea6e5c16302 SHA512 849e98186cecb4ffcab3da055febf72ef76fa87ecbdc506c696c2c7debd5183361c4b3b31d00d3c85e45d7f47aa5abf748d999571b147c831eb999116919023c DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3 DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b -EBUILD mutter-3.22.4-r1.ebuild 4074 BLAKE2B f8d93705b79bbdc066d5e2637318c988288d57c538ae7ab11ab715cf629568b4b78c953f4bb0116a3cd36aa4a6aac8e05680994277308d6c3a4eda5b5ed744c0 SHA512 fd0cae9ccceb3eeb158cc331b077c7ac664266509f6d6669bdac16b8651a5f8c769488109ac9701e32cdfad7ed2bfd11f2fe49bac8a6d4d81086fae46acda047 -EBUILD mutter-3.24.4.ebuild 3672 BLAKE2B f07f0b1874371e26460ec17112af090f6bfe93537a7a56063ec0b00ee5cae91ba9d65e0c6cd06245fc7db06bf071a437dd8dc123a4b04934c99e658e04e2f874 SHA512 f74446183f52159acb10684bd027001cceb671ca6110b3898e3f16590a6deca65e70ec619f90b0c9a91c3dd0084c795df5b1358145005ad6f0df87817c914b8f -EBUILD mutter-3.26.2-r1.ebuild 3949 BLAKE2B c064f5a7f5f663dfd87e9d800a31805293ef370c9a8a443bb4a73c3f0f344dba10569afb2433891ae57bf60782356a3cbdc757c7858e4dc2ee2b511aa7cba247 SHA512 78d27692678f4c0583363e391bf79c5480fedb9da39f63755ff65398f30abbce176ec6cb95ae656e8782ab13821edbad00d5bc938d0feac895017977b53875b9 +EBUILD mutter-3.22.4-r1.ebuild 4092 BLAKE2B a0ccf9508af2cf98cc54a48d39f1eb35ff07bc0b8f5da7f10348ee51974a66993a964c72aeda9288d8aa30263338a6cf54e2771eec60fd86e5dcf66f9179e578 SHA512 4e77a16dce245c654a3dba1abcabeb3115fa60a09c3748261f3bda1443a183f8611b9d3d52b22e73dc53c2607dcf1f9b7921d8a9e71acf470b05d6132377f20a +EBUILD mutter-3.24.4.ebuild 3690 BLAKE2B 318c35b0902a8c6805231ac9878b364a7b266a0a2f7c9751c3e44680e29fbbaf19945db05adc8f14a5325581fe1d0b1151580d31506b7951c7fc037fcd0ebb8e SHA512 26e2dde5942f74e15aad3ceba56987228e21c7229829aee2dd35d1fad1e8b7795a9ec80ff965a5ea44822cb27c844e73eb8459cf82e0bf4b8d628eda3ca56c85 +EBUILD mutter-3.26.2-r1.ebuild 4034 BLAKE2B 6eac303303c5d14baaf6f35eb93d2a38083b5bbe49520af2bc36fcdbb05a1bfcf5ac85d7fb9ff869abebeaa678cd8758950a4c01435867bcfedd8e9425c82be5 SHA512 555e9d5cf89f37dcf3e1033bbf636a2d1a447b3212d848054989a4dc878caf94532122a73d7648bbac97ce13dc70e75b385032e10078e17af2c4c295358018ac MISC metadata.xml 325 BLAKE2B 3ee20e50b2bbbab4ac5083cf64dd2817b397a0e8a77895f5aa7197f016af1e958d6debe92e6e69c10319b1d468f80f16831aa57a0dda1f57173732056b5856c4 SHA512 2732e366e7870b21a854e6bccf57d479c754fe5a9cf17673c3a78e231a1b476b684fd97497f8ab51c57137d066f9bfa6590458f56e5f42c5c38e1cd00962fe80 diff --git a/x11-wm/mutter/files/3.26.2-non-wayland-build.patch b/x11-wm/mutter/files/3.26.2-non-wayland-build.patch new file mode 100644 index 000000000000..a2a8d356e07e --- /dev/null +++ b/x11-wm/mutter/files/3.26.2-non-wayland-build.patch @@ -0,0 +1,33 @@ +From 6cc48d8cbbf11fa82ec78cac0b29d52f05eabb60 Mon Sep 17 00:00:00 2001 +From: Ting-Wei Lan +Date: Sun, 24 Dec 2017 17:55:14 +0800 +Subject: [PATCH] build: Fix non-wayland builds + +meta_dnd_wayland_handle_end_modal is not available on non-wayland build. + +https://bugzilla.gnome.org/show_bug.cgi?id=791916 +--- + src/compositor/compositor.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c +index 51d22bc17..aa49347c9 100644 +--- a/src/compositor/compositor.c ++++ b/src/compositor/compositor.c +@@ -419,11 +419,13 @@ meta_end_modal_for_plugin (MetaCompositor *compositor, + meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp); + meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp); + ++#ifdef HAVE_WAYLAND + if (meta_is_wayland_compositor ()) + { + meta_dnd_wayland_handle_end_modal (compositor); + meta_display_sync_wayland_input_focus (display); + } ++#endif + } + + static void +-- +2.18.0 + diff --git a/x11-wm/mutter/mutter-3.22.4-r1.ebuild b/x11-wm/mutter/mutter-3.22.4-r1.ebuild index 8868471403f7..01419c52e5c7 100644 --- a/x11-wm/mutter/mutter-3.22.4-r1.ebuild +++ b/x11-wm/mutter/mutter-3.22.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -68,6 +68,7 @@ COMMON_DEPEND=" ) " DEPEND="${COMMON_DEPEND} + dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild index 7307af626908..8a196f8d6038 100644 --- a/x11-wm/mutter/mutter-3.24.4.ebuild +++ b/x11-wm/mutter/mutter-3.24.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -68,6 +68,7 @@ COMMON_DEPEND=" ) " DEPEND="${COMMON_DEPEND} + dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto diff --git a/x11-wm/mutter/mutter-3.26.2-r1.ebuild b/x11-wm/mutter/mutter-3.26.2-r1.ebuild index 71a77b248294..209182f780be 100644 --- a/x11-wm/mutter/mutter-3.26.2-r1.ebuild +++ b/x11-wm/mutter/mutter-3.26.2-r1.ebuild @@ -81,6 +81,9 @@ DEPEND="${RDEPEND} PATCHES=( # Lots of patches from gnome-3-26 branch on top of 3.26.2 "${WORKDIR}"/patches/ + + # Fix non-wayland builds, bug #667244 + "${FILESDIR}"/${PV}-non-wayland-build.patch ) src_prepare() { -- cgit v1.2.3