dbus-elogind-1.10.22-1: updating version

2 files changed, 49 insertions, 44 deletions

diff --git a/pcr/dbus-elogind/PKGBUILD b/pcr/dbus-elogind/PKGBUILD
index fc98faf57..9055267d1 100644
--- a/pcr/dbus-elogind/PKGBUILD
+++ b/pcr/dbus-elogind/PKGBUILD
@@ -1,15 +1,13 @@
-# Maintainer (Manjaro): artoo <artoo@manjaro.org>
-# Contributor (Manjaro): Jan de Groot <jgc@archlinux.org>
-# Contributor (Manjaro): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor (Manjaro): Tom Gundersen <teg@jklm.no>
-# Contributor (Manjaro): Link Dupont <link@subpop.net>
+# Maintainer (Artix): artoo <artoo@manjaro.org>
+# Contributor (Arch): Jan de Groot <jgc@archlinux.org>
+# Contributor (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor (Arch): Tom Gundersen <teg@jklm.no>
+# Contributor (Arch): Link Dupont <link@subpop.net>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 _pkgname=dbus
-_commit=73961ee58cf47315b14e30fbde6d0eea825c987b  # tags/dbus-1.10.18^0
-
 pkgname=dbus-elogind
-pkgver=1.10.18
+pkgver=1.10.22
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
@@ -17,61 +15,67 @@ arch=(i686 x86_64 armv7h)
 license=(GPL custom)
 provides=('libdbus' "dbus=$pkgver" "dbus-x11=$pkgver")
 conflicts=('libdbus' 'dbus' 'dbus-x11')
-depends=('expat' 'libx11' 'libelogind')
-makedepends=('xmlto' 'docbook-xsl' 'python' 'yelp-tools' 'doxygen' 'git')
+depends=('libx11' 'expat' 'libelogind')
+makedepends=('eudev' 'xmlto' 'docbook-xsl' 'python' 'yelp-tools' 'doxygen' 'git')
 optdepends=('dbus-openrc: dbus initscript')
+_commit=2f8f4d619b16b134671521c2b4aea3a94fb47848  # tags/dbus-1.10.22^0
 source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit"
+        'dbus.sysusers'
         'dbus-enable-elogind.patch')
 sha256sums=('SKIP'
-            'faffcaa5b295f49fcedeed2c9ece5298949096be3062fd99a4bf1a6ac3ad1ea0')
+           '1ce179ba3a92ad34941d8ac7f53d01d42cbc91d43ada1136492b78c10b5d693d'
+           'faffcaa5b295f49fcedeed2c9ece5298949096be3062fd99a4bf1a6ac3ad1ea0')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90'  # Simon McVittie <simon.mcvittie@collabora.co.uk>
               '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie@collabora.co.uk>
 
 prepare() {
-    cd $_pkgname
-    git cherry-pick -n 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42
-    patch -Np 1 -i ${srcdir}/dbus-enable-elogind.patch
-    NOCONFIGURE=1 ./autogen.sh
+  cd $_pkgname
+  git cherry-pick -n 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42
+  patch -Np 1 -i ${srcdir}/dbus-enable-elogind.patch
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-    cd $_pkgname
-    ./configure \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --libexecdir=/usr/lib/dbus-1.0 \
-        --with-dbus-user=dbus \
-        --with-system-pid-file=/run/dbus/pid \
-        --with-system-socket=/run/dbus/system_bus_socket \
-        --with-console-auth-dir=/run/console/ \
-        --enable-inotify \
-        --enable-elogind \
-        --disable-static \
-        --disable-verbose-mode \
-        --disable-asserts \
-        --without-systemdsystemunitdir \
-        --disable-systemd \
-        --disable-user-session \
-        --enable-x11-autolaunch
-
-    make
+  cd $_pkgname
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/dbus-1.0 \
+    --with-dbus-user=dbus \
+    --with-system-pid-file=/run/dbus/pid \
+    --with-system-socket=/run/dbus/system_bus_socket \
+    --with-console-auth-dir=/run/console/ \
+    --enable-inotify \
+    --enable-elogind \
+    --disable-static \
+    --disable-verbose-mode \
+    --disable-asserts \
+    --enable-x11-autolaunch \
+    --enable-elogind \
+    --without-systemdsystemunitdir \
+    --disable-systemd \
+    --disable-user-session
+  make
 }
 
 check() {
-    cd $_pkgname
-    make check
+  cd $_pkgname
+  make check
 }
 
 package() {
-    cd $_pkgname
+  cd $_pkgname
+
+  make DESTDIR="$pkgdir" install
 
-    make DESTDIR="$pkgdir" install
+  rm -r "$pkgdir/var/run"
 
-    rm -r "$pkgdir/var/run"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING"
 
-    install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING"
+  # sysusers
+  install -Dm644 "$srcdir/dbus.sysusers" "$pkgdir/usr/lib/sysusers.d/dbus.conf"
 
-    # Remove docs
-    rm -r "$pkgdir/usr/share/doc"
+  # Remove docs
+  rm -r "$pkgdir/usr/share/doc"
 }
diff --git a/pcr/dbus-elogind/dbus.sysusers b/pcr/dbus-elogind/dbus.sysusers
new file mode 100644
index 000000000..6e8dcec11
--- /dev/null
+++ b/pcr/dbus-elogind/dbus.sysusers
@@ -0,0 +1 @@
+u dbus 81