[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/

[Matt Turner]

commit:     ae47f3cbcab490acce0b539a250d76ac6d9c7588
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 04:00:30 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 14:07:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae47f3cb

x11-wm/mutter: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-wm/mutter/Manifest                             |   2 -
 .../mutter-42.0-Disable-anonymous-file-test.patch  |  30 ---
 ...d-native-Don-t-warn-on-EACCES-if-headless.patch |  79 --------
 x11-wm/mutter/mutter-42.5.ebuild                   | 190 -------------------
 x11-wm/mutter/mutter-43.1.ebuild                   | 206 ---------------------
 5 files changed, 507 deletions(-)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 3453a13f8a7c..1cb303dcd3ae 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,3 +1 @@
-DIST mutter-42.5.tar.xz 2743636 BLAKE2B 87ee26ccee6c21404ac069e7b35d2b93ef38d0eda0963107c08a72599915fba56a653968fe456afa42f4eeb28aed5526d23d344f7e1f9f4fdf9cf35b5a66fca5 SHA512 cd7ef29211a1568f5f8d43182da6569db22005c0b67204a300edb4952d9c18f73def1558843a009a7475a82d7ce9754bd8741b214a931764798dbeaaecbbec49
-DIST mutter-43.1.tar.xz 2779416 BLAKE2B 1b7bf1ec44f6e47a859e84adb93a869be261ef3699ab773014e1497ea6c944e91d7a1766a2f126c79c1b21ba78e1ba25314c32113bc194f580d847e8617ae0d3 SHA512 6553ee855ebb3bb88bc12f823a5813c6b1b6ff983f1af716521b5e04903bc30112954e3e5d781516b087e247088cced1f560fce54eac28207a6cbc61d78b05b7
 DIST mutter-43.2.tar.xz 2781032 BLAKE2B cb4fc05ae9b53029649e9c80c8ce450d383a41f142ff1000bca6f9c1ddc707897511b5b54e8e28b4d263d19cffdfa699cef034d667cd8f166f8274c0f237d41a SHA512 ae6afccdf6af99197072afabf0900e1a72f38acfa6c4d039e8db03d21e89513f8828f29eb292ca9dfdec64388dcc4a93db64139e3af66706aaac81461b5da96d

diff --git a/x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch b/x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch
deleted file mode 100644
index d0e07840d46e..000000000000
--- a/x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8cb699dc59c64dc9f58873b3bbe2d17c3a08d2f9 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@×××××.com>
-Date: Fri, 18 Mar 2022 17:40:52 -0700
-Subject: [PATCH] Disable anonymous-file test
-
-It attempts to open /proc/self/fd/* (an fd created by memfd_create),
-which sandbox disallows.
----
- src/tests/meson.build | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/tests/meson.build b/src/tests/meson.build
-index a19703288..50027d1f8 100644
---- a/src/tests/meson.build
-+++ b/src/tests/meson.build
-@@ -180,11 +180,6 @@ test_cases += [
-     'suite': 'compositor',
-     'sources': [ 'stage-view-tests.c', ],
-   },
--  {
--    'name': 'anonymous-file',
--    'suite': 'unit',
--    'sources': [ 'anonymous-file.c', ],
--  },
- ]
- 
- if have_native_tests
--- 
-2.34.1
-

diff --git a/x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch b/x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch
deleted file mode 100644
index 98b58d3dfeff..000000000000
--- a/x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From db854a8588c1164df2f54c5718930aadf353b948 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@××××××.org>
-Date: Thu, 18 Aug 2022 10:41:01 +0100
-Subject: [PATCH] backend/native: Don't warn on EACCES if headless
-
-Since commit 1bf70334 "tests/runner: Make test runner use the headless
-backend", tests are run with the native backend in headless mode, which
-will attempt to open each GPU and show a warning (fatal during tests)
-if it cannot.
-
-However, in headless mode we might not be logged in on any seat (for
-example we might be logged in via ssh instead), which means we might
-legitimately not have permission to use any GPUs, even if they exist.
-Downgrade the warning to a debug message in this case.
-
-Resolves: https://gitlab.gnome.org/GNOME/mutter/-/issues/2381
-Signed-off-by: Simon McVittie <smcv@××××××.org>
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2584>
-(cherry picked from commit 64a67aa00bfe54fe7219d7f581950897fcbf9a75)
----
- src/backends/native/meta-backend-native.c | 35 +++++++++++++++++++----
- 1 file changed, 30 insertions(+), 5 deletions(-)
-
-diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
-index 224538787..a2babb4b0 100644
---- a/src/backends/native/meta-backend-native.c
-+++ b/src/backends/native/meta-backend-native.c
-@@ -514,8 +514,20 @@ on_udev_device_added (MetaUdev          *udev,
-   new_gpu_kms = create_gpu_from_udev_device (native, device, &error);
-   if (!new_gpu_kms)
-     {
--      g_warning ("Failed to hotplug secondary gpu '%s': %s",
--                 device_path, error->message);
-+      if (meta_backend_is_headless (backend) &&
-+          g_error_matches (error, G_IO_ERROR,
-+                           G_IO_ERROR_PERMISSION_DENIED))
-+        {
-+          meta_topic (META_DEBUG_BACKEND,
-+                      "Ignoring unavailable secondary gpu '%s': %s",
-+                      device_path, error->message);
-+        }
-+      else
-+        {
-+          g_warning ("Failed to hotplug secondary gpu '%s': %s",
-+                     device_path, error->message);
-+        }
-+
-       return;
-     }
- 
-@@ -552,9 +564,22 @@ init_gpus (MetaBackendNative  *native,
- 
-       if (!gpu_kms)
-         {
--          g_warning ("Failed to open gpu '%s': %s",
--                     g_udev_device_get_device_file (device),
--                     local_error->message);
-+          if (meta_backend_is_headless (backend) &&
-+              g_error_matches (local_error, G_IO_ERROR,
-+                               G_IO_ERROR_PERMISSION_DENIED))
-+            {
-+              meta_topic (META_DEBUG_BACKEND,
-+                          "Ignoring unavailable gpu '%s': %s'",
-+                          g_udev_device_get_device_file (device),
-+                          local_error->message);
-+            }
-+          else
-+            {
-+              g_warning ("Failed to open gpu '%s': %s",
-+                         g_udev_device_get_device_file (device),
-+                         local_error->message);
-+            }
-+
-           g_clear_error (&local_error);
-           continue;
-         }
--- 
-2.35.1
-

diff --git a/x11-wm/mutter/mutter-42.5.ebuild b/x11-wm/mutter/mutter-42.5.ebuild
deleted file mode 100644
index 4ded64a18383..000000000000
--- a/x11-wm/mutter/mutter-42.5.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-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+"
-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="doc elogind gnome 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="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# 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
-# 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="
-	>=x11-libs/libX11-1.7.0
-	>=media-libs/graphene-1.10.2[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
-	>=dev-libs/glib-2.69.0:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb:=
-	x11-libs/libXinerama
-	x11-libs/libXau
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	gnome? ( gnome-base/gnome-desktop:3= )
-	media-libs/mesa[X(+),egl(+)]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	systemd? ( sys-apps/systemd )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.21
-		>=dev-libs/wayland-1.18.0
-		x11-libs/libdrm
-		>=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
-		>=dev-libs/libinput-1.18.0:=
-		elogind? ( sys-auth/elogind )
-		x11-base/xwayland
-		video_cards_nvidia? ( gui-libs/egl-wayland )
-	)
-	udev? ( >=dev-libs/libgudev-232
-		>=virtual/libudev-232-r1:=
-	)
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	doc? ( >=dev-util/gi-docgen-2021.1 )
-"
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-
-	!<gui-libs/gtk-4.6.4:4
-	!<x11-libs/gtk+-3.24.34:3
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-		app-text/docbook-xml-dtd:4.5
-		x11-misc/xvfb-run
-	)
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-42.0-Disable-anonymous-file-test.patch
-	"${FILESDIR}"/${PN}-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_configure() {
-	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
-	local emesonargs=(
-		-Dopengl=true
-		#opengl_libname
-		#gles2_libname
-		$(meson_use wayland gles2)
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use systemd)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		-Dlibgnome_desktop=true
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use doc docs)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		-Dnative_tests=false
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		-Dkvm_tests=false
-		-Dtty_tests=false
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-
-	if use wayland && use video_cards_nvidia; then
-		emesonargs+=(
-			-Degl_device=true
-			-Dwayland_eglstream=true
-		)
-	else
-		emesonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}

diff --git a/x11-wm/mutter/mutter-43.1.ebuild b/x11-wm/mutter/mutter-43.1.ebuild
deleted file mode 100644
index 7da49c14e5e5..000000000000
--- a/x11-wm/mutter/mutter-43.1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-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+"
-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="doc elogind gnome 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="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-# 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
-# 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/lcms-2.6:2
-	>=x11-misc/colord-1.4.5:=
-	>=x11-libs/libX11-1.7.0
-	>=media-libs/graphene-1.10.2[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
-	>=dev-libs/glib-2.69.0: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?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	gnome? ( gnome-base/gnome-desktop:3= )
-	media-libs/libglvnd[X]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	systemd? ( sys-apps/systemd )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.26
-		>=dev-libs/wayland-1.21.0
-		x11-libs/libdrm
-		>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,gles2]
-		>=dev-libs/libinput-1.18.0:=
-		elogind? ( sys-auth/elogind )
-		x11-base/xwayland
-		video_cards_nvidia? ( gui-libs/egl-wayland )
-	)
-	udev? ( >=dev-libs/libgudev-232
-		>=virtual/libudev-232-r1:=
-	)
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	doc? ( >=dev-util/gi-docgen-2021.1 )
-"
-# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
-#	X? (
-DEPEND+="
-		>=x11-libs/libXcomposite-0.4
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		>=x11-libs/libXfixes-3
-		>=x11-libs/libXi-1.7.4
-		x11-libs/libXtst
-		x11-libs/libxkbfile
-		x11-misc/xkeyboard-config
-		>=x11-libs/libxkbcommon-0.4.3[X]
-		x11-libs/libXrender
-		>=x11-libs/libXrandr-1.5.0
-		x11-libs/libxcb:=
-		x11-libs/libXinerama
-		x11-libs/libXau
-"
-#	)"
-
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-
-	!<gui-libs/gtk-4.6.4:4
-	!<x11-libs/gtk+-3.24.34:3
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			>=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
-		')
-		app-text/docbook-xml-dtd:4.5
-		x11-misc/xvfb-run
-	)
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "s:#!/usr/bin/bash:#!$(command -v bash):" src/tests/x11-test.sh || die
-}
-
-src_configure() {
-	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
-	local emesonargs=(
-		-Dopengl=true
-		#opengl_libname
-		#gles2_libname
-		$(meson_use wayland gles2)
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use systemd)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		-Dlibgnome_desktop=true
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dsound_player=true
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use doc docs)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		-Dnative_tests=false
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		-Dkvm_tests=false
-		-Dtty_tests=false
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-
-	if use wayland && use video_cards_nvidia; then
-		emesonargs+=(
-			-Degl_device=true
-			-Dwayland_eglstream=true
-		)
-	else
-		emesonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}