| 1 |
commit: 43a3368c8a6e12755c024484726f1fc9ac57ac58 |
| 2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
| 3 |
AuthorDate: Thu Aug 16 11:49:16 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 18 09:51:20 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=43a3368c |
| 7 |
|
| 8 |
sys-apps/accountsservice: add missing patch |
| 9 |
|
| 10 |
sys-apps/accountsservice/Manifest | 2 +- |
| 11 |
.../files/accountsservice-0.6.43-elogind.patch | 110 +++++++++++++++++++++ |
| 12 |
2 files changed, 111 insertions(+), 1 deletion(-) |
| 13 |
|
| 14 |
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest |
| 15 |
index 98ff97f..1ed7b70 100644 |
| 16 |
--- a/sys-apps/accountsservice/Manifest |
| 17 |
+++ b/sys-apps/accountsservice/Manifest |
| 18 |
@@ -1 +1 @@ |
| 19 |
-DIST accountsservice-0.6.43.tar.xz 381008 SHA256 ed3ba94aa38ceb822a0e1a1ac71bf1a8123babf90be049397b3a00900e48d6cc SHA512 0673430b7e5fd726397a9358d60d5c34542afaa786b795d3c8b544dc2bdab151c74f9a3daa4bcd94dc7669400a78cd4cddc453cad78ee8e431bf7c1f417138e2 WHIRLPOOL e704d9dcb5b7c0c6ee7c1ab5ed310ab2428e94d061663367f213c5903f68768680492d651524ef1e7594417335de529463d63b8d8a4d1cc8b6445358f1b97a33 |
| 20 |
+DIST accountsservice-0.6.43.tar.xz 381008 BLAKE2B 62b29bbb04eef0503c29cb9d81056776f7cb3840145231f049f8b335dfc11bfd60f2ec717e3543b0af73c597da2e4c2d4139c0c535b1716923695355f06e7e4e SHA512 0673430b7e5fd726397a9358d60d5c34542afaa786b795d3c8b544dc2bdab151c74f9a3daa4bcd94dc7669400a78cd4cddc453cad78ee8e431bf7c1f417138e2 |
| 21 |
|
| 22 |
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.43-elogind.patch b/sys-apps/accountsservice/files/accountsservice-0.6.43-elogind.patch |
| 23 |
new file mode 100644 |
| 24 |
index 0000000..cd3510e |
| 25 |
--- /dev/null |
| 26 |
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.43-elogind.patch |
| 27 |
@@ -0,0 +1,110 @@ |
| 28 |
+From 9fdd1d95ec094a0df6d8d3dd9c8f04fa8499b845 Mon Sep 17 00:00:00 2001 |
| 29 |
+From: Sven Eden <sven.eden@×××.de> |
| 30 |
+Date: Tue, 6 Jun 2017 10:17:33 -0400 |
| 31 |
+Subject: configure: elogind on non-systemd systems |
| 32 |
+ |
| 33 |
+This commit adds some configure goo to make accountsservice use |
| 34 |
+elogind if explicitly requested for systems that don't have |
| 35 |
+systemd. |
| 36 |
+ |
| 37 |
+diff --git a/configure.ac b/configure.ac |
| 38 |
+index b255e72..4b21477 100644 |
| 39 |
+--- a/configure.ac |
| 40 |
++++ b/configure.ac |
| 41 |
+@@ -264,22 +264,24 @@ dnl Check for xsltproc |
| 42 |
+ dnl --------------------------------------------------------------------------- |
| 43 |
+ AC_PATH_PROG([XSLTPROC], [xsltproc]) |
| 44 |
+ |
| 45 |
+-# systemd |
| 46 |
++# systemd or elogind |
| 47 |
++ |
| 48 |
++have_systemd=no |
| 49 |
++ |
| 50 |
++AC_MSG_CHECKING([whether to use systemd]) |
| 51 |
+ |
| 52 |
+ AC_ARG_ENABLE([systemd], |
| 53 |
+ AS_HELP_STRING([--enable-systemd], [Use systemd]), |
| 54 |
+ [enable_systemd=$enableval], |
| 55 |
+ [enable_systemd=auto]) |
| 56 |
+ |
| 57 |
++AC_MSG_RESULT($enable_systemd) |
| 58 |
++ |
| 59 |
+ if test x$enable_systemd != xno; then |
| 60 |
+- PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= 186], |
| 61 |
+- [have_systemd=yes], [have_systemd=no]) |
| 62 |
+-else |
| 63 |
+- have_systemd=no |
| 64 |
++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= 186], |
| 65 |
++ [have_systemd=yes]) |
| 66 |
+ fi |
| 67 |
+ |
| 68 |
+-AC_MSG_CHECKING([whether to use systemd]) |
| 69 |
+- |
| 70 |
+ if test x$enable_systemd = xauto ; then |
| 71 |
+ if test x$have_systemd = xno ; then |
| 72 |
+ enable_systemd=no |
| 73 |
+@@ -288,21 +290,54 @@ if test x$enable_systemd = xauto ; then |
| 74 |
+ fi |
| 75 |
+ fi |
| 76 |
+ |
| 77 |
+-AC_MSG_RESULT($enable_systemd) |
| 78 |
++have_elogind=no |
| 79 |
++ |
| 80 |
++AC_MSG_CHECKING([whether to use elogind]) |
| 81 |
++ |
| 82 |
++AC_ARG_ENABLE([elogind], |
| 83 |
++ AS_HELP_STRING([--enable-elogind], [Use elogind]), |
| 84 |
++ [enable_elogind=$enableval], |
| 85 |
++ [enable_elogind=no]) |
| 86 |
++ |
| 87 |
++AC_MSG_RESULT($enable_elogind) |
| 88 |
+ |
| 89 |
+ if test x$enable_systemd = xyes; then |
| 90 |
+ if test x$have_systemd = xno; then |
| 91 |
+- AC_MSG_ERROR([Systemd support explicitly required, but systemd not found]) |
| 92 |
++ AC_MSG_ERROR([Systemd support explicitly requested, but libsystemd not found]) |
| 93 |
++ fi |
| 94 |
++ |
| 95 |
++ dnl Requesting to use the elogind session tracker makes no sense where |
| 96 |
++ dnl systemd-login is (or might be) running. |
| 97 |
++ if test x$enable_elogind = xyes; then |
| 98 |
++ AC_MSG_WARN([elogind support requested, but systemd was found.]) |
| 99 |
++ AC_MSG_ERROR([Disable either elogind or systemd support.]) |
| 100 |
+ fi |
| 101 |
++ |
| 102 |
++ AC_SUBST(SYSTEMD_CFLAGS) |
| 103 |
++ AC_SUBST(SYSTEMD_LIBS) |
| 104 |
++ |
| 105 |
++ LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $SYSTEMD_LIBS" |
| 106 |
++ LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $SYSTEMD_CFLAGS" |
| 107 |
++ |
| 108 |
+ AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used]) |
| 109 |
+ fi |
| 110 |
+-AC_SUBST(SYSTEMD_CFLAGS) |
| 111 |
+-AC_SUBST(SYSTEMD_LIBS) |
| 112 |
+ |
| 113 |
+-LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $SYSTEMD_LIBS" |
| 114 |
+-LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $SYSTEMD_CFLAGS" |
| 115 |
++if test "x$enable_elogind" != "xno"; then |
| 116 |
++ PKG_CHECK_MODULES(ELOGIND, [libelogind >= 229.4], |
| 117 |
++ [have_elogind=yes]) |
| 118 |
++ |
| 119 |
++ if test "x$have_elogind" != "xyes"; then |
| 120 |
++ AC_MSG_ERROR([elogind support requested, but libelogind not found]) |
| 121 |
++ else |
| 122 |
++ AC_SUBST(ELOGIND_CFLAGS) |
| 123 |
++ AC_SUBST(ELOGIND_LIBS) |
| 124 |
++ |
| 125 |
++ LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $ELOGIND_LIBS" |
| 126 |
++ LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $ELOGIND_CFLAGS" |
| 127 |
++ fi |
| 128 |
++fi |
| 129 |
+ |
| 130 |
+-if test "x$have_systemd" != "xno" ; then |
| 131 |
++if test "x${have_systemd}" != "xno" -o "x${have_elogind}" != "xno" ; then |
| 132 |
+ AC_DEFINE(WITH_SYSTEMD, 1, [Define to enable systemd support]) |
| 133 |
+ fi |
| 134 |
+ |
| 135 |
+-- |
| 136 |
+cgit v0.10.2 |
| 137 |
+ |
Archives