diff options
Diffstat (limited to 'nonsystemd/dbus')
| -rw-r--r-- | nonsystemd/dbus/PKGBUILD | 45 | ||||
| -rw-r--r-- | nonsystemd/dbus/no-fatal-warnings.diff | 13 |
2 files changed, 34 insertions, 24 deletions
diff --git a/nonsystemd/dbus/PKGBUILD b/nonsystemd/dbus/PKGBUILD index 5c9778c0d..1e46ea5c4 100644 --- a/nonsystemd/dbus/PKGBUILD +++ b/nonsystemd/dbus/PKGBUILD @@ -1,16 +1,17 @@ # Maintainer: David P. <megver83@parabola.nu> -# Maintainer (Arch): Jan de Groot <jgc@archlinux.org> -# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org> +# Contributor (Arch): Jan de Groot <jgc@archlinux.org> # Contributor (Arch): Tom Gundersen <teg@jklm.no> # Contributor (Arch): Link Dupont <link@subpop.net> pkgname=dbus -pkgver=1.12.16 -pkgrel=5 +pkgver=1.12.20 +pkgrel=1 pkgrel+=.nonsystemd1 pkgdesc="Freedesktop.org message bus system" url="https://wiki.freedesktop.org/www/Software/dbus/" -arch=(x86_64 i686 armv7h) +arch=(x86_64) +arch+=(i686 armv7h) license=(GPL custom) depends=(libx11 libelogind expat audit) depends+=(libelogind.so libaudit.so) @@ -19,27 +20,24 @@ provides=(libdbus libdbus-1.so) provides+=($pkgname-{elogind,openrc}) conflicts=(${provides[@]}) replaces=(${provides[@]}) -_commit=23cc709db8fab94f11fa48772bff396b20aea8b0 # tags/dbus-1.12.16^0 -source=("git+https://gitlab.freedesktop.org/dbus/dbus.git#commit=$_commit" - dbus-reload.hook +source=("git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver" dbus-enable-elogind.patch + no-fatal-warnings.diff + dbus-reload.hook dbus.initd) sha256sums=('SKIP' - '1335a86bb5eb68614bf13af314f1a7f5f6f68253584986e9c5b492a4585ab722' 'faffcaa5b295f49fcedeed2c9ece5298949096be3062fd99a4bf1a6ac3ad1ea0' + '6958eeec07557b92a28419eb1702331ee2f0a6fd17285e37dfb6130b9fa4cf6e' + '1335a86bb5eb68614bf13af314f1a7f5f6f68253584986e9c5b492a4585ab722' '9964aa935b4a7d64f5970bcfcd561b06013a85ae2712444bc4c5f644364dab3b') -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' -} +validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk> prepare() { cd dbus + patch -Np 1 -i ../dbus-enable-elogind.patch + # Allow us to enable checks without them being fatal + patch -Np1 -i ../no-fatal-warnings.diff - patch -Np 1 -i ${srcdir}/dbus-enable-elogind.patch NOCONFIGURE=1 ./autogen.sh } @@ -56,12 +54,13 @@ build() { --with-system-socket=/run/dbus/system_bus_socket \ --without-systemdsystemunitdir \ --enable-inotify \ + --enable-libaudit \ --disable-systemd \ --disable-user-session \ + --enable-xml-docs \ + --enable-doxygen-docs \ + --enable-ducktype-docs \ --disable-static \ - --disable-verbose-mode \ - --disable-asserts \ - --disable-checks \ --enable-elogind \ --enable-x11-autolaunch make @@ -82,8 +81,8 @@ package() { install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING - # Split docs - mv "$pkgdir/usr/share/doc" "$srcdir" + # Remove docs + rm -r "$pkgdir/usr/share/doc" # Init script install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook @@ -91,5 +90,3 @@ package() { install -d "${pkgdir}/etc/runlevels/default" ln -sf "/etc/init.d/dbus" "${pkgdir}/etc/runlevels/default/dbus" } - -# vim:set sw=2 et: diff --git a/nonsystemd/dbus/no-fatal-warnings.diff b/nonsystemd/dbus/no-fatal-warnings.diff new file mode 100644 index 000000000..459da9047 --- /dev/null +++ b/nonsystemd/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) |