gnome-extra/cinnamon-session: Readd systemd support

Package-Manager: Portage-2.3.13, Repoman-2.3.3
johu · Nov 29, 2017 · 065d1ab · 065d1ab
1 parent d59e4c9
commit 065d1ab
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/...-session/cinnamon-session-3.6.1-r3.ebuild → ...-session/cinnamon-session-3.6.1-r4.ebuild b/...-session/cinnamon-session-3.6.1-r3.ebuild → ...-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
@@ -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)