[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/, gnome-extra/cinnamon-session/files/
commit: 9e4009499fe36ae4c8fd761b001bb678955cf936
Author: Kristian Fiskerstrand gentoo org>
AuthorDate: Wed Jul 4 10:33:52 2018 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Tue Jul 31 08:34:30 2018 +
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
gnome-extra/cinnamon-session/Manifest | 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(+)
diff --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 000..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 000..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
+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
new file mode 100644
index 000..935541cf2a5
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch
@@ -0,0
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/, gnome-extra/cinnamon-session/files/
commit: 065d1ab4d584231123ea69b4b67486ba1e6ce627
Author: Kristian Fiskerstrand gentoo org>
AuthorDate: Wed Nov 29 20:02:28 2017 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Wed Nov 29 20:02:41 2017 +
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 000..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)
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-session/, gnome-extra/cinnamon-session/files/
commit: 08ff1393a76e025019e8cf39e29b2572094eb5ac
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Nov 15 21:55:17 2015 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Nov 15 22:30:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ff1393
gnome-extra/cinnamon-session: Drop old
Package-Manager: portage-2.2.24
gnome-extra/cinnamon-session/Manifest | 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(-)
diff --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..000
--- 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..000
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
