commit: ab514e24304511958d218eae535b072df8c8dc31
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Fri Dec 29 16:12:43 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 13:29:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab514e24
gnome-extra/cinnamon-session: add 6.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
gnome-extra/cinnamon-session/Manifest | 1 +
.../cinnamon-session/cinnamon-session-6.0.2.ebuild | 92 ++++++++++++++++++++++
...nnamon-session-6.0.0-fix-optional-systemd.patch | 21 +++++
3 files changed, 114 insertions(+)
diff --git a/gnome-extra/cinnamon-session/Manifest
b/gnome-extra/cinnamon-session/Manifest
index 7130224f7a30..72b4e90c881e 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,2 +1,3 @@
DIST cinnamon-session-5.6.0.tar.gz 199389 BLAKE2B
ecd8152af4784affc8c9b8ae7ca48adaecca4355c2db5d64ca577f44abc0ff35cf27ef324fa9d3520c125bc979727bbab67f99209e5a641ad0329a26025698b5
SHA512
260acb2a4e7016af3be2865d51eb947774020fc4e333e6a4ce72664d182c098f663d1878ac2194607f04517c3ea6916d2bfc5e55749f8252a38205b227d40335
DIST cinnamon-session-5.8.1.tar.gz 199477 BLAKE2B
9371089e3caa4765498c2fa3ab9e5de03d47a67bced8a1a14fec33d7aea3372950b1e8f7f88be825697c8a2899dc0812f6ec7c5fb008f4bf2f4b5bdc343c01cc
SHA512
8a88834a639c74b227f0d666fa2bcb4c3f73859ff8de84a440e84af3f3343c41c47a896ccf0dc09cc7114b7c921e2f670aec7846c57ec92b8da3333be7955309
+DIST cinnamon-session-6.0.2.tar.gz 165188 BLAKE2B
077552f147a61d4615db8091411314560a12b5c40420381280e41a35395119ece15602f9c74bac3409b49d4363285a386555a787ced10dee5ca757d254ccb7ec
SHA512
80e1c5b8654aad805424351c1a49cc3f68e52ddcf0606180fd5ee006607829f4f451c6bdd9be7e022a258041e8a6967faf0b16b8536a0a8982dcc805e35fd01a
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-6.0.2.ebuild
b/gnome-extra/cinnamon-session/cinnamon-session-6.0.2.ebuild
new file mode 100644
index 000000000000..cefd1f0a4183
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-6.0.2.ebuild
@@ -0,0 +1,92 @@
+# 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-single-r1 xdg-utils
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/
https://github.com/linuxmint/cinnamon-session";
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.3:2
+ >=gnome-extra/cinnamon-desktop-6.0:0=
+ media-libs/libcanberra[pulseaudio]
+ virtual/opengl
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3:3[introspection]
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXcomposite
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/pango[X]
+ >=x11-libs/xapp-2.8.1[introspection]
+
+ systemd? (
+ >=sys-apps/systemd-183
+ )
+ !systemd? (
+ sys-auth/elogind[policykit]
+ )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/xtrans
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ dev-libs/gobject-introspection
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ ')
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/gdbus-codegen
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # Fix bad systemd include
+ # https://github.com/linuxmint/cinnamon-session/pull/164
+ "${FILESDIR}/${PN}-6.0.0-fix-optional-systemd.patch"
+)
+
+src_prepare() {
+ default
+ python_fix_shebang data cinnamon-session-quit
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dipv6=true
+ -Dxtrans=true
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ gnome2_schemas_update
+}
diff --git
a/gnome-extra/cinnamon-session/files/cinnamon-session-6.0.0-fix-optional-systemd.patch
b/gnome-extra/cinnamon-session/files/cinnamon-session-6.0.0-fix-optional-systemd.patch
new file mode 100644
index 000000000000..cee6e14b8fe1
--- /dev/null
+++
b/gnome-extra/cinnamon-session/files/cinnamon-session-6.0.0-fix-optional-systemd.patch
@@ -0,0 +1,21 @@
+From 44ac74ea7e771a35a41235b4e7d2539d4521b626 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <spa...@bluefang-logic.com>
+Date: Tue, 2 Jan 2024 23:26:20 -0500
+Subject: [PATCH] Remove orphaned include
+
+---
+ cinnamon-session/main.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/cinnamon-session/main.c b/cinnamon-session/main.c
+index 49d1e32..802a1ae 100644
+--- a/cinnamon-session/main.c
++++ b/cinnamon-session/main.c
+@@ -40,7 +40,6 @@
+ #include "csm-session-fill.h"
+ #include "csm-store.h"
+ #include "csm-system.h"
+-#include <systemd/sd-journal.h>
+
+ #define CSM_DBUS_NAME "org.gnome.SessionManager"
+
