[arch-commits] Commit in lib32-dbus/trunk (PKGBUILD)

[Jan Steffens]

    Date: Saturday, May 18, 2019 @ 20:06:03
  Author: heftig
Revision: 467892

1.12.14-1

Modified:
  lib32-dbus/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-18 18:45:11 UTC (rev 467891)
+++ PKGBUILD	2019-05-18 20:06:03 UTC (rev 467892)
@@ -2,7 +2,7 @@
 
 pkgname=lib32-dbus
 _pkgbasename=dbus
-pkgver=1.12.12
+pkgver=1.12.14
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system (32-bit)"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
@@ -12,10 +12,12 @@
 conflicts=(lib32-libdbus)
 replaces=(lib32-libdbus)
 depends=(lib32-systemd dbus)
-makedepends=(gcc-multilib lib32-glib2 lib32-expat git autoconf-archive)
-_commit=d4f8423bbff9b3c5fca2d8009c28d1cff4652788  # tags/dbus-1.12.12^0
+makedepends=(lib32-glib2 lib32-expat git autoconf-archive)
+_commit=a330c6184fe9c7f67495f8d4563b11d51a6dccc7  # tags/dbus-1.12.14^0
 source=("git+https://gitlab.freedesktop.org/dbus/dbus.git#commit=$_commit")
 sha256sums=('SKIP')
+validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90'  # Simon McVittie <simon.mcvittie at collabora.co.uk>
+              '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie at collabora.co.uk>
 
 pkgver() {
   cd dbus
@@ -24,7 +26,6 @@
 
 prepare() {
   cd dbus
-  git cherry-pick -n 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -34,7 +35,6 @@
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd dbus
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -42,18 +42,18 @@
     --libdir=/usr/lib32 \
     --libexecdir=/usr/lib/dbus-1.0 \
     runstatedir=/run \
+    --with-console-auth-dir=/run/console/ \
     --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/ \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --enable-inotify \
+    --enable-systemd \
+    --enable-user-session \
     --disable-static \
     --disable-verbose-mode \
     --disable-asserts \
     --disable-checks \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --enable-systemd \
-    --enable-user-session \
     --without-x
   make
 }
@@ -63,7 +63,7 @@
 }
 
 package() {
-  make DESTDIR="$pkgdir" -C dbus install
+  DESTDIR="$pkgdir" make -C dbus install
 
   rm -r "$pkgdir"/usr/{bin,include,lib,share}
   rm -r "$pkgdir"/{etc,var}