upgpkg: pcr/accountsservice-elogind 0.6.46-1

2 files changed, 35 insertions, 119 deletions

diff --git a/pcr/accountsservice-elogind/PKGBUILD b/pcr/accountsservice-elogind/PKGBUILD
index 2e3e7cf91..bb703ccaf 100644
--- a/pcr/accountsservice-elogind/PKGBUILD
+++ b/pcr/accountsservice-elogind/PKGBUILD
@@ -1,55 +1,53 @@
-# Maintainer (Manjaro): artoo <artoo@manjaro.org>
-# Contributor (Manjaro): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor (Manjaro): Ionut Biru <ibiru@archlinux.org>
+# Maintainer: David P. <megver83@parabola.nu>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-_pkgname=accountsservice
-_commit=dac425433270c6dc38feba4d2513e4da7bd265fd  # tags/0.6.43^0
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=accountsservice-elogind
-pkgver=0.6.42+12+gdac4254
-pkgrel=2
+_pkgname=${pkgname/-elogind}
+pkgver=0.6.46
+pkgrel=1
 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')
+arch=(x86_64 i686 armv7h)
+license=(GPL3)
+depends=(glib2 polkit-elogind)
+makedepends=(intltool gtk-doc gobject-introspection git)
+provides=($_pkgname)
+conflicts=($_pkgname)
+_commit=27fbd25251c3dd59c4d8e999a902946feab73f5a  # tags/0.6.46^0
+source=("git+https://anongit.freedesktop.org/git/accountsservice#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
-    cd $_pkgname
-    git describe --tags | sed 's/-/+/g'
+  cd $_pkgname
+  git describe --tags | sed 's/-/+/g'
 }
 
 
 prepare() {
-    cd $_pkgname
-    patch -Np 1 -i ${srcdir}/accountsservice-enable-elogind.patch
-    NOCONFIGURE=1 ./autogen.sh
+  cd $_pkgname
+  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
+  cd $_pkgname
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib \
+    --disable-static \
+    --enable-gtk-doc \
+    --enable-elogind=yes \
+    --enable-systemd=no \
+    --with-systemdsystemunitdir=no
+  make
 }
 
 package() {
-    cd $_pkgname
-    make DESTDIR="$pkgdir" install
+  cd $_pkgname
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/accountsservice-elogind/accountsservice-enable-elogind.patch b/pcr/accountsservice-elogind/accountsservice-enable-elogind.patch
deleted file mode 100644
index 5c3a95072..000000000
--- a/pcr/accountsservice-elogind/accountsservice-enable-elogind.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- 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)