commit: 9c1310e1b374c12098ef8a4686569a1c49d3ea64
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Thu Dec 28 08:17:51 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 13:29:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c1310e1
gnome-extra/cinnamon-desktop: add 6.0.0
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
gnome-extra/cinnamon-desktop/Manifest | 1 +
.../cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild | 74 ++++++++++++++++++++
...namon-desktop-6.0.0-fix-idle-monitor-dbus.patch | 80 ++++++++++++++++++++++
3 files changed, 155 insertions(+)
diff --git a/gnome-extra/cinnamon-desktop/Manifest
b/gnome-extra/cinnamon-desktop/Manifest
index d66ab252cd03..2c430252f900 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,2 +1,3 @@
DIST cinnamon-desktop-5.6.2.tar.gz 502140 BLAKE2B
b96be728da24a43b88a14b7cd5e9dd6313c753e32e7f2dcb2a5ac4f2c8eb27266f261a1a1e5499d9a94ccbc679d9c4ea9cdaae4ee6b1187de44d518a9a483ca7
SHA512
cfa50697991c41916f53d2e902ff37671e547e362cb8c70eace1b482a97bf139b6a28375d0e399c738cb705ca3aa8768c3ecd13551b677c5446288259ed5deeb
DIST cinnamon-desktop-5.8.0.tar.gz 502547 BLAKE2B
58be0fcfccce58036bbf867d9619b78bc5357b431e92fc8777a0d102db0ee1abb640d60f429e82afd909dde49764858b3af872aadc55a1c642a3771f0e154f38
SHA512
93c86d8269c39b84463ca102581e45d9b29a55c402bb040198972614fda2d81e075ec96cbaa859cef15dc3439b31329722f45ed637026b6d6a43d71ac6afb246
+DIST cinnamon-desktop-6.0.0.tar.gz 509871 BLAKE2B
908b53445327cdbb5560655700e6dfa829934714167f02dda2d9d31a02ae85fcf6565704e791f67f0725e9eb76ed65ef26944d3fac2a58e3091b2afd10bb70af
SHA512
35c09c6c3b9563c27561624bb731f17dd4f07b4e5aca5af39ffd56f72fa271babb4fd2cfe7080ac078b0d9141fcbc904036f3f156c547d64e68ba53eea14a471
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild
b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild
new file mode 100644
index 000000000000..b1163814b407
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson gnome2-utils python-any-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/
https://github.com/linuxmint/cinnamon-desktop";
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-1 GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="systemd"
+
+RDEPEND="
+ >=dev-libs/glib-2.37.3:2[dbus]
+ >=dev-libs/gobject-introspection-0.10.2:=
+ >=gnome-base/gsettings-desktop-schemas-3.5.91
+ >=media-libs/libpulse-12.99.3[glib]
+ sys-apps/accountsservice
+ sys-apps/hwdata
+ x11-libs/cairo[X]
+ >=x11-libs/gdk-pixbuf-2.22:2[introspection]
+ >=x11-libs/gtk+-3.3.16:3[introspection]
+ x11-libs/libX11
+ >=x11-libs/libXext-1.1
+ x11-libs/libxkbfile
+ >=x11-libs/libXrandr-1.3
+ x11-misc/xkeyboard-config
+ systemd? (
+ sys-apps/systemd
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+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
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dpnp_ids="${EPREFIX}/usr/share/hwdata/pnp.ids"
+ $(meson_feature systemd)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
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 <miketwebs...@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
+ )
+
