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 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 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 <k...@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 <k...@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 +
