Date: Thursday, March 2, 2023 @ 02:02:38 Author: heftig Revision: 1406255
1.14.6-2 Modified: lib32-dbus/trunk/PKGBUILD Deleted: lib32-dbus/trunk/no-fatal-warnings.diff ------------------------+ PKGBUILD | 90 ++++++++++++++++++++++++++++------------------- no-fatal-warnings.diff | 13 ------ 2 files changed, 54 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-02 00:15:41 UTC (rev 1406254) +++ PKGBUILD 2023-03-02 02:02:38 UTC (rev 1406255) @@ -2,57 +2,70 @@ # Contributor: Ionut Biru <[email protected]> pkgbase=lib32-dbus -pkgname=(lib32-dbus) +pkgname=( + lib32-dbus +) pkgver=1.14.6 -pkgrel=1 -pkgdesc="Freedesktop.org message bus system (32-bit)" +pkgrel=2 +pkgdesc="Freedesktop.org message bus system - 32-bit" url="https://wiki.freedesktop.org/www/Software/dbus/"; arch=(x86_64) -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"; - no-fatal-warnings.diff) -sha256sums=('SKIP' - 'c10395be67e1127a58d7173b587fbbf16f8a8b271c41293558fcf9e27c185478') +license=( + GPL + custom +) +depends=( + dbus + lib32-systemd +) +makedepends=( + autoconf-archive + git + lib32-expat + lib32-glib2 +) +source=( + "git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"; +) +b2sums=('SKIP') validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <[email protected]> prepare() { cd dbus - # Allow us to enable checks without them being fatal - git apply -3 ../no-fatal-warnings.diff - NOCONFIGURE=1 ./autogen.sh } build() { + local configure_options=( + --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 + --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 + --without-x + ) + export CC="gcc -m32 -mstackrealign" export CXX="g++ -m32 -mstackrealign" export PKG_CONFIG="i686-pc-linux-gnu-pkg-config" cd dbus - ./configure \ - --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 \ - --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 \ - --without-x + ./configure "${configure_options[@]}" make } @@ -61,8 +74,13 @@ } package_lib32-dbus() { - depends+=(libsystemd.so) - provides=(lib32-libdbus libdbus-1.so) + depends+=( + libsystemd.so + ) + provides=( + lib32-libdbus + libdbus-1.so + ) conflicts=(lib32-libdbus) replaces=(lib32-libdbus) Deleted: no-fatal-warnings.diff =================================================================== --- no-fatal-warnings.diff 2023-03-02 00:15:41 UTC (rev 1406254) +++ no-fatal-warnings.diff 2023-03-02 02:02:38 UTC (rev 1406255) @@ -1,13 +0,0 @@ -diff --git i/dbus/dbus-internals.c w/dbus/dbus-internals.c -index ab498b15..cf86f4ae 100644 ---- i/dbus/dbus-internals.c -+++ w/dbus/dbus-internals.c -@@ -193,7 +193,7 @@ static dbus_bool_t warn_initted = FALSE; - * threads, the worst that will happen is that warnings get their default - * fatal/non-fatal nature. */ - 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)
