summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Fiskerstrand <k_f@gentoo.org>2017-11-29 21:02:28 +0100
committerKristian Fiskerstrand <k_f@gentoo.org>2017-11-29 21:02:41 +0100
commit065d1ab4d584231123ea69b4b67486ba1e6ce627 (patch)
treea1e12c44d27c938b54624aa7a024b3bb13ebdec6 /gnome-extra
parentapp-crypt/gpgme: fix tests (diff)
downloadgentoo-065d1ab4d584231123ea69b4b67486ba1e6ce627.tar.gz
gentoo-065d1ab4d584231123ea69b4b67486ba1e6ce627.tar.bz2
gentoo-065d1ab4d584231123ea69b4b67486ba1e6ce627.zip
gnome-extra/cinnamon-session: Readd systemd support
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild (renamed from gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r3.ebuild)1
-rw-r--r--gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch21
2 files changed, 22 insertions, 0 deletions
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
index 9e6f0e7cb09f..d5da4702700c 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 000000000000..a58703bc1bf3
--- /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)