* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/, gnome-extra/cinnamon-session/files/
@ 2015-11-15 22:30 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2015-11-15 22:30 UTC (permalink / raw
To: gentoo-commits
commit: 08ff1393a76e025019e8cf39e29b2572094eb5ac
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 21:55:17 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 22:30:11 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ff1393
gnome-extra/cinnamon-session: Drop old
Package-Manager: portage-2.2.24
| 2 -
.../cinnamon-session/cinnamon-session-2.4.3.ebuild | 72 ----------------------
.../cinnamon-session/cinnamon-session-2.6.2.ebuild | 72 ----------------------
.../cinnamon-session-2.2.0-automagic-upower.patch | 33 ----------
4 files changed, 179 deletions(-)
--git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 33aad7c..54f3b19 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,4 +1,2 @@
-DIST cinnamon-session-2.4.3.tar.gz 903363 SHA256 07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733 SHA512 318815e786f447237bceb08689eca5cf499c7fb0bd70b86c16f76af49e8f43c2a8c78e4caa96c0253a5e088702933ee53996286a8d4c2a68fa346832f12ec317 WHIRLPOOL 13e6c4d2e606484ad8fd290f195f9db4de6a9d09073b6bd8ae3c34af7786fee4aeff8a94e6aab03f5178c2721ec251d7fd2122fe1882002cfd4fdcf74c4624e8
-DIST cinnamon-session-2.6.2.tar.gz 610789 SHA256 42ea718b77240ff24061203bc03ba6af7d51bcba2323b0bb73a56870e232cb92 SHA512 93b2caab5164de470794947a63dbb05a21f47c10d14df81f7563fac404be11423a7083e8e2aae20f41e4f43ae29bbb1131b5b1c56e2b2cc37aff0686a6d0c450 WHIRLPOOL e37b101665b49a7710237e63bb12634dc059cf56ba37b196cf24f6e6a2af7d9d6055005b646cb916fbbb47133c97c8126da76e2cd6c9f7845a529c2331886162
DIST cinnamon-session-2.6.3.tar.gz 612267 SHA256 391db79472cbd6c1546cec5e7e8e82f2a465fea92cda019fca14f7c54cfa4dc1 SHA512 91cf30dfd5fe7812c98d67233d54049ba11d04e142910f081a22bd48e2f0bbd0b4eeea4e66326628a0196c90164a146a2ef2ac61b26f289c17a0db8dbcc45a9b WHIRLPOOL f0841219624373c377e7f527b527682034d7b2519de105473395df87ab7aea3b130c5a45ad3141ca2fd4a1f523f3308b5af0e5409472e46131a6e68869134225
DIST cinnamon-session-2.8.2.tar.gz 591438 SHA256 0a7236c75fef67c1a1c173e184c083ff2879e870428bdc3cb53a892cb0bfaf79 SHA512 4f713cc5d9ec21bb118a2761792b1a86b43c386e0042f3f1c57ab6fa01fb7fd34463d83e63c794950dfe8358e757277a87d649340cda33f72fe4c89c7cf099bc WHIRLPOOL 6f202a79a27cdf6a8bbe1ed62d5b4a6c6edd5746b8b50a448fc8874cb5de4b45c4201e1bce25760072ee2874438e87505405810b45c7e10019fdbfc4c7cc9b6b
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild
deleted file mode 100644
index 9ebfeb6..0000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 systemd"
-
-COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.76
- >=dev-libs/glib-2.32:2
- >=dev-libs/json-glib-0.10
- media-libs/libcanberra
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.90.7:3
- x11-libs/cairo
- 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]
- virtual/opengl
- systemd? ( >=sys-apps/systemd-183 )
- !systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
-"
-RDEPEND="${COMMON_DEPEND}
- !systemd? ( sys-auth/consolekit )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- doc? ( app-text/xmlto )
-
- gnome-base/gnome-common
-"
-# gnome-base/gnome-common for eautoreconf
-
-src_prepare() {
- # make upower check non-automagic
- epatch "${FILESDIR}/${PN}-2.2.0-automagic-upower.patch"
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS README README.md"
-
- gnome2_src_configure \
- --disable-gconf \
- --disable-static \
- $(use_enable doc docbook-docs) \
- $(use_enable ipv6) \
- $(use_enable systemd) \
- $(usex systemd --disable-old-upower --enable-old-upower)
-}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild
deleted file mode 100644
index 13d43b6..0000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ipv6 systemd"
-
-COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.88
- >=dev-libs/glib-2.37.3:2
- media-libs/libcanberra
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3:3
- x11-libs/cairo
- 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]
- virtual/opengl
- systemd? ( >=sys-apps/systemd-183 )
- !systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
-"
-RDEPEND="${COMMON_DEPEND}
- >=gnome-extra/cinnamon-desktop-2.6[systemd=]
- !systemd? ( sys-auth/consolekit )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- doc? ( app-text/xmlto )
-
- gnome-base/gnome-common
-"
-# gnome-base/gnome-common for eautoreconf
-
-src_prepare() {
- # make upower and logind check non-automagic
- epatch "${FILESDIR}/${PN}-2.6.2-automagic.patch"
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS README README.md"
-
- gnome2_src_configure \
- --disable-gconf \
- --disable-static \
- $(use_enable doc docbook-docs) \
- $(use_enable ipv6) \
- $(use_enable systemd logind) \
- $(usex systemd --disable-old-upower --enable-old-upower)
-}
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch
deleted file mode 100644
index 7624680..0000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2f88efdaaefefabcc16d13f2ae63f57244de01ce Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 5 May 2014 22:34:14 -0400
-Subject: [PATCH] Make old upower check non-automagic
-
----
- configure.ac | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ec4ffac..a122872 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,7 +58,15 @@ PKG_CHECK_MODULES(CINNAMON_SESSION,
-
- dnl We can only support old upower
- dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
--PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+AC_ARG_ENABLE([old-upower],
-+ AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]),
-+ [enable_old_upower=$enableval],
-+ [enable_old_upower=auto])
-+
-+have_old_upower=no
-+if test x$enable_old_upower != xno ; then
-+ PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+fi
- AS_IF([test x$have_old_upower = xyes], [
- AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
- ])
---
-1.9.2
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/, gnome-extra/cinnamon-session/files/
@ 2017-11-29 20:05 Kristian Fiskerstrand
0 siblings, 0 replies; 4+ messages in thread
From: Kristian Fiskerstrand @ 2017-11-29 20:05 UTC (permalink / raw
To: gentoo-commits
commit: 065d1ab4d584231123ea69b4b67486ba1e6ce627
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 20:02:28 2017 +0000
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 20:02:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=065d1ab4
gnome-extra/cinnamon-session: Readd systemd support
Package-Manager: Portage-2.3.13, Repoman-2.3.3
...1-r3.ebuild => cinnamon-session-3.6.1-r4.ebuild} | 1 +
.../files/cinnamon-session-3.6.1-elogind2.patch | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r3.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
similarity index 96%
rename from gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r3.ebuild
rename to gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
index 9e6f0e7cb09..d5da4702700 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r3.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
@@ -53,6 +53,7 @@ src_prepare() {
# make upower and logind check non-automagic
eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
eapply "${FILESDIR}/${PN}-3.6.1-elogind.patch"
+ eapply "${FILESDIR}/${PN}-3.6.1-elogind2.patch"
eautoreconf
gnome2_src_prepare
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch
new file mode 100644
index 00000000000..a58703bc1bf
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch
@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+index c46b35f..5bde44a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -113,7 +113,7 @@ AC_ARG_ENABLE([logind],
+
+ have_logind=no
+ if test x$enable_logind != xno ; then
+- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
++ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
+ fi
+
+ if test x$have_logind = xyes; then
+@@ -124,6 +124,7 @@ have_elogind=no
+ PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
+ if test x$have_elogind = xyes; then
+ AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
++ AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
+ fi
+
+ AC_SUBST(LOGIND_CFLAGS)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/, gnome-extra/cinnamon-session/files/
@ 2018-07-31 8:38 Kristian Fiskerstrand
0 siblings, 0 replies; 4+ messages in thread
From: Kristian Fiskerstrand @ 2018-07-31 8:38 UTC (permalink / raw
To: gentoo-commits
commit: 9e4009499fe36ae4c8fd761b001bb678955cf936
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 4 10:33:52 2018 +0000
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Jul 31 08:34:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e400949
gnome-extra/cinnamon-session: New upstream version 3.8.0
Package-Manager: Portage-2.3.40, Repoman-2.3.9
| 1 +
.../cinnamon-session/cinnamon-session-3.8.0.ebuild | 67 ++++++++++++++++++++++
.../files/cinnamon-session-3.8.0-elogind.patch | 26 +++++++++
.../files/cinnamon-session-3.8.0-elogind2.patch | 25 ++++++++
4 files changed, 119 insertions(+)
--git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 2a502be9118..2b47bba17ec 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1 +1,2 @@
DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
+DIST cinnamon-session-3.8.0.tar.gz 197983 BLAKE2B e0a8b57637668586f941c64df6e610a5df385a6ea67a71e1e666344a73e0095861beb9d958344dfd18988960df1e4380e72257c5f490ab344a4e0de6a749c2d1 SHA512 c737ee77396d38e27d93a5d2cec76d9072038f6a096c6071f450a9a3eb71d83beb1da3ff3320820d7989731281e5a108c330eec333a7fcb66ca7a37f16501c76
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild
new file mode 100644
index 00000000000..1dd7ed6cc95
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+ >=dev-libs/dbus-glib-0.88
+ >=dev-libs/glib-2.37.3:2
+ media-libs/libcanberra
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3:3
+ x11-libs/cairo
+ 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]
+ virtual/opengl
+ systemd? ( >=sys-apps/systemd-183
+ sys-auth/polkit )
+ !systemd? ( sys-power/upower
+ sys-auth/polkit[elogind] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ >=gnome-extra/cinnamon-desktop-2.6[systemd=]
+ !systemd? ( sys-auth/elogind[policykit] )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.6
+ virtual/pkgconfig
+ doc? ( app-text/xmlto )
+
+ gnome-base/gnome-common
+"
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-3.8.0-elogind.patch" \
+ "${FILESDIR}/${PN}-3.8.0-elogind2.patch"
+ gnome2_src_prepare
+}
+
+src_configure() {
+ meson_src_configure \
+ -Dwith-gconf=false \
+ -Dwith-docbook=$(usex doc true false) \
+ -Dwith-ipv6=$(usex ipv6 true false)
+}
+
+src_install() {
+ meson_src_install
+}
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch
new file mode 100644
index 00000000000..7ae0fba5697
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch
@@ -0,0 +1,26 @@
+From e9857299d098d6e62d866fa738cf53197e45c8e3 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Mon, 9 Jul 2018 13:26:51 +0200
+Subject: [PATCH] ELOGIND also needs this code that is wrapped in LOGIND
+ condtional
+
+---
+ cinnamon-session/csm-systemd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c
+index dc2aa2e..039abd9 100644
+--- a/cinnamon-session/csm-systemd.c
++++ b/cinnamon-session/csm-systemd.c
+@@ -23,7 +23,7 @@
+ #include "config.h"
+ #include "csm-systemd.h"
+
+-#ifdef HAVE_LOGIND
++#if defined(HAVE_LOGIND) || defined(HAVE_ELOGIND)
+
+ #include <errno.h>
+ #include <string.h>
+--
+2.16.4
+
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch
new file mode 100644
index 00000000000..935541cf2a5
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch
@@ -0,0 +1,25 @@
+From 10148b8831ba26c7991b4643cbb05d92445f4b61 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Mon, 9 Jul 2018 13:56:57 +0200
+Subject: [PATCH] elogind
+
+---
+ cinnamon-session/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
+index 1d0db5b..4be50e5 100644
+--- a/cinnamon-session/meson.build
++++ b/cinnamon-session/meson.build
+@@ -77,7 +77,7 @@ executable('cinnamon-session',
+ xext,
+ xrender,
+ xtest,
+- # elogind,
++ elogind,
+ ],
+ link_with: [
+ libegg,
+--
+2.16.4
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/, gnome-extra/cinnamon-session/files/
@ 2024-09-27 5:57 Eli Schwartz
0 siblings, 0 replies; 4+ messages in thread
From: Eli Schwartz @ 2024-09-27 5:57 UTC (permalink / raw
To: gentoo-commits
commit: ea5975f28744e79cc270a6d5ec78dea99db00259
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Thu Sep 26 22:45:06 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 05:55:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea5975f2
gnome-extra/cinnamon-session: drop 6.0.4
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
| 1 -
.../cinnamon-session/cinnamon-session-6.0.4.ebuild | 94 -------
...-presence.c-Fix-CsmPresence-idle-handling.patch | 303 ---------------------
...nnamon-session-6.0.0-fix-optional-systemd.patch | 21 --
4 files changed, 419 deletions(-)
--git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 9eef2a91b9e4..0e36ea5d0ff1 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-session-6.0.4.tar.gz 165520 BLAKE2B fa608de433a4d47db102b1f11c716da8afeabd5772b7e957449297629e39bc215124acd2f0f94afe91763590ab92b06a3bce8dd1a6bad3997b9496b4114a36fa SHA512 cd8ac8579f9311f5234dad17fb32d40a1c58da2292734e58c4832d94a8b0687e4909f5886c2db0dab1e0c396f12c3495a8d966e76373ac26f3bd9795efcd1f1f
DIST cinnamon-session-6.2.1.tar.gz 166106 BLAKE2B ef7bb345f6c32f5402d9ff5dca152455a861e41e4fc5a77d1184f75ef17b70ab78bd3cfc9f63265703153d86217b5cd0a679f50add722110c47f7246050ca68f SHA512 bc0e69b938920149c26e2470aab9c2290b3b7ecea8a6e8249683402eb07af0c3a88c42cb86723d422dd14442246e841469010a05e808e675ff0e7ff1cc834224
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-6.0.4.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-6.0.4.ebuild
deleted file mode 100644
index a970f6adc9ce..000000000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-6.0.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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"
- # fix crash on idle
- "${FILESDIR}"/0001-cs-presence.c-Fix-CsmPresence-idle-handling.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/0001-cs-presence.c-Fix-CsmPresence-idle-handling.patch b/gnome-extra/cinnamon-session/files/0001-cs-presence.c-Fix-CsmPresence-idle-handling.patch
deleted file mode 100644
index 01a194f7cb7b..000000000000
--- a/gnome-extra/cinnamon-session/files/0001-cs-presence.c-Fix-CsmPresence-idle-handling.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-From 55e9291629cc028793e22b738214ecababe65c4b Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Wed, 24 Jan 2024 09:14:01 -0500
-Subject: [PATCH] cs-presence.c: Fix CsmPresence idle handling.
-
-Idle detection was broken since 5.4, as gnome-idle-monitor (in
-libcinnamon-desktop) was looking for the wrong muffin interface
-names.
-
-This file was also adapted incompletely to the new idle-monitor
-API.
-
-requires:
-linuxmint/cinnamon-desktop@d0f8c74a7864786cf04
----
- cinnamon-session/csm-presence.c | 130 +++++++++++++++++++-------------
- cinnamon-session/csm-presence.h | 6 --
- 2 files changed, 77 insertions(+), 59 deletions(-)
-
-diff --git a/cinnamon-session/csm-presence.c b/cinnamon-session/csm-presence.c
-index 1fd3d7c..69da703 100644
---- a/cinnamon-session/csm-presence.c
-+++ b/cinnamon-session/csm-presence.c
-@@ -64,16 +64,12 @@ struct CsmPresencePrivate
-
- enum {
- PROP_0,
-- PROP_STATUS,
-- PROP_STATUS_TEXT,
- PROP_IDLE_ENABLED,
- PROP_IDLE_TIMEOUT,
- };
-
--
- enum {
- STATUS_CHANGED,
-- STATUS_TEXT_CHANGED,
- LAST_SIGNAL
- };
-
-@@ -99,6 +95,10 @@ csm_presence_error_quark (void)
- return quark_volatile;
- }
-
-+static void idle_became_active_cb (GnomeIdleMonitor *idle_monitor,
-+ guint id,
-+ gpointer user_data);
-+
- static gboolean
- csm_presence_set_status_text (CsmPresence *presence,
- const char *status_text,
-@@ -120,6 +120,8 @@ csm_presence_set_status_text (CsmPresence *presence,
-
- if (status_text != NULL) {
- presence->priv->status_text = g_strdup (status_text);
-+ } else {
-+ presence->priv->status_text = g_strdup ("");
- }
-
- csm_exported_presence_set_status_text (presence->priv->skeleton, presence->priv->status_text);
-@@ -128,11 +130,11 @@ csm_presence_set_status_text (CsmPresence *presence,
- return TRUE;
- }
-
--static gboolean
-+static void
- csm_presence_set_status (CsmPresence *presence,
- guint status)
- {
-- g_return_val_if_fail (CSM_IS_PRESENCE (presence), FALSE);
-+ g_return_if_fail (CSM_IS_PRESENCE (presence));
-
- if (status != presence->priv->status) {
- presence->priv->status = status;
-@@ -140,7 +142,6 @@ csm_presence_set_status (CsmPresence *presence,
- csm_exported_presence_emit_status_changed (presence->priv->skeleton, presence->priv->status);
- g_signal_emit (presence, signals[STATUS_CHANGED], 0, presence->priv->status);
- }
-- return TRUE;
- }
-
- static void
-@@ -158,6 +159,11 @@ set_session_idle (CsmPresence *presence,
- /* save current status */
- presence->priv->saved_status = presence->priv->status;
- csm_presence_set_status (presence, CSM_PRESENCE_STATUS_IDLE);
-+
-+ gnome_idle_monitor_add_user_active_watch (presence->priv->idle_monitor,
-+ idle_became_active_cb,
-+ presence,
-+ NULL);
- } else {
- if (presence->priv->status != CSM_PRESENCE_STATUS_IDLE) {
- g_debug ("CsmPresence: already not idle, ignoring");
-@@ -171,27 +177,27 @@ set_session_idle (CsmPresence *presence,
- }
- }
-
--static gboolean
--on_idle_timeout (GnomeIdleMonitor *monitor,
-- guint id,
-- gboolean condition,
-- CsmPresence *presence)
-+static void
-+idle_became_idle_cb (GnomeIdleMonitor *idle_monitor,
-+ guint id,
-+ gpointer user_data)
- {
-- gboolean handled;
--
-- handled = TRUE;
-- set_session_idle (presence, condition);
-+ CsmPresence *presence = user_data;
-+ set_session_idle (presence, TRUE);
-+}
-
-- return handled;
-+static void
-+idle_became_active_cb (GnomeIdleMonitor *idle_monitor,
-+ guint id,
-+ gpointer user_data)
-+{
-+ CsmPresence *presence = user_data;
-+ set_session_idle (presence, FALSE);
- }
-
- static void
- reset_idle_watch (CsmPresence *presence)
- {
-- if (presence->priv->idle_monitor == NULL) {
-- return;
-- }
--
- if (presence->priv->idle_watch_id > 0) {
- g_debug ("CsmPresence: removing idle watch (%i)", presence->priv->idle_watch_id);
- gnome_idle_monitor_remove_watch (presence->priv->idle_monitor,
-@@ -199,12 +205,11 @@ reset_idle_watch (CsmPresence *presence)
- presence->priv->idle_watch_id = 0;
- }
-
-- if (! presence->priv->screensaver_active
-- && presence->priv->idle_enabled
-+ if (presence->priv->idle_enabled
- && presence->priv->idle_timeout > 0) {
- presence->priv->idle_watch_id = gnome_idle_monitor_add_idle_watch (presence->priv->idle_monitor,
- presence->priv->idle_timeout,
-- (GnomeIdleMonitorWatchFunc) on_idle_timeout,
-+ idle_became_idle_cb,
- presence,
- NULL);
- g_debug ("CsmPresence: adding idle watch (%i) for %d secs",
-@@ -229,11 +234,36 @@ on_screensaver_g_signal (GDBusProxy *proxy,
- g_variant_get (parameters,
- "(b)", &is_active);
-
-- g_debug ("screensaver status changed: %d", is_active);
-+ if (presence->priv->screensaver_active != is_active) {
-+ presence->priv->screensaver_active = is_active;
-+ set_session_idle (presence, is_active);
-+ }
-+}
-+
-+static void
-+screensaver_get_active_cb (GDBusProxy *screensaver_proxy,
-+ GAsyncResult *res,
-+ CsmPresence *presence)
-+{
-+ g_autoptr(GVariant) data = NULL;
-+ g_autoptr(GError) error = NULL;
-+ gboolean is_active;
-
-+ data = g_dbus_proxy_call_finish (screensaver_proxy, res, &error);
-+ if (!data) {
-+ if (error) {
-+ g_warning ("Could not retrieve current screensaver active state: %s",
-+ error->message);
-+ } else {
-+ g_warning ("Could not retrieve current screensaver active state!");
-+ }
-+
-+ return;
-+ }
-+
-+ g_variant_get (data, "(b)", &is_active);
- if (presence->priv->screensaver_active != is_active) {
- presence->priv->screensaver_active = is_active;
-- reset_idle_watch (presence);
- set_session_idle (presence, is_active);
- }
- }
-@@ -248,14 +278,25 @@ on_screensaver_name_owner_changed (GDBusProxy *proxy,
-
- presence = CSM_PRESENCE (user_data);
- name_owner = g_dbus_proxy_get_name_owner (proxy);
-+ if (name_owner == NULL) {
-+ g_debug ("Detected that screensaver has left the bus");
-
-- if (name_owner && g_strcmp0 (name_owner, CS_NAME)) {
-- g_warning ("Detected that screensaver has appeared on the bus");
-- } else {
-- g_warning ("Detected that screensaver has left the bus");
-+ presence->priv->screensaver_active = FALSE;
- set_session_idle (presence, FALSE);
-- reset_idle_watch (presence);
-+ } else {
-+ g_debug ("Detected that screensaver has aquired the bus");
-+
-+ g_dbus_proxy_call (presence->priv->screensaver_proxy,
-+ "GetActive",
-+ NULL,
-+ G_DBUS_CALL_FLAGS_NO_AUTO_START,
-+ 1000,
-+ NULL,
-+ (GAsyncReadyCallback) screensaver_get_active_cb,
-+ presence);
- }
-+
-+ g_free (name_owner);
- }
-
- static gboolean
-@@ -352,7 +393,8 @@ csm_presence_constructor (GType type,
- }
-
- presence->priv->screensaver_proxy = g_dbus_proxy_new_sync (presence->priv->connection,
-- G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-+ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START |
-+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
- NULL,
- CS_NAME,
- CS_PATH,
-@@ -424,12 +466,6 @@ csm_presence_set_property (GObject *object,
- self = CSM_PRESENCE (object);
-
- switch (prop_id) {
-- case PROP_STATUS:
-- csm_presence_set_status (self, g_value_get_uint (value));
-- break;
-- case PROP_STATUS_TEXT:
-- csm_presence_set_status_text (self, g_value_get_string (value), NULL);
-- break;
- case PROP_IDLE_ENABLED:
- csm_presence_set_idle_enabled (self, g_value_get_boolean (value));
- break;
-@@ -453,12 +489,6 @@ csm_presence_get_property (GObject *object,
- self = CSM_PRESENCE (object);
-
- switch (prop_id) {
-- case PROP_STATUS:
-- g_value_set_uint (value, self->priv->status);
-- break;
-- case PROP_STATUS_TEXT:
-- g_value_set_string (value, self->priv->status_text ? self->priv->status_text : "");
-- break;
- case PROP_IDLE_ENABLED:
- g_value_set_boolean (value, self->priv->idle_enabled);
- break;
-@@ -482,15 +512,9 @@ csm_presence_finalize (GObject *object)
- presence->priv->idle_watch_id = 0;
- }
-
-- if (presence->priv->status_text != NULL) {
-- g_free (presence->priv->status_text);
-- presence->priv->status_text = NULL;
-- }
--
-- if (presence->priv->idle_monitor != NULL) {
-- g_object_unref (presence->priv->idle_monitor);
-- presence->priv->idle_monitor = NULL;
-- }
-+ g_clear_pointer (&presence->priv->status_text, g_free);
-+ g_clear_object (&presence->priv->idle_monitor);
-+ g_clear_object (&presence->priv->screensaver_proxy);
-
- G_OBJECT_CLASS (csm_presence_parent_class)->finalize (object);
- }
-diff --git a/cinnamon-session/csm-presence.h b/cinnamon-session/csm-presence.h
-index 41de5aa..d2713ab 100644
---- a/cinnamon-session/csm-presence.h
-+++ b/cinnamon-session/csm-presence.h
-@@ -50,9 +50,6 @@ struct _CsmPresenceClass
-
- void (* status_changed) (CsmPresence *presence,
- guint status);
-- void (* status_text_changed) (CsmPresence *presence,
-- const char *status_text);
--
- };
-
- typedef enum {
-@@ -69,9 +66,6 @@ typedef enum
- } CsmPresenceError;
-
- #define CSM_PRESENCE_ERROR csm_presence_error_quark ()
--GType csm_presence_error_get_type (void);
--#define CSM_PRESENCE_TYPE_ERROR (csm_presence_error_get_type ())
--
- GQuark csm_presence_error_quark (void);
-
- GType csm_presence_get_type (void) G_GNUC_CONST;
---
-2.44.2
-
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
deleted file mode 100644
index cee6e14b8fe1..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-6.0.0-fix-optional-systemd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 44ac74ea7e771a35a41235b4e7d2539d4521b626 Mon Sep 17 00:00:00 2001
-From: Sparky Bluefang <sparky@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"
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-09-27 5:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-27 5:57 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/, gnome-extra/cinnamon-session/files/ Eli Schwartz
-- strict thread matches above, loose matches on Subject: below --
2018-07-31 8:38 Kristian Fiskerstrand
2017-11-29 20:05 Kristian Fiskerstrand
2015-11-15 22:30 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox