[arch-commits] Commit in lib32-dbus/trunk (PKGBUILD no-fatal-warnings.diff)

Jan Steffens heftig at archlinux.org
Thu Jul 2 18:08:28 UTC 2020


    Date: Thursday, July 2, 2020 @ 18:08:27
  Author: heftig
Revision: 657503

1.12.20-1

Added:
  lib32-dbus/trunk/no-fatal-warnings.diff
Modified:
  lib32-dbus/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   31 ++++++++++++++++++++-----------
 no-fatal-warnings.diff |   13 +++++++++++++
 2 files changed, 33 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-02 18:08:18 UTC (rev 657502)
+++ PKGBUILD	2020-07-02 18:08:27 UTC (rev 657503)
@@ -1,7 +1,8 @@
-# Contributor : Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=lib32-dbus
-pkgver=1.12.18
+pkgver=1.12.20
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system (32-bit)"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
@@ -9,18 +10,24 @@
 license=(GPL custom)
 depends=(lib32-systemd dbus)
 makedepends=(lib32-glib2 lib32-expat git autoconf-archive)
-source=("git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver")
-sha256sums=('SKIP')
+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 at 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 CC="gcc -m32 -mstackrealign"
+  export CXX="g++ -m32 -mstackrealign"
   export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
   cd dbus
@@ -37,12 +44,13 @@
     --with-system-socket=/run/dbus/system_bus_socket \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --enable-inotify \
+    --disable-libaudit \
     --enable-systemd \
     --enable-user-session \
+    --disable-xml-docs \
+    --disable-doxygen-docs \
+    --disable-ducktype-docs \
     --disable-static \
-    --disable-verbose-mode \
-    --disable-asserts \
-    --disable-checks \
     --without-x
   make
 }
@@ -61,6 +69,7 @@
   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:

Added: no-fatal-warnings.diff
===================================================================
--- no-fatal-warnings.diff	                        (rev 0)
+++ no-fatal-warnings.diff	2020-07-02 18:08:27 UTC (rev 657503)
@@ -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)


More information about the arch-commits mailing list