6 files changed, 211 insertions, 2 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index ad4502c0483f..0e35fbd9c1d0 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index ea54bd2d7337..4c61dba97414 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,7 @@
+AUX 38919a88b2b8381f5b24b69742d1b9db32029c61.patch 724 BLAKE2B aa7739b0e333d887b39e89f7774b016b6aa9339b37682861f852d354554ccdbe52cc9c9bc50bb612731e4f9a371b749729758d9ab8072ab0d5f282f46c4c697f SHA512 5f96534e613356453a9e060c0145d55db3737812e5094568819c031ced6e2c8c41583ac208b38a664d42302cb94031d20154764628cae05348d20362b91d0ffe
 DIST muffin-5.8.1.tar.gz 4519174 BLAKE2B 29269c641e28117f9dd0900dc129aca21c8834058e6b3168b2d44e0ecafba0b177ba214c82337f3120512f4433d6117781685f422a57a244edbfa8748a5ae661 SHA512 bf8e5cdc789ac8a2d1f616a751bf321209b13e3936b483d46370017c58a4b9ebd10b42a71e8691a42f013a0c44250e4a84549d9c5cf120d3382f61aa6040710b
 DIST muffin-6.0.1.tar.gz 4521556 BLAKE2B e3f28dea9f66b30805f9b98bc79f2e4a08e9e5eb6501f455f0e3c42c5d9ed14c48be75b07a97da7b671156d14ed61f3b882d8ede4f9b83dac5496fac5a0f0348 SHA512 94aa767db3677116094cb0d9a63d1a446b6ec426b4b38576fcdb17259ef92d81f1a14c0e93dadd2bc4dfaca522531ed177bb0af895b3df7abf20d0e9a77d71af
 EBUILD muffin-5.8.1.ebuild 3076 BLAKE2B 3deaa21d00b8cb78f8d7c29325f683e67ba8f3c5fdd0e49a7106765ec1710f59468dada59db1b96cd9d0e8b51d986ff27eb096c5b08d0db883d717cce7427b65 SHA512 7a3c6409c4b915c42a2b67f11426e5be6762365346093e9ba99b36d4f69279156e05cf1c04a62c5a44205e13bddaeb8adea5203cd32040a3b9c06e46c98612f5
 EBUILD muffin-6.0.1-r1.ebuild 4101 BLAKE2B d7629f62e5888b83c2df2ea0f87cc929e46836adee876ac773b8ccc3c1645b2d3ceec97069b9d6a0b1d3527277fb29b1427db50cc011201301bb47b281302a6d SHA512 d7532f2f7f15cf1bd780f3a1070400f8cdcfb661cd832f412538124e243ee63c2ec82c850a65b1bab550916d472a1d4f5cb92a98b9f62869490be630e0319477
+EBUILD muffin-6.0.1-r2.ebuild 4298 BLAKE2B 8d1753626944a825bb85e98eeb30548a1a2f1ef0a4cfb7a0357ab4d2dc80279c1082bbe494a155100e42f585fc1ca1e53575caf0d7a29b9ebfcbc3b6f634165f SHA512 6d7a065e9a3d6f40a4443d76d7e7759772c149f5cd530a12ec11c712533a7da99db5c49a026e982b10205a90a724e39b8af77294935d58b9ee6351b524472e32
 MISC metadata.xml 611 BLAKE2B 550f115a51852c3e1dfcb9f84bd84c6c24fcfa7b90ca3772ed1e7e315a7b112c035e17a34e029e794922012eee3163759fc6105af29e0dfd1767183c4779005c SHA512 3211657912916ca3a207f46159d436839e9a82594cdad574dc02c64b19654f801e082284d56c4dceddd8cdbb8be424f0b4be37b010f3130551dfe12df2928ecf
diff --git a/x11-wm/muffin/files/38919a88b2b8381f5b24b69742d1b9db32029c61.patch b/x11-wm/muffin/files/38919a88b2b8381f5b24b69742d1b9db32029c61.patch
new file mode 100644
index 000000000000..a2472ec9f212
--- /dev/null
+++ b/x11-wm/muffin/files/38919a88b2b8381f5b24b69742d1b9db32029c61.patch
@@ -0,0 +1,23 @@
+From 38919a88b2b8381f5b24b69742d1b9db32029c61 Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux@fedoraproject.org>
+Date: Mon, 5 Feb 2024 16:06:14 +0000
+Subject: [PATCH] Fix compile issue (#683)
+
+(warning becomes an error due to gcc 14 changes.)
+---
+ src/core/prefs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/prefs.c b/src/core/prefs.c
+index c07359abc..3161e4be9 100644
+--- a/src/core/prefs.c
++++ b/src/core/prefs.c
+@@ -2258,7 +2258,7 @@ meta_prefs_add_keybinding (const char           *name,
+         }
+       else
+         {
+-          strokes = g_strdupv (bindings);
++          strokes = g_strdupv((gchar **)bindings);
+         }
+ 
+       queue_changed (META_PREF_KEYBINDINGS);
diff --git a/x11-wm/muffin/muffin-6.0.1-r2.ebuild b/x11-wm/muffin/muffin-6.0.1-r2.ebuild
new file mode 100644
index 000000000000..d3f1afc4229f
--- /dev/null
+++ b/x11-wm/muffin/muffin-6.0.1-r2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome2-utils meson python-any-r1 virtualx
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0"
+SLOT="0"
+IUSE="input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+REQUIRED_USE="wayland? ( udev )"
+
+# Dependencies listed in meson order
+COMDEPEND="
+	x11-libs/libX11
+	>=media-libs/graphene-1.9.3[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/pango-1.20.0[introspection?]
+	>=x11-libs/cairo-1.10.0[X]
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.61.1:2
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	>=gnome-extra/cinnamon-desktop-5.8:0=
+	>=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
+	>=app-accessibility/at-spi2-core-2.46.0:2[introspection?]
+	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
+	media-libs/libglvnd[X]
+	media-libs/mesa[X(+),egl(+)]
+	x11-libs/libSM
+	>=x11-libs/startup-notification-0.7
+	media-libs/fontconfig
+
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.13:=
+	)
+	introspection? (
+		>=dev-libs/gobject-introspection-1.41.3:=
+	)
+	screencast? (
+		>=media-video/pipewire-0.3.0:=
+	)
+	sysprof? (
+		>=dev-util/sysprof-capture-3.35.2:3
+	)
+	udev? (
+		>=virtual/libudev-228:=
+		>=dev-libs/libgudev-232
+	)
+	wayland? (
+		>=dev-libs/libinput-1.7:=
+		>=dev-libs/wayland-1.13.0
+		>=dev-libs/wayland-protocols-1.19
+		|| (
+			>=media-libs/mesa-24.1.0_rc1[opengl]
+			<media-libs/mesa-24.1.0_rc1[gbm(+),gles2]
+		)
+		x11-base/xwayland
+		x11-libs/libdrm
+
+		systemd? (
+			sys-apps/systemd
+		)
+		!systemd? (
+			sys-auth/elogind
+		)
+		video_cards_nvidia? (
+			gui-libs/egl-wayland
+		)
+	)
+"
+RDEPEND="${COMDEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${COMDEPEND}
+	x11-base/xorg-proto
+
+	sysprof? (
+		dev-util/sysprof-common
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	wayland? (
+		dev-util/wayland-scanner
+		>=sys-kernel/linux-headers-4.4
+		x11-libs/libxcvt
+	)
+"
+
+PATCHES=(
+	# -Werror=incompatible-pointer-types
+	# https://bugs.gentoo.org/919091
+	# https://github.com/linuxmint/muffin/pull/683
+	"${FILESDIR}"/38919a88b2b8381f5b24b69742d1b9db32029c61.patch
+)
+
+src_prepare() {
+	default
+	python_fix_shebang src/backends/native/gen-default-modes.py
+}
+
+# Wayland is not supported upstream.
+src_configure() {
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		$(meson_use udev)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use test cogl_tests)
+		$(meson_use test clutter_tests)
+		# Wayland/Core tests cause issues. They attempt to access video hardware
+		# and leave /tmp/.X#-lock files behind.
+		-Dcore_tests=false # wayland
+		$(meson_use test tests)
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose
+	)
+
+	if use wayland; then
+		emesonargs+=(
+			$(meson_use video_cards_nvidia egl_device)
+			$(meson_use video_cards_nvidia wayland_eglstream)
+		)
+	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 virtx meson_src_test --no-suite flaky
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index c5f99f9eec4c..0c492d8f4b5a 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -7,7 +7,7 @@ DIST mutter-45.5.tar.xz 2886412 BLAKE2B b5534943d41500a165de5242f73b9da145dd52a4
 DIST mutter-45.6.tar.xz 2886844 BLAKE2B f5658d0667cac04f290040e26cf8326d6d30130d0500b18b318269bae152b18a1e4867b9c749269e14b31fb8d7af7fb7a1d72f94df1dad1da0bd98462b9a29f0 SHA512 bfd918469450dd287b58c5e8c55969d9d3bb737898a5823175c15841e2d483faf2900f6c0d4b2bcdcbdb4e58fa16d4dee836084f1f4307fbbce3e7a8d6343738
 EBUILD mutter-45.2-r1.ebuild 7271 BLAKE2B 47dd9d2e527a3ec275ddfb30f03bc32dbac84d3f1311fdb7a703269db8950aa401b6939f3a471d19da2d3b6c1173ec402b33573bd94d5e436d958b01598f20fb SHA512 8c6908307c82c6e542cdc8e87616fc9e9581e50cf31a2b85bf5dc4741b3d8b119b5b77d171f90774ba85e0209fedf58cb49fe33a6e557d092b19206086bc8e83
 EBUILD mutter-45.4.ebuild 7068 BLAKE2B 48a72d702edf822680a340ff739a6a779f10adf245a5aaff21463f50aa220c8949cfe5d33952eda85ebb1f1f21d9537af41009d870e38b53336b75b70dfab6da SHA512 162014d375b4dd556bc8fb853ae40b82eb7883eeb26e3d3ecf552226eb37886a946d27dd0976378129a2541179f5f9ae866b2c548c6413b5457d717b1c54da6b
-EBUILD mutter-45.5.ebuild 7076 BLAKE2B de0ac32c8d68f73b4d5820f6f6619b23cb1930dcecc9788e711b04db7619ce5636952175f88d10957a5bb4f5c562c47a26634982cbb21b5310533884b88b43fc SHA512 7475b18a9a6872067f44a56b3e461443ca2b5a21dcf094c31f759a0386ab812b9001bfb009825957d874be322911e86e9ec16778cf2d5dd42d027bf0a81850e7
+EBUILD mutter-45.5.ebuild 7074 BLAKE2B be4c19f9fcea03f64e8faba3364b751f380c2fd865e0096cf5af32c17370f143467ab69e51827528cb7659a7e980afbd82f6222e279dd39e292d80e959940640 SHA512 fdc80858095dcb1122e79775fa7e6756cc0816bd9f75250b5630359b96b260ddc4db38bd6bc81b0937db955369d94f7afbb69c55e03ffd09474961282f18f7f7
 EBUILD mutter-45.6.ebuild 7329 BLAKE2B 0f1f364a4f9b549e606bddf92546d12361521c5e4c48e9ca2e55e45f2f7bf28ace17b1a1eb598d44157be76d10c22549d09bbbeaa2c84b42b880ab30d7015fc1 SHA512 428844a68e1b23bbb1639e7f615ddb24dc64634bbaf3c7cd053a9c5ed6cbe815f3588082bc6d69003c5b28cbd6e034586cfee3a76d9a713c314b32c9bf09c7f6
 EBUILD mutter-9999.ebuild 7108 BLAKE2B a91ea047d22a4a79d164d30d5a5a0d966cb652061c1a97fa17762262e6736c45949993b5805ab90d63e07bcb5ba7a50d625783d1aa1a2e5c818347bbae4c5286 SHA512 f6490a571afc2c25b9c22d38858b9a02d0167f49f789d7f20ca4724580ed38b1bbaa794722a42e7141f49e44adac31cf4b77f374dd29dc703caed0d56e61e2a0
 MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87
diff --git a/x11-wm/mutter/mutter-45.5.ebuild b/x11-wm/mutter/mutter-45.5.ebuild
index 15c1c0068cc8..4f7520c33542 100644
--- a/x11-wm/mutter/mutter-45.5.ebuild
+++ b/x11-wm/mutter/mutter-45.5.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 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~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