From b59ff5364cd2b3309f12eefa31f636a0d51ef22f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 29 Jan 2016 20:21:23 +0000
Subject: dbus: update to 1.10.6

---
 abs/core/dbus/30-dbus  |  6 ------
 abs/core/dbus/PKGBUILD | 26 ++++++++++++++------------
 2 files changed, 14 insertions(+), 18 deletions(-)
 delete mode 100644 abs/core/dbus/30-dbus

diff --git a/abs/core/dbus/30-dbus b/abs/core/dbus/30-dbus
deleted file mode 100644
index 96a5182..0000000
--- a/abs/core/dbus/30-dbus
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# launches a session dbus instance
-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 f7bb849..ddc3ebf 100644
--- a/abs/core/dbus/PKGBUILD
+++ b/abs/core/dbus/PKGBUILD
@@ -5,19 +5,22 @@
 
 pkgbase=dbus
 pkgname=('dbus' 'libdbus')
-pkgver=1.8.20
+pkgver=1.10.6
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl')
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
-        30-dbus)
-md5sums=('b49890bbabedab3a1c3f4f73c7ff8b2b'
-         'SKIP'
-         '6683a05bd749929ef9442816c22c3268')
-validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc})
+md5sums=('26d0cf3a1c9782cb0e342101f0450440'
+         'SKIP')
+validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90'  # Simon McVittie <simon.mcvittie@collabora.co.uk>
+              '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+prepare() {
+  cd dbus-$pkgver
+}
 
 build() {
   cd dbus-$pkgver
@@ -30,7 +33,7 @@ build() {
       --disable-verbose-mode --disable-static \
       --disable-tests --disable-asserts \
       --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --enable-systemd
+      --enable-systemd --enable-user-session
   make
 }
 
@@ -48,16 +51,15 @@ package_dbus(){
 
   make DESTDIR="$pkgdir" install
 
-  rm -rf "${pkgdir}/var/run"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
+  rm -r "${pkgdir}/var/run"
+  rm -r "${pkgdir}/usr/lib/pkgconfig"
 
-  install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus.sh"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }
 
 package_libdbus(){
   pkgdesc="DBus library"
-  depends=('glibc')
+  depends=('libsystemd')
 
   cd dbus-$pkgver
   make DESTDIR="$pkgdir" -C dbus install
-- 
cgit v0.12

