From 378b238c202e8034ae80e7335b537e8806ce6891 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 17 Mar 2017 09:51:25 -0500 Subject: accountsservice-elogind: add new package to [pcr] --- pcr/accountsservice-elogind/PKGBUILD | 55 +++++++++++++++ .../accountsservice-enable-elogind.patch | 82 ++++++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 pcr/accountsservice-elogind/PKGBUILD create mode 100644 pcr/accountsservice-elogind/accountsservice-enable-elogind.patch (limited to 'pcr/accountsservice-elogind') diff --git a/pcr/accountsservice-elogind/PKGBUILD b/pcr/accountsservice-elogind/PKGBUILD new file mode 100644 index 000000000..2e3e7cf91 --- /dev/null +++ b/pcr/accountsservice-elogind/PKGBUILD @@ -0,0 +1,55 @@ +# Maintainer (Manjaro): artoo +# Contributor (Manjaro): Jan Alexander Steffens (heftig) +# Contributor (Manjaro): Ionut Biru +# Maintainer: Omar Vega Ramos + +_pkgname=accountsservice +_commit=dac425433270c6dc38feba4d2513e4da7bd265fd # tags/0.6.43^0 + +pkgname=accountsservice-elogind +pkgver=0.6.42+12+gdac4254 +pkgrel=2 +pkgdesc="D-Bus interface for user account query and manipulation" +url="https://www.freedesktop.org/software/accountsservice/" +arch=('i686' 'x86_64' 'armv7h') +license=('GPL3') +provides=('accountsservice') +conflicts=('accountsservice') +depends=('glib2' 'elogind' 'polkit-elogind') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'git') +source=("git://anongit.freedesktop.org/accountsservice#commit=$_commit" + 'accountsservice-enable-elogind.patch') +sha256sums=('SKIP' + 'dc233c540cf3e129479aa0c5e408a706a8c8cd52fdb94ad50aba32f8e9f765e1') + +pkgver() { + cd $_pkgname + git describe --tags | sed 's/-/+/g' +} + + +prepare() { + cd $_pkgname + patch -Np 1 -i ${srcdir}/accountsservice-enable-elogind.patch + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd $_pkgname + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/$_pkgname \ + --disable-static \ + --enable-elogind \ + --enable-admin-group="wheel" \ + --disable-systemd \ + --enable-gtk-doc + make +} + +package() { + cd $_pkgname + make DESTDIR="$pkgdir" install +} diff --git a/pcr/accountsservice-elogind/accountsservice-enable-elogind.patch b/pcr/accountsservice-elogind/accountsservice-enable-elogind.patch new file mode 100644 index 000000000..5c3a95072 --- /dev/null +++ b/pcr/accountsservice-elogind/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 + + #ifdef WITH_SYSTEMD + #include ++#else ++#ifdef WITH_ELOGIND ++#include ++#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) -- cgit v1.2.2