[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/files/, gnome-extra/cinnamon-session/
commit: ab514e24304511958d218eae535b072df8c8dc31
Author: Matthew S. Turnbull bluefang-logic com>
AuthorDate: Fri Dec 29 16:12:43 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Feb 15 13:29:47 2024 +
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 bluefang-logic.com>
Signed-off-by: Joonas Niilola 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
8a88834a639c74b227f0d666fa2bcb4c3f73859ff8de84a440e84af3f3343c41c47a896ccf0dc09cc7114b7c921e2f670aec7846c57ec92b8dabe7955309
+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 ..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 ..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
+Date: Tue, 2 Jan 2024 23:26:20 -0500
+Subject: [PATCH] Remove orphaned include
+
+---
+
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/files/, gnome-extra/cinnamon-session/
commit: 8dc9c7eb1db8915d81696b1413c9a085c47ba1ae
Author: Matthew S. Turnbull bluefang-logic com>
AuthorDate: Thu Dec 24 06:49:22 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 27 05:06:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc9c7eb
gnome-extra/cinnamon-session: Remove old
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull bluefang-logic.com>
Signed-off-by: Sam James gentoo.org>
gnome-extra/cinnamon-session/Manifest | 1 -
.../cinnamon-session/cinnamon-session-4.4.1.ebuild | 72 --
.../files/cinnamon-session-3.8.0-elogind.patch | 26
.../files/cinnamon-session-3.8.0-elogind2.patch| 25
gnome-extra/cinnamon-session/metadata.xml | 3 -
5 files changed, 127 deletions(-)
diff --git a/gnome-extra/cinnamon-session/Manifest
b/gnome-extra/cinnamon-session/Manifest
index ea833a17fd9..a153e88654f 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-session-4.4.1.tar.gz 198819 BLAKE2B
bd39b5a89011942239beb76976b01234eaf839e80f1f54d26e1ee988797596d876d2708bee91d4c016a584d76fd9ba1209b4f8e77da8e9db8d7a8b4e5a43dac1
SHA512
f5caf7a3797ca30c397433ea052b7736308a31da291442f64224f034a6bd50eb45307cc8987efe5148eb816c2c70c3033795290386c93f205684796d03b63c22
DIST cinnamon-session-4.6.2.tar.gz 199292 BLAKE2B
f4a2a7dc438846c6013b539a027cbc13359a3cb47ed01c6acb97daf4a28fc26da3754d4264aaa90e8f10504bb7415a82dcc509430825cfd3e50e3beac7c78616
SHA512
c4b9d21145a82ecd0c9645899bb76acff632c7cc7ce4c5cc162ef38b91c772a29c66ab1645a6e35f92dd121cea0bd6748cf86275bc95a2a6d045fdbb4aea7d24
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild
b/gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild
deleted file mode 100644
index 01a4029bbcb..000
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson gnome2-utils xdg
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/;
-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 elogind ipv6 systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-COMMON_DEPEND="
- >=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]
- >=x11-libs/xapps-1.0.4
- virtual/opengl
- systemd? ( >=sys-apps/systemd-183 )
- elogind? ( sys-auth/elogind[policykit] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- >=gnome-extra/cinnamon-desktop-4.4
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- doc? (
- app-text/xmlto
- dev-libs/libxslt )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.8.0-elogind.patch
- "${FILESDIR}"/${PN}-3.8.0-elogind2.patch
-)
-
-src_configure() {
- local emesonargs=(
- -Dgconf=false
- $(meson_use doc docbook)
- $(meson_use ipv6)
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
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
deleted file mode 100644
index 7ae0fba5697..000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e9857299d098d6e62d866fa738cf53197e45c8e3 Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand
-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
- #include
---
-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
deleted file mode 100644
index 935541cf2a5..000
---
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/files/, gnome-extra/cinnamon-session/
commit: 26d27c85d1785e9f61c6c2b1f7748a146f6e63e4
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon Apr 20 20:45:42 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Apr 20 20:45:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d27c85
gnome-extra/cinnamon-session: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
gnome-extra/cinnamon-session/Manifest | 2 -
.../cinnamon-session-3.6.1-r5.ebuild | 70 --
.../cinnamon-session-3.8.0-r1.ebuild | 69 -
.../files/cinnamon-session-3.0.1-automagic.patch | 38
.../files/cinnamon-session-3.6.1-elogind.patch | 65
.../files/cinnamon-session-3.6.1-elogind2.patch| 21 ---
6 files changed, 265 deletions(-)
diff --git a/gnome-extra/cinnamon-session/Manifest
b/gnome-extra/cinnamon-session/Manifest
index e1f2ff789dd..2740a99a163 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,3 +1 @@
-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
DIST cinnamon-session-4.0.0.tar.gz 198396 BLAKE2B
713573d445f09cfa4707c3ccaff04bdcc95ea7b60568fc136359258022af287df66992444da462f0488dc4049036deb190523695e519eb61329e922e05871c39
SHA512
7e91bef4e294175faa96d0cb9d06db36c9b5a86d6e52734447ea62d411535760fc46713961a46299ebeb3767a0abd4768279e9f6c176ae882de9b7aedc5e
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild
b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild
deleted file mode 100644
index 9dc721e9e17..000
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html;
-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 elogind ipv6 systemd"
-REQUIRED_USE="^^ ( elogind 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 )
- elogind? ( sys-power/upower
- sys-auth/polkit[elogind] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- >=gnome-extra/cinnamon-desktop-2.6[systemd=]
- elogind? ( 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() {
- # 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
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-gconf \
- --disable-static \
- --enable-logind \
- $(use_enable doc docbook-docs) \
- $(use_enable ipv6)
-}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild
b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild
deleted file mode 100644
index 54fe4a32199..000
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit meson eutils gnome2
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html;
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz ->
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/files/, gnome-extra/cinnamon-session/
commit: 75ab1fb45764be12830e656d21b496502a72605b
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat May 26 11:20:22 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat May 26 11:31:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ab1fb4
gnome-extra/cinnamon-session: remove old
Package-Manager: Portage-2.3.28, Repoman-2.3.9
gnome-extra/cinnamon-session/Manifest | 6 --
.../cinnamon-session/cinnamon-session-2.8.2.ebuild | 71 --
.../cinnamon-session/cinnamon-session-2.8.3.ebuild | 65
.../cinnamon-session/cinnamon-session-3.0.1.ebuild | 65
.../cinnamon-session/cinnamon-session-3.2.0.ebuild | 65
.../cinnamon-session/cinnamon-session-3.4.1.ebuild | 65
.../cinnamon-session/cinnamon-session-3.4.2.ebuild | 65
.../files/cinnamon-session-2.6.2-automagic.patch | 50 ---
8 files changed, 452 deletions(-)
diff --git a/gnome-extra/cinnamon-session/Manifest
b/gnome-extra/cinnamon-session/Manifest
index 436125903f4..2a502be9118 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,7 +1 @@
-DIST cinnamon-session-2.8.2.tar.gz 591438 BLAKE2B
9ae14f696bd0d02ecf6f7653d263ffee1052c2d1963f65fa780e7aa592413471ecb47710d20594aed4b5d15c99b8639957a337834d126e2c07bba79618a6f210
SHA512
4f713cc5d9ec21bb118a2761792b1a86b43c386e0042f3f1c57ab6fa01fb7fd34463d83e63c794950dfe8358e757277a87d649340cda33f72fe4c89c7cf099bc
-DIST cinnamon-session-2.8.3.tar.gz 591500 BLAKE2B
afa29ced03908701135e3621c93e5c117f7d52c6f8cd952d82dd58de4c8a4e53b10eba267f0e64536ea19edda48102688f8759e0d41c16efac0789de36e85233
SHA512
a581af6a00a5273ab4cf7b91ac4770b78d8ab670cf238c396e2087113795de059b4eaa3abcc8440b5eaa5cf0c4edc9696b183f9ce81803af36b9a3a37b5d5977
-DIST cinnamon-session-3.0.1.tar.gz 592265 BLAKE2B
e011806ddcf39b55c76c4b3db5de8d9813d9b9faa7538f11e5d33b611faf4f81324db7547afb28dfffbf319316d88d3b89f3ce423022dfc3b66724f44b37b741
SHA512
cdbf9f910954976854aa1b90033781269dc9d521b86edd3e97ae936b59a9ac4ffa956ba37a51ba11beac73e38a732913ce147557e999484bd68529677eed21e8
-DIST cinnamon-session-3.2.0.tar.gz 595530 BLAKE2B
44d7c77c9fec0c6d58dfd574542bc7cf6ca97ce82e0306c0d5374f9b75e1e3ca73389bf47ed83519956e9da341dae0805739362e6e4499e7d1e6f5e1e383fd36
SHA512
00475069849c7bb1d874c65200128128068e6500475c61053f07deabacb98046bf344ab5d3b4537487c48103dd6c6a8316d1326396e606a0d44bc486db9267d6
-DIST cinnamon-session-3.4.1.tar.gz 595567 BLAKE2B
f47818e9c28610a0da444f7fd15f69d45a165ce5a9346702483b9f4b090dd387688331356611e9179585ad3ce77bfa55fdad0b63a470f9c0cbd96d57fe0de5fa
SHA512
caac3b445e2dca8e040bdb215e8aca833cbcdb77611e435aab5ebcd4b0f9b6bddb117d97763d26e99d42bbacb7ec51171e6927d87dbdd7d6ed0f5287648dee0e
-DIST cinnamon-session-3.4.2.tar.gz 595721 BLAKE2B
7f50d208d6928144a6b47153fd21f4a90875eec8b37fac5b4efb3d7a70a8806561710a10568a2f597ff5f471e8a4d2deb6ce9e233d8c6a0616c966a7c74ca654
SHA512
4a2f49f1717418a7d87df5f46e47c9d3a95bc4484aad6760e5391289100ebec734a300fd2540fd4ff0385a5169c15c01c081a002cc842d9d57d817d15dd6963d
DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B
5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4
SHA512
a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
deleted file mode 100644
index 7fabffaee06..000
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/files/, gnome-extra/cinnamon-session/
commit: acf9a86375dd07521bf6c8f706c7c9534f37a9a5
Author: Kristian Fiskerstrand gentoo org>
AuthorDate: Mon Nov 27 21:22:08 2017 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Mon Nov 27 21:22:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf9a863
gnome-extra/cinnamon-session: Add elogind
Package-Manager: Portage-2.3.13, Repoman-2.3.3
.../cinnamon-session-3.6.1-r1.ebuild | 66 ++
.../files/cinnamon-session-3.6.1-elogind.patch | 65 +
2 files changed, 131 insertions(+)
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r1.ebuild
b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r1.ebuild
new file mode 100644
index 000..14a94279c74
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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/elogind )
+"
+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
+ eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
+ eapply "${FILESDIR}/${PN}-3.6.1-elogind.patch"
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-gconf \
+ --disable-static \
+ --enable-logind \
+ $(use_enable doc docbook-docs) \
+ $(use_enable ipv6)
+}
diff --git
a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
new file mode 100644
index 000..b35ce9e55bf
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
@@ -0,0 +1,65 @@
+diff --git a/cinnamon-session/Makefile.am b/cinnamon-session/Makefile.am
+index 789d47d..d8093d4 100644
+--- a/cinnamon-session/Makefile.am
b/cinnamon-session/Makefile.am
+@@ -71,6 +71,7 @@ cinnamon_session_CPPFLAGS = \
+ $(XEXT_CFLAGS) \
+ $(GCONF_CFLAGS) \
+ $(LOGIND_CFLAGS)\
++ $(ELOGIND_CFLAGS) \
+ -I$(top_srcdir)/egg \
+ -DLOCALE_DIR=\""$(datadir)/locale"\"\
+ -DDATA_DIR=\""$(datadir)/cinnamon-session"\" \
+@@ -91,6 +92,7 @@ cinnamon_session_LDADD = \
+ $(UPOWER_LIBS) \
+ $(GCONF_LIBS) \
+ $(LOGIND_LIBS) \
++ $(ELOGIND_LIBS) \
+ $(EXECINFO_LIBS)
+
+ libcsmutil_la_SOURCES = \
+diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c
+index cef991c..dc2aa2e 100644
+--- a/cinnamon-session/csm-systemd.c
b/cinnamon-session/csm-systemd.c
+@@ -32,7 +32,11 @@
+ #include
+ #include
+
++#ifdef HAVE_ELOGIND
++#include
++#else
+ #include
++#endif
+
+ #include
+ #include
+diff --git a/configure.ac b/configure.ac
+index 38db5a3..8dafc6a 100644
+--- a/configure.ac
b/configure.ac
+@@ -113,15 +113,23 @@ AC_ARG_ENABLE([logind],
+
+ have_logind=no
+ if test x$enable_logind != xno ; then
+- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183],
[have_logind=yes], [have_logind=no])
++ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes],
[have_logind=no])
+ fi
+
+ if test x$have_logind = xyes; then
+ AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
+ fi
+
++have_elogind=no
++PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes],
[have_elogind=no])
++if test x$have_elogind = xyes; then
++
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/files/, gnome-extra/cinnamon-session/
commit: 86145eec87a70dab411262a0de691a0100a3d2ff
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Jun 25 15:38:03 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Jun 25 16:26:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86145eec
gnome-extra/cinnamon-session: Version bump
Package-Manager: portage-2.3.0_rc1
gnome-extra/cinnamon-session/Manifest | 1 +
.../cinnamon-session/cinnamon-session-3.0.1.ebuild | 66 ++
.../files/cinnamon-session-3.0.1-automagic.patch | 38 +
3 files changed, 105 insertions(+)
diff --git a/gnome-extra/cinnamon-session/Manifest
b/gnome-extra/cinnamon-session/Manifest
index d50a561..cd45b12 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,2 +1,3 @@
DIST cinnamon-session-2.8.2.tar.gz 591438 SHA256
0a7236c75fef67c1a1c173e184c083ff2879e870428bdc3cb53a892cb0bfaf79 SHA512
4f713cc5d9ec21bb118a2761792b1a86b43c386e0042f3f1c57ab6fa01fb7fd34463d83e63c794950dfe8358e757277a87d649340cda33f72fe4c89c7cf099bc
WHIRLPOOL
6f202a79a27cdf6a8bbe1ed62d5b4a6c6edd5746b8b50a448fc8874cb5de4b45c4201e1bce25760072ee2874438e87505405810b45c7e10019fdbfc4c7cc9b6b
DIST cinnamon-session-2.8.3.tar.gz 591500 SHA256
306eb9448500b15b0d06826b66f438d767d001b706fd345c53b4a91d308ae4a9 SHA512
a581af6a00a5273ab4cf7b91ac4770b78d8ab670cf238c396e2087113795de059b4eaa3abcc8440b5eaa5cf0c4edc9696b183f9ce81803af36b9a3a37b5d5977
WHIRLPOOL
d3c9d0f6791522c2c24801faacb0a5be34d658cceeaed2459d5f006c24e683d1ea39876045c505dd526ec972912e6c8bde8fffe703da6fa0f69a43f2e579ab61
+DIST cinnamon-session-3.0.1.tar.gz 592265 SHA256
d8935747bc8aa70518e70a7d338eaf9109b5307d8a44d49dc57e0f15d69e9c89 SHA512
cdbf9f910954976854aa1b90033781269dc9d521b86edd3e97ae936b59a9ac4ffa956ba37a51ba11beac73e38a732913ce147557e999484bd68529677eed21e8
WHIRLPOOL
9af4cf92685e6a07220779ed8ef73c7435dff08e3771bbc87994d5294f998129b0d114a3092987b8fc59b49f936616d135ca59327d9979c70d9aec55238a0332
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild
b/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild
new file mode 100644
index 000..9d709f3
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+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
+ eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ 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-3.0.1-automagic.patch
b/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch
new file mode 100644
index 000..9ca3137
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch
@@ -0,0 +1,38 @@
+--- a/configure.ac~2016-05-20 13:03:13.0 +0200
b/configure.ac 2016-06-25 17:36:55.389583194 +0200
+@@ -56,7 +56,15 @@
+
+ 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])
++
