| 1 |
commit: 065d1ab4d584231123ea69b4b67486ba1e6ce627 |
| 2 |
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 29 20:02:28 2017 +0000 |
| 4 |
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 29 20:02:41 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=065d1ab4 |
| 7 |
|
| 8 |
gnome-extra/cinnamon-session: Readd systemd support |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 11 |
|
| 12 |
...1-r3.ebuild => cinnamon-session-3.6.1-r4.ebuild} | 1 + |
| 13 |
.../files/cinnamon-session-3.6.1-elogind2.patch | 21 +++++++++++++++++++++ |
| 14 |
2 files changed, 22 insertions(+) |
| 15 |
|
| 16 |
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 |
| 17 |
similarity index 96% |
| 18 |
rename from gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r3.ebuild |
| 19 |
rename to gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild |
| 20 |
index 9e6f0e7cb09..d5da4702700 100644 |
| 21 |
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r3.ebuild |
| 22 |
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild |
| 23 |
@@ -53,6 +53,7 @@ src_prepare() { |
| 24 |
# make upower and logind check non-automagic |
| 25 |
eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch" |
| 26 |
eapply "${FILESDIR}/${PN}-3.6.1-elogind.patch" |
| 27 |
+ eapply "${FILESDIR}/${PN}-3.6.1-elogind2.patch" |
| 28 |
|
| 29 |
eautoreconf |
| 30 |
gnome2_src_prepare |
| 31 |
|
| 32 |
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 |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..a58703bc1bf |
| 35 |
--- /dev/null |
| 36 |
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch |
| 37 |
@@ -0,0 +1,21 @@ |
| 38 |
+diff --git a/configure.ac b/configure.ac |
| 39 |
+index c46b35f..5bde44a 100644 |
| 40 |
+--- a/configure.ac |
| 41 |
++++ b/configure.ac |
| 42 |
+@@ -113,7 +113,7 @@ AC_ARG_ENABLE([logind], |
| 43 |
+ |
| 44 |
+ have_logind=no |
| 45 |
+ if test x$enable_logind != xno ; then |
| 46 |
+- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no]) |
| 47 |
++ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no]) |
| 48 |
+ fi |
| 49 |
+ |
| 50 |
+ if test x$have_logind = xyes; then |
| 51 |
+@@ -124,6 +124,7 @@ have_elogind=no |
| 52 |
+ PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no]) |
| 53 |
+ if test x$have_elogind = xyes; then |
| 54 |
+ AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported]) |
| 55 |
++ AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported]) |
| 56 |
+ fi |
| 57 |
+ |
| 58 |
+ AC_SUBST(LOGIND_CFLAGS) |
Archives