Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=finit.git;a=commitdiff;h=86bf5e90b716fd47614178356460a4bd5433fa4c
commit 86bf5e90b716fd47614178356460a4bd5433fa4c Author: crazy <[email protected]> Date: Sun May 7 12:55:53 2017 +0200 accountsservice-0.6.45-2-x86_64 * hello elogind , bye systemd :-) diff --git a/source/apps/accountsservice/FrugalBuild b/source/apps/accountsservice/FrugalBuild index 9d46325..fdcf37a 100644 --- a/source/apps/accountsservice/FrugalBuild +++ b/source/apps/accountsservice/FrugalBuild @@ -3,29 +3,23 @@ pkgname=accountsservice pkgver=0.6.45 -pkgrel=1 +pkgrel=2 pkgdesc="D-Bus interfaces for querying and manipulating user account information" url="http://www.fedoraproject.org/wiki/Features/UserAccountDialog"; -depends=('polkit>=0.113-6' 'systemd>=231-13') -makedepends=('intltool>=0.51.0-2' 'gobject-introspection>=1.50.0' 'docbook-xsl>=1.79.1-1') +depends=('polkit>=0.113-6' 'libelogind' 'elogind' 'eudev') +makedepends=('intltool>=0.51.0-2' 'gtk-doc' 'gobject-introspection>=1.50.0' 'docbook-xsl>=1.79.1-1') options=('scriptlet' 'nostrip') groups=('apps') archs=("x86_64") up2date="Flasttar http://www.freedesktop.org/software/accountsservice/"; -source=(http://www.freedesktop.org/software/accountsservice/$pkgname-$pkgver.tar.xz fw-default-groups.patch) +source=(http://www.freedesktop.org/software/accountsservice/$pkgname-$pkgver.tar.xz \ + fw-default-groups.patch accountsservice-enable-elogind.patch) sha1sums=('e9d13e6970c52e168eb7d6dc8441a3abafed3dfa' \ - '13e844b735c219d11b49f129e5296931ced55d12') -Fconfopts+=" --with-systemdsystemunitdir=/lib/systemd/system \ - --disable-static \ + '13e844b735c219d11b49f129e5296931ced55d12' \ + 'e9a4a6e06abe5fb467c7c9c06af603c2acea4b9b') +Fconfopts+=" --disable-static \ --enable-user-heuristics \ --enable-admin-group=wheel" -_F_systemd_units=(accounts-daemon=e) -Finclude systemd - -build() -{ - Fbuild - Fgenscriptlet -} +_Fbuild_autoreconf=yes # optimization OK diff --git a/source/apps/accountsservice/accountsservice-enable-elogind.patch b/source/apps/accountsservice/accountsservice-enable-elogind.patch new file mode 100644 index 0000000..5c3a950 --- /dev/null +++ b/source/apps/accountsservice/accountsservice-enable-elogind.patch @@ -0,0 +1,82 @@ +--- a/configure.ac 2017-01-10 14:41:49.303134338 +0100 ++++ b/configure.ac 2017-01-10 14:49:17.627133630 +0100 +@@ -264,6 +264,49 @@ + dnl --------------------------------------------------------------------------- + AC_PATH_PROG([XSLTPROC], [xsltproc]) + ++# elogind ++ ++AC_ARG_ENABLE([elogind], ++ AS_HELP_STRING([--enable-elogind], [Use elogind]), ++ [enable_elogind=$enableval], ++ [enable_elogind=auto]) ++ ++if test "x$enable_elogind" != "xno"; then ++ PKG_CHECK_MODULES(ELOGIND, [libelogind >= 219], ++ [have_elogind=yes], ++ [have_elogind=no]) ++else ++ have_elogind=no ++fi ++ ++AC_MSG_CHECKING([whether to use elogind]) ++ ++if test "x$enable_elogind" = "xauto" ; then ++ if test "x$have_elogind" = "xno" ; then ++ enable_elogind=no ++ else ++ enable_elogind=yes ++ fi ++fi ++ ++AC_MSG_RESULT($enable_elogind) ++ ++if test "x$enable_elogind" = "xyes"; then ++ if test "x$have_elogind" = "xno"; then ++ AC_MSG_ERROR([elogind support explicitly required, but libelogind not found]) ++ fi ++fi ++AC_SUBST(ELOGIND_CFLAGS) ++AC_SUBST(ELOGIND_LIBS) ++ ++LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $ELOGIND_LIBS" ++LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $ELOGIND_CFLAGS" ++ ++if test "x$have_elogind" != "xno" ; then ++ AC_DEFINE(WITH_ELOGIND, 1, [Define to enable elogind support]) ++fi ++ ++ + # systemd + + AC_ARG_ENABLE([systemd], +@@ -272,8 +315,14 @@ + [enable_systemd=auto]) + + if test x$enable_systemd != xno; then ++ if test "x$have_elogind" != "xno"; then ++ AC_MSG_NOTICE([Systemd support requested, but elogind found]) ++ have_systemd=no ++ enable_systemd=no ++ else + PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= 186], + [have_systemd=yes], [have_systemd=no]) ++ fi + else + have_systemd=no + fi +--- a/src/libaccountsservice/act-user-manager.c 2016-11-08 09:11:28.489353842 +0100 ++++ b/src/libaccountsservice/act-user-manager.c 2016-11-08 09:18:47.768357775 +0100 +@@ -42,7 +42,12 @@ + #include <gio/gunixinputstream.h> + + #ifdef WITH_SYSTEMD + #include <systemd/sd-login.h> ++#else ++#ifdef WITH_ELOGIND ++#include <elogind/sd-login.h> ++#define WITH_SYSTEMD 1 /* Do not clutter the sources */ ++#endif /* check against elogind substitution + + /* check if logind is running */ + #define LOGIND_RUNNING() (access("/run/systemd/seats/", F_OK) >= 0) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
