From 6c43fe473ac09d6d25d119ce70a0fefd79f406ec Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 24 Jun 2011 22:50:30 +0200
Subject: [PATCH] dbus: update to 1.4.12.

---
 srcpkgs/dbus/files/30-dbus-xinit |  9 +++++++++
 srcpkgs/dbus/template            | 11 ++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/dbus/files/30-dbus-xinit

diff --git a/srcpkgs/dbus/files/30-dbus-xinit b/srcpkgs/dbus/files/30-dbus-xinit
new file mode 100644
index 00000000000..877bb43a4a1
--- /dev/null
+++ b/srcpkgs/dbus/files/30-dbus-xinit
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# launches a session dbus instance
+
+dbuslaunch="`which dbus-launch 2>/dev/null`"
+if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+  eval `$dbuslaunch --sh-syntax --exit-with-session`
+fi
+
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index 2296be16b9a..5f3455d3eb3 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,16 +1,16 @@
 # Template file for 'dbus'
 pkgname=dbus
-version=1.4.10
+version=1.4.12
 homepage="http://dbus.freedesktop.org/"
 distfiles="${homepage}/releases/dbus/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-selinux --enable-userdb-cache --with-xml=expat
 --localstatedir=/var --disable-dnotify --enable-inotify --with-dbus-user=dbus
---disable-doxygen-docs --disable-xml-docs"
+--disable-doxygen-docs --disable-xml-docs --disable-tests"
 short_desc="Message bus system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-checksum=fcb4b41121525d485da32b5c988e1b31cab109c74d72c5abf05ae2a5b7db9517
+checksum=da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7
 long_desc="
  D-BUS is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in terms
@@ -39,6 +39,11 @@ Add_dependency build coreutils
 
 post_install()
 {
+	# install dbus-launch.
+	install -m755 tools/dbus-launch ${DESTDIR}/bin
+	install -m644 doc/dbus-launch.1 ${DESTDIR}/usr/share/man/man1
+	install -Dm755 ${FILESDIR}/30-dbus-xinit \
+		${DESTDIR}/etc/X11/xinit/xinitrc.d/30-dbus
 	rm -rf ${DESTDIR}/var/run
 	# Install the OpenRC service
 	install -D -m755 ${FILESDIR}/dbus.rc ${DESTDIR}/etc/init.d/dbus