gentoo auto-resync : 15:02:2024 - 23:36:26

3 files changed, 97 insertions, 5 deletions

diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 540edd2d4fa3..05ce89062bf5 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,5 +1,6 @@
-DIST cinnamon-desktop-5.6.2.tar.gz 502140 BLAKE2B b96be728da24a43b88a14b7cd5e9dd6313c753e32e7f2dcb2a5ac4f2c8eb27266f261a1a1e5499d9a94ccbc679d9c4ea9cdaae4ee6b1187de44d518a9a483ca7 SHA512 cfa50697991c41916f53d2e902ff37671e547e362cb8c70eace1b482a97bf139b6a28375d0e399c738cb705ca3aa8768c3ecd13551b677c5446288259ed5deeb
+AUX cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch 3463 BLAKE2B 2d52681a98eb18e8706934bea2922c3974b97b162d2c93c75bf18b3f040015614c4f440faf8554fe09df314084d5a44052502a1e4836a33f1999375923cd562d SHA512 faed2bf7f43ee85dc302ffc8b42fdf95b20ab7f658ca921ced5999e7b798a91507ae56cf942f1245e850dd26c1755bb64a922a874b55c6eca0aeaad2d5f6be74
 DIST cinnamon-desktop-5.8.0.tar.gz 502547 BLAKE2B 58be0fcfccce58036bbf867d9619b78bc5357b431e92fc8777a0d102db0ee1abb640d60f429e82afd909dde49764858b3af872aadc55a1c642a3771f0e154f38 SHA512 93c86d8269c39b84463ca102581e45d9b29a55c402bb040198972614fda2d81e075ec96cbaa859cef15dc3439b31329722f45ed637026b6d6a43d71ac6afb246
-EBUILD cinnamon-desktop-5.6.2.ebuild 1426 BLAKE2B 5b1b53d0362e61ee6de7a4ccfd092675a85c7a3ff42af9bfb0b9e48ffa685810884c6393b3807705fb185a80cbcd5591a57039c574e6907e180aaccd851186b0 SHA512 db0323aee5b1b1278284a200e90d1925731b883aa84d97242f7038c26f26570d88345239b983000bd0c23f29ac5d1d920f8cb55099bb4eb013b3b6a4a8aef493
+DIST cinnamon-desktop-6.0.0.tar.gz 509871 BLAKE2B 908b53445327cdbb5560655700e6dfa829934714167f02dda2d9d31a02ae85fcf6565704e791f67f0725e9eb76ed65ef26944d3fac2a58e3091b2afd10bb70af SHA512 35c09c6c3b9563c27561624bb731f17dd4f07b4e5aca5af39ffd56f72fa271babb4fd2cfe7080ac078b0d9141fcbc904036f3f156c547d64e68ba53eea14a471
 EBUILD cinnamon-desktop-5.8.0.ebuild 1433 BLAKE2B 8bc706331c4896c55fef831354a2d384a3a1a2e31d7d7456e5c4c9fa7fb8742d9f8316ba177b3451d54f820863b253a3792933e87c15408b14ffa1cc0395c1d9 SHA512 0e373ede140eab67a7b3b42ceb08edc9322251182331c73b44042fcdd94ac2107a6d257491f6a13d4f099a39afc5dfcbffdc7563571e9aacc7cd45583428cd7c
+EBUILD cinnamon-desktop-6.0.0.ebuild 1700 BLAKE2B a2e1adeaf5902acd87f982937487a57c1abaa72a05bb844b66340ea533215ffb482549af56c1ecea25d16fc7b167df41584f9d3b38549dfd01b64a9be100874b SHA512 c781f82fe2a8f994ad291e50254783158d4cad2a173d68c4c55ce87301fc969863aa4c0f2bac039bb7c27420d35ac41be04c539aecb40e35f0567e955f17f3f0
 MISC metadata.xml 496 BLAKE2B c019ef51b10de9ccafed1294e6d436dcdc8f02735170afe9e038689c6c4d76fb3e099bc9ec7f10c2a50d2bfa5e1d1c191667a470d734effad53d9d299f431664 SHA512 41a99dd4e1aad85dda44e2168bc150e2c27bb40a45c0dfe0f085e502242e6a0704ad8b47f64140d81afa7ff096cac735c46827f3d949962400de92d769505cc4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild
index 5d30638f5267..b1163814b407 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.6.2.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit meson gnome2-utils python-any-r1
 
@@ -13,7 +13,8 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-1 GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
 SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="systemd"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
@@ -30,6 +31,9 @@ RDEPEND="
 	x11-libs/libxkbfile
 	>=x11-libs/libXrandr-1.3
 	x11-misc/xkeyboard-config
+	systemd? (
+		sys-apps/systemd
+	)
 "
 DEPEND="
 	${RDEPEND}
@@ -37,11 +41,17 @@ DEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# https://github.com/linuxmint/cinnamon-desktop/commit/d0f8c74a7864786cf040da31c7db83d8d2fcc5e4
+	"${FILESDIR}/${PN}-6.0.0-fix-idle-monitor-dbus.patch"
+)
+
 src_prepare() {
 	default
 	python_fix_shebang install-scripts
@@ -50,6 +60,7 @@ src_prepare() {
 src_configure() {
 	local emesonargs=(
 		-Dpnp_ids="${EPREFIX}/usr/share/hwdata/pnp.ids"
+		$(meson_feature systemd)
 	)
 	meson_src_configure
 }
diff --git a/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch b/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch
new file mode 100644
index 000000000000..76fa5c53cde6
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-6.0.0-fix-idle-monitor-dbus.patch
@@ -0,0 +1,80 @@
+From d0f8c74a7864786cf040da31c7db83d8d2fcc5e4 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 15 Jan 2024 15:16:08 -0500
+Subject: [PATCH] gnome-idle-monitor.c: Fix some dbus names Mutter->Muffin.
+
+The session manager uses this to get notifications about idle
+state changes now - instead of its own idle-monitor code (which
+only worked with x11), it now relies on muffin to notify on
+changes from various sources (xorg, wayland, upower).
+---
+ libcinnamon-desktop/gnome-idle-monitor.c | 6 +++---
+ libcinnamon-desktop/idle-monitor.xml     | 4 ++--
+ libcinnamon-desktop/meson.build          | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libcinnamon-desktop/gnome-idle-monitor.c b/libcinnamon-desktop/gnome-idle-monitor.c
+index 71d8918..81aaaab 100644
+--- a/libcinnamon-desktop/gnome-idle-monitor.c
++++ b/libcinnamon-desktop/gnome-idle-monitor.c
+@@ -67,7 +67,7 @@ G_DEFINE_TYPE_WITH_CODE (GnomeIdleMonitor, gnome_idle_monitor, G_TYPE_OBJECT,
+              G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                         gnome_idle_monitor_initable_iface_init))
+ 
+-#define IDLE_MONITOR_PATH "/org/gnome/Mutter/IdleMonitor/Core"
++#define IDLE_MONITOR_PATH "/org/cinnamon/Muffin/IdleMonitor/Core"
+ 
+ static void
+ on_watch_fired (MetaDBusIdleMonitor *proxy,
+@@ -256,7 +256,7 @@ on_name_appeared (GDBusConnection *connection,
+     meta_dbus_object_manager_client_new (connection,
+                          G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
+                          name_owner,
+-                         "/org/gnome/Mutter/IdleMonitor",
++                         "/org/cinnamon/Muffin/IdleMonitor",
+                          monitor->priv->cancellable,
+                          on_object_manager_ready,
+                          monitor);
+@@ -296,7 +296,7 @@ gnome_idle_monitor_initable_init (GInitable     *initable,
+     monitor = GNOME_IDLE_MONITOR (initable);
+ 
+     monitor->priv->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
+-                             "org.gnome.Mutter.IdleMonitor",
++                             "org.cinnamon.Muffin.IdleMonitor",
+                              G_BUS_NAME_WATCHER_FLAGS_NONE,
+                              on_name_appeared,
+                              on_name_vanished,
+diff --git a/libcinnamon-desktop/idle-monitor.xml b/libcinnamon-desktop/idle-monitor.xml
+index 4bd69cb..5203883 100644
+--- a/libcinnamon-desktop/idle-monitor.xml
++++ b/libcinnamon-desktop/idle-monitor.xml
+@@ -3,14 +3,14 @@
+ 'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
+ <node>
+   <!--
+-      org.gnome.Mutter.IdleMonitor:
++      org.cinnamon.Muffin.IdleMonitor:
+       @short_description: idle monitor interface
+ 
+       This interface is used by gnome-desktop to implement
+       user activity monitoring.
+   -->
+ 
+-  <interface name="org.gnome.Muffin.IdleMonitor">
++  <interface name="org.cinnamon.Muffin.IdleMonitor">
+     <method name="GetIdletime">
+       <arg name="idletime" direction="out" type="t"/>
+     </method>
+diff --git a/libcinnamon-desktop/meson.build b/libcinnamon-desktop/meson.build
+index fbab37a..61976c9 100644
+--- a/libcinnamon-desktop/meson.build
++++ b/libcinnamon-desktop/meson.build
+@@ -1,7 +1,7 @@
+ dbus_idle_built_sources = gnome.gdbus_codegen('meta-dbus-idle-monitor',
+   'idle-monitor.xml',
+   namespace: 'MetaDBus',
+-  interface_prefix: 'org.gnome.Muffin',
++  interface_prefix: 'org.cinnamon.Muffin',
+   object_manager: true
+ )
+