updpkg: nonsystemd-multilib/lib32-dbus 1.12.20-1.1.nonsystemd1

Signed-off-by: David P <megver83@parabola.nu>

2 files changed, 45 insertions, 30 deletions

diff --git a/nonsystemd-multilib/lib32-dbus/PKGBUILD b/nonsystemd-multilib/lib32-dbus/PKGBUILD
index 289c16fa3..e0478646e 100644
--- a/nonsystemd-multilib/lib32-dbus/PKGBUILD
+++ b/nonsystemd-multilib/lib32-dbus/PKGBUILD
@@ -1,40 +1,36 @@
 # Maintainer: David P. <megver83@parabola.nu>
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
 
 pkgname=lib32-dbus
-_pkgbasename=dbus
-pkgver=1.12.16
-pkgrel=1
+pkgver=1.12.20
+pkgrel=1.1
 pkgrel+=.nonsystemd1
 pkgdesc="Freedesktop.org message bus system (32-bit)"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(x86_64)
 license=(GPL custom)
-provides=(lib32-libdbus)
-conflicts=(lib32-libdbus)
-replaces=(lib32-libdbus)
-depends=(dbus)
-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
-  git describe --tags | sed 's/^dbus-//;s/-/+/g'
-}
+depends=(lib32-elogind dbus)
+makedepends=(lib32-glib2 lib32-expat git autoconf-archive)
+source=("git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"
+        no-fatal-warnings.diff)
+sha256sums=('SKIP'
+            '6958eeec07557b92a28419eb1702331ee2f0a6fd17285e37dfb6130b9fa4cf6e')
+validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>
 
 prepare() {
   cd dbus
+
+  # Allow us to enable checks without them being fatal
+  patch -Np1 -i ../no-fatal-warnings.diff
+
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export CC="gcc -m32 -mstackrealign"
+  export CXX="g++ -m32 -mstackrealign"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
   cd dbus
   ./configure \
@@ -48,15 +44,16 @@ build() {
     --with-dbus-user=dbus \
     --with-system-pid-file=/run/dbus/pid \
     --with-system-socket=/run/dbus/system_bus_socket \
+    --disable-systemd \
+    --without-systemdsystemunitdir \
     --enable-inotify \
+    --disable-libaudit \
     --enable-user-session \
+    --disable-xml-docs \
+    --disable-doxygen-docs \
+    --disable-ducktype-docs \
     --disable-static \
-    --disable-verbose-mode \
-    --disable-asserts \
-    --disable-checks \
-    --without-systemdsystemunitdir \
-    --disable-systemd \
-    --enable-x11-autolaunch
+    --without-x
   make
 }
 
@@ -65,11 +62,16 @@ check() {
 }
 
 package() {
+  provides=(lib32-libdbus libdbus-1.so)
+  conflicts=(lib32-libdbus)
+  replaces=(lib32-libdbus)
+
   DESTDIR="$pkgdir" make -C dbus install
 
-  rm -r "$pkgdir"/usr/{bin,include,lib,share}
   rm -r "$pkgdir"/{etc,var}
+  rm -r "$pkgdir"/usr/{bin,include,lib,share}
 
-  install -d "$pkgdir/usr/share/licenses"
-  ln -s dbus "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
 }
+
+# vim:set sw=2 et:
diff --git a/nonsystemd-multilib/lib32-dbus/no-fatal-warnings.diff b/nonsystemd-multilib/lib32-dbus/no-fatal-warnings.diff
new file mode 100644
index 000000000..459da9047
--- /dev/null
+++ b/nonsystemd-multilib/lib32-dbus/no-fatal-warnings.diff
@@ -0,0 +1,13 @@
+diff --git i/dbus/dbus-internals.c w/dbus/dbus-internals.c
+index 267aef97..b1064e85 100644
+--- i/dbus/dbus-internals.c
++++ w/dbus/dbus-internals.c
+@@ -185,7 +185,7 @@ const char *_dbus_no_memory_message = "Not enough memory";
+ 
+ static dbus_bool_t warn_initted = FALSE;
+ static dbus_bool_t fatal_warnings = FALSE;
+-static dbus_bool_t fatal_warnings_on_check_failed = TRUE;
++static dbus_bool_t fatal_warnings_on_check_failed = FALSE;
+ 
+ static void
+ init_warnings(void)