Date: Thursday, March 2, 2023 @ 02:02:26 Author: heftig Revision: 469867
1.14.6-2: FS#77694 remove patch; reformat Modified: dbus/trunk/PKGBUILD Deleted: dbus/trunk/no-fatal-warnings.diff ------------------------+ PKGBUILD | 98 +++++++++++++++++++++++++++++------------------ no-fatal-warnings.diff | 13 ------ 2 files changed, 62 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-01 22:36:04 UTC (rev 469866) +++ PKGBUILD 2023-03-02 02:02:26 UTC (rev 469867) @@ -4,53 +4,73 @@ # Contributor: Link Dupont <[email protected]> pkgbase=dbus -pkgname=(dbus dbus-docs) +pkgname=( + dbus + dbus-docs +) pkgver=1.14.6 -pkgrel=1 +pkgrel=2 pkgdesc="Freedesktop.org message bus system" url="https://wiki.freedesktop.org/www/Software/dbus/"; arch=(x86_64) -license=(GPL custom) -depends=(systemd-libs expat audit) -makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive) -source=("git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"; - dbus-reload.hook no-fatal-warnings.diff) -sha256sums=('SKIP' - 'd636205622d0ee3b0734360225739ef0c7ad2468a09489e6ef773d88252960f3' - 'c10395be67e1127a58d7173b587fbbf16f8a8b271c41293558fcf9e27c185478') +license=( + GPL + custom +) +depends=( + audit + expat + systemd-libs +) +makedepends=( + autoconf-archive + docbook-xsl + doxygen + git + python + systemd + xmlto + yelp-tools +) +source=( + "git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"; + dbus-reload.hook +) +b2sums=('SKIP' + '05ab81bf72e7cf45ad943f5b84eaecef4f06bed94979c579a3e23134cbabd7ea6f65fa9ac252f8b43ceb4a3295e0d2325f06560a044fe7ddf125fc30dfc2b7e2') 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 + --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 + --enable-libaudit + --enable-systemd + --enable-user-session + --enable-xml-docs + --enable-doxygen-docs + --enable-ducktype-docs + --disable-static + --without-x + ) + cd dbus - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --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 \ - --enable-libaudit \ - --enable-systemd \ - --enable-user-session \ - --enable-xml-docs \ - --enable-doxygen-docs \ - --enable-ducktype-docs \ - --disable-static \ - --without-x + ./configure "${configure_options[@]}" make } @@ -59,8 +79,14 @@ } package_dbus() { - depends+=(libsystemd.so libaudit.so) - provides=(libdbus libdbus-1.so) + depends+=( + libaudit.so + libsystemd.so + ) + provides=( + libdbus + libdbus-1.so + ) conflicts=(libdbus) replaces=(libdbus) @@ -82,7 +108,7 @@ } package_dbus-docs() { - pkgdesc+=" (documentation)" + pkgdesc+=" - Documentation" depends=() mv doc/* "$pkgdir" Deleted: no-fatal-warnings.diff =================================================================== --- no-fatal-warnings.diff 2023-03-01 22:36:04 UTC (rev 469866) +++ no-fatal-warnings.diff 2023-03-02 02:02:26 UTC (rev 469867) @@ -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)
