From fcfd1f95702bba3ed94577781384b7dd90758ded Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 10 Aug 2015 12:28:44 +0000
Subject: dbus: update to 1.8.20

---
 abs/core/dbus/30-dbus  |  2 +-
 abs/core/dbus/PKGBUILD | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/abs/core/dbus/30-dbus b/abs/core/dbus/30-dbus
index 42b3a5f..96a5182 100644
--- a/abs/core/dbus/30-dbus
+++ b/abs/core/dbus/30-dbus
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 # launches a session dbus instance
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && type dbus-launch >/dev/null; then
+if [ -z "${DBUS_SESSION_BUS_ADDRESS-}" ] && type dbus-launch >/dev/null; then
   eval $(dbus-launch --sh-syntax --exit-with-session)
 fi
diff --git a/abs/core/dbus/PKGBUILD b/abs/core/dbus/PKGBUILD
index e554405..f7bb849 100644
--- a/abs/core/dbus/PKGBUILD
+++ b/abs/core/dbus/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgbase=dbus
 pkgname=('dbus' 'libdbus')
-pkgver=1.8.12
-pkgrel=2
+pkgver=1.8.20
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
@@ -14,10 +14,10 @@ license=('GPL' 'custom')
 makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl')
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
         30-dbus)
-md5sums=('0ca23fc84c09cb3d29b9c27811ff4475'
+md5sums=('b49890bbabedab3a1c3f4f73c7ff8b2b'
          'SKIP'
-         '3314d727fa57fc443fce25b5cbeebbcc')
-validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90')
+         '6683a05bd749929ef9442816c22c3268')
+validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>
 
 build() {
   cd dbus-$pkgver
@@ -26,7 +26,7 @@ build() {
       --with-system-pid-file=/run/dbus/pid \
       --with-system-socket=/run/dbus/system_bus_socket \
       --with-console-auth-dir=/run/console/ \
-      --enable-inotify --disable-dnotify \
+      --enable-inotify \
       --disable-verbose-mode --disable-static \
       --disable-tests --disable-asserts \
       --with-systemdsystemunitdir=/usr/lib/systemd/system \
@@ -51,7 +51,7 @@ package_dbus(){
   rm -rf "${pkgdir}/var/run"
   rm -rf "${pkgdir}/usr/lib/pkgconfig"
 
-  install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus"
+  install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus.sh"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }
 
-- 
cgit v0.12

