gentoo auto-resync : 10:03:2024 - 00:44:50

3 files changed, 36 insertions, 32 deletions

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 681bd149fe46..7d8cdbfafccd 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,9 +1,9 @@
 AUX 45.2-fix-X-only.patch 1566 BLAKE2B 93304e6e743c58430e70c9a76a1989bfa57610dc9b275d7ef5b5db04150f7689d7e90fc2add81c19bd565734c42f20a14aec805b41332e943ba6bbf84ff1e9c3 SHA512 c3d02d60016b1179dc29b8fd8aa9f3f41ae778c0a29f0300cb1b844bfd30c6f36e9cb2ee00e0d39251c4986a53f3fcc505254ec7d8e5d3123ab7946429e908a3
 AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e7c2f30dc143100b1f564d816084cf06043439d44697602f042e4905121e949c7a5397556a32815eaae9bd2d671d1fdcdb6ca863fb7d4b1 SHA512 b1a9e7c01e35c1c00f34412f7522cdd601cf3af569a571fe9353839429cf76bf6d9b847da500663834c4eae6e05031eaa4ec770ee89807978a784db4b1bc813b
-DIST mutter-44.4.tar.xz 2847392 BLAKE2B 2ecdb0d447c0426a7e02f4d3b3cdf8936a6c7a5fecad163bdba9428f018e0ceb2047b241422bc9de5e9d0fb08e88a04d572d1b404b48d6df214a7263292309ba SHA512 3f7b37be5531e270c071fc9784a6a284a3d715dfd1dfc854779126197d6e53c660836412ba08e6233747c7b016926114a57be5adb36a11c8ec9c81e333ce668c
 DIST mutter-45.2-r1-patchset.tar.xz 21864 BLAKE2B c09566f75a816f6599ac4bf99879cc0e3bb78220c56cc4bd64edabf00e533a5feb4decdaa75ef5ae7ade911ec266ba6dd4641f1cbcd2c3145c10d5a8d327d653 SHA512 dd953afb97c4cdd9e24b2eab6636472e526042eb768c23e0d5bd49cd3ceb3a5cebd3ff396d014bdf168de81f810cef754efbb1739350fc09f6d196461de41ea4
 DIST mutter-45.2.tar.xz 2884940 BLAKE2B c4107840b8bd0f75a9c76300f324bfff6aac3195f526ab88102c831df693cb8dfa5b55bb1590a54e68f41eab392e69bb833221480578a2fba4b1e4bdc5ed030d SHA512 2111ad0645d2da58dedb30d94e99b52045f38b31a9de7314a5d8b41a5525612d88d2fbaafd3658eb6f734c143ad12176367c26533237199d9a5c1ad3dea743c7
-EBUILD mutter-44.4.ebuild 6472 BLAKE2B 56b37f5d2adfa3c85c38bb43a386ab54db0eeebcf215f8a9dc9318520b1877488bf3450961f976febfdfbb2c09eb6ed3491a56d94fd0950cd549ecee579810e8 SHA512 4e0bcfeb14da78d394418bb0ebac51fde2e2ffc0b1391c5bc8199db6835f581e5e798fab5a02c4f1285d6e9d786bf98879bf81c25b91d94c9abe23058512c23c
+DIST mutter-45.4.tar.xz 2886300 BLAKE2B 62fe0c08e92f8cab0bcf64a52a9d1bdf16754deae5fb00018f29c596ab2e26a5b75eee46f1c0206ae1773fe5b7ed48abc755b6070d35dc22536dcb11e8955e95 SHA512 3fdd44dfcb504a84d402065987fb8bdec84d639260c66c0cb2e88ef2deb56fadf2ae91bdeae782793728e54803a455ab38943b68693124d728b0c52ba8698e3c
 EBUILD mutter-45.2-r1.ebuild 7273 BLAKE2B dc9a9e56d66cf4a8081ea22d4d47861eac2dd29319a6fbb9dfebb5b4911840daa3d0d9dc65ddf647ee7d183708ce3811df6b31e9f7124182b92a11cdaec6d272 SHA512 a92567729200eaa822b3653eb275e66bb6a693034355b757bc53dfef21be70c499c2e36812518fb7de61b958c1f50d5cd19c310f4bf302d634f6807e5a10e0a9
-EBUILD mutter-9999.ebuild 7050 BLAKE2B 79ea1f0a9b3366e99a5b423bfe619faf3b1cce025492293d20acffd7ba9b75b8718a6db5d74f71879d9daff0d71907d8639d1023c00260e8c138e54ba16e2492 SHA512 8729338909f19f003bc825bf710b3279ddb6ab255ca4c72ab5f718f2875d1d842c899ac63d31845fa52e294803fadc697e796e5f4654b4a899027f6274d847e5
+EBUILD mutter-45.4.ebuild 7068 BLAKE2B 48a72d702edf822680a340ff739a6a779f10adf245a5aaff21463f50aa220c8949cfe5d33952eda85ebb1f1f21d9537af41009d870e38b53336b75b70dfab6da SHA512 162014d375b4dd556bc8fb853ae40b82eb7883eeb26e3d3ecf552226eb37886a946d27dd0976378129a2541179f5f9ae866b2c548c6413b5457d717b1c54da6b
+EBUILD mutter-9999.ebuild 7110 BLAKE2B 25674cb81da685fa92fe0730297ddf8df2daa670cea1e590ff0e34aa291d341d8a9dca24c443b3995f7b40a3b75695f5ddff207cab9eff9cfe10e5ab62a8a5ab SHA512 a77d647daceb9ff2beef3f2e1c155d94d092e260c536c2b434cd64564cdb5e0a230e7aac1b161196ad57a0d4da009870a0fd5fe53b1cb4950cd8a7d82e9512e3
 MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87
diff --git a/x11-wm/mutter/mutter-44.4.ebuild b/x11-wm/mutter/mutter-45.4.ebuild
index 1c43d74fd745..aeed10b04dac 100644
--- a/x11-wm/mutter/mutter-44.4.ebuild
+++ b/x11-wm/mutter/mutter-45.4.ebuild
@@ -2,23 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
 
 DESCRIPTION="GNOME compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+LICENSE="GPL-2+"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git"
 	SRC_URI=""
+	SLOT="0/13" # This can get easily out of date, but better than 9967
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
 fi
 
-LICENSE="GPL-2+"
-SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
 IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
 # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
 REQUIRED_USE="
@@ -28,7 +28,11 @@ REQUIRED_USE="
 RESTRICT="!test? ( test )"
 
 # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with
+# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future;
+# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off
+# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's
+# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow).
 # v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
 DEPEND="
 	>=media-libs/graphene-1.10.2[introspection?]
@@ -47,6 +51,7 @@ DEPEND="
 	>=x11-misc/colord-1.4.5:=
 	>=media-libs/lcms-2.6:2
 	>=media-libs/harfbuzz-2.6.0:=
+	>=dev-libs/libei-1.0.901
 
 	gnome? ( gnome-base/gnome-desktop:4= )
 
@@ -55,15 +60,15 @@ DEPEND="
 	media-libs/libglvnd[X]
 
 	wayland? (
-		>=dev-libs/wayland-protocols-1.31
+		>=dev-libs/wayland-protocols-1.32
 		>=dev-libs/wayland-1.21.0
 
 		x11-libs/libdrm
 		media-libs/mesa[gbm(+)]
-		>=dev-libs/libinput-1.18.0:=
+		>=dev-libs/libinput-1.19.0:=
 
 		elogind? ( sys-auth/elogind )
-		x11-base/xwayland
+		>=x11-base/xwayland-23.2.1[libei(+)]
 		video_cards_nvidia? ( gui-libs/egl-wayland )
 	)
 	udev? (
@@ -74,9 +79,8 @@ DEPEND="
 	x11-libs/libSM
 	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
 	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:= )
+	screencast? ( >=media-video/pipewire-0.3.33:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] )
 	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 )
 "
 # for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
@@ -88,7 +92,7 @@ DEPEND+="
 		x11-libs/libXcursor
 		x11-libs/libXdamage
 		x11-libs/libXext
-		>=x11-libs/libXfixes-3
+		>=x11-libs/libXfixes-6
 		>=x11-libs/libXi-1.7.4
 		x11-libs/libXtst
 		x11-libs/libxkbfile
@@ -103,13 +107,15 @@ DEPEND+="
 #	)"
 
 RDEPEND="${DEPEND}
-	gnome-extra/zenity
-
 	!<gui-libs/gtk-4.6.4:4
 "
 DEPEND="${DEPEND}
 	x11-base/xorg-proto
 	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
+	test? (
+		>=x11-libs/gtk+-3.19.8:3[X,introspection?,wayland]
+		gnome-extra/zenity
+	)
 "
 BDEPEND="
 	dev-util/wayland-scanner
@@ -134,7 +140,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
-
 )
 
 python_check_deps() {
@@ -143,12 +148,6 @@ python_check_deps() {
 	fi
 }
 
-src_prepare() {
-	default
-
-	sed -i -e "s:#!/usr/bin/bash:#!$(command -v bash):" src/tests/x11-test.sh || die
-}
-
 src_configure() {
 	local emesonargs=(
 		# Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass
@@ -217,7 +216,9 @@ src_configure() {
 }
 
 src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file
+	gnome2_environment_reset
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
 	glib-compile-schemas "${BUILD_DIR}"/data
 	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
 }
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index 2001a87c20cf..0dc94ddab6d1 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	SRC_URI=""
 	SLOT="0/13" # This can get easily out of date, but better than 9967
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 	SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
 fi
 
@@ -39,11 +39,11 @@ DEPEND="
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/pango-1.46[introspection?]
 	>=x11-libs/cairo-1.14[X]
+	>=x11-libs/pixman-0.42
 	>=dev-libs/fribidi-1.0.0
 	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
 	>=dev-libs/glib-2.75.1:2
 	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
 	>=x11-libs/libxkbcommon-0.4.3
 	x11-libs/libICE
 	>=app-accessibility/at-spi2-core-2.46:2[introspection?]
@@ -52,6 +52,7 @@ DEPEND="
 	>=media-libs/lcms-2.6:2
 	>=media-libs/harfbuzz-2.6.0:=
 	>=dev-libs/libei-1.0.901
+	media-libs/libdisplay-info
 
 	gnome? ( gnome-base/gnome-desktop:4= )
 
@@ -60,10 +61,10 @@ DEPEND="
 	media-libs/libglvnd[X]
 
 	wayland? (
-		>=dev-libs/wayland-protocols-1.32
-		>=dev-libs/wayland-1.21.0
+		>=dev-libs/wayland-protocols-1.33
+		>=dev-libs/wayland-1.22
 
-		x11-libs/libdrm
+		>=x11-libs/libdrm-2.4.95
 		media-libs/mesa[gbm(+)]
 		>=dev-libs/libinput-1.19.0:=
 
@@ -81,7 +82,6 @@ DEPEND="
 	>=x11-libs/startup-notification-0.7
 	screencast? ( >=media-video/pipewire-0.3.33:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] )
 	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 )
 "
 # for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
@@ -108,13 +108,15 @@ DEPEND+="
 #	)"
 
 RDEPEND="${DEPEND}
-	gnome-extra/zenity
-
 	!<gui-libs/gtk-4.6.4:4
 "
 DEPEND="${DEPEND}
 	x11-base/xorg-proto
 	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
+	test? (
+		>=x11-libs/gtk+-3.19.8:3[X,introspection?,wayland]
+		gnome-extra/zenity
+	)
 "
 BDEPEND="
 	dev-util/wayland-scanner
@@ -192,6 +194,7 @@ src_configure() {
 		-Dtty_tests=false
 		$(meson_use sysprof profiler)
 		-Dinstalled_tests=false
+		-Dlibdisplay_info=enabled
 
 		#verbose # Let upstream choose default for verbose mode
 		#xwayland_path