diff options
| -rw-r--r-- | nonsystemd-multilib/lib32-dbus/PKGBUILD | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/nonsystemd-multilib/lib32-dbus/PKGBUILD b/nonsystemd-multilib/lib32-dbus/PKGBUILD index 151aa37b4..289c16fa3 100644 --- a/nonsystemd-multilib/lib32-dbus/PKGBUILD +++ b/nonsystemd-multilib/lib32-dbus/PKGBUILD @@ -1,10 +1,9 @@ -# $Id$ -# Contributor (Arch): Ionut Biru <ibiru@archlinux.org> # Maintainer: David P. <megver83@parabola.nu> +# Contributor (Arch): Ionut Biru <ibiru@archlinux.org> pkgname=lib32-dbus _pkgbasename=dbus -pkgver=1.12.6 +pkgver=1.12.16 pkgrel=1 pkgrel+=.nonsystemd1 pkgdesc="Freedesktop.org message bus system (32-bit)" @@ -15,10 +14,12 @@ provides=(lib32-libdbus) conflicts=(lib32-libdbus) replaces=(lib32-libdbus) depends=(dbus) -makedepends=(lib32-gcc-libs lib32-glib2 lib32-expat git autoconf-archive lib32-libx11) -_commit=a723baa2bc7e91fc9b1926cda1ce53e9301de4d8 # tags/dbus-1.12.6^0 -source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit") +makedepends=(gcc-multilib lib32-glib2 lib32-expat git autoconf-archive lib32-libx11) +_commit=23cc709db8fab94f11fa48772bff396b20aea8b0 # tags/dbus-1.12.16^0 +source=("git+https://gitlab.freedesktop.org/dbus/dbus.git#commit=$_commit") sha256sums=('SKIP') +validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90' # Simon McVittie <simon.mcvittie@collabora.co.uk> + '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie@collabora.co.uk> pkgver() { cd dbus @@ -27,7 +28,6 @@ pkgver() { prepare() { cd dbus - git cherry-pick -n 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42 NOCONFIGURE=1 ./autogen.sh } @@ -37,37 +37,35 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" cd dbus - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libdir=/usr/lib32 \ - --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 \ - --disable-static \ - --disable-verbose-mode \ - --disable-asserts \ - --disable-checks \ - --without-systemdsystemunitdir \ - --disable-systemd \ - --disable-user-session + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --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 \ + --enable-inotify \ + --enable-user-session \ + --disable-static \ + --disable-verbose-mode \ + --disable-asserts \ + --disable-checks \ + --without-systemdsystemunitdir \ + --disable-systemd \ + --enable-x11-autolaunch make } check() { - cd dbus - make check + make -C dbus check } package() { - cd dbus - - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" make -C dbus install rm -r "$pkgdir"/usr/{bin,include,lib,share} rm -r "$pkgdir"/{etc,var} |