[arch-commits] Commit in dbus/trunk (30-dbus PKGBUILD)

[Tom Gundersen]

    Date: Wednesday, December 5, 2012 @ 20:25:37
  Author: tomegun
Revision: 172788

upgpkg: dbus 1.6.8-6

reinstate xinitrc.d/30-dbus

Lots of people still rely on this, keep it for now. We might make a
better plan for getting rid of this stuff in the future.

Added:
  dbus/trunk/30-dbus
Modified:
  dbus/trunk/PKGBUILD

----------+
 30-dbus  |    8 ++++++++
 PKGBUILD |    7 +++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

Added: 30-dbus
===================================================================
--- 30-dbus	                        (rev 0)
+++ 30-dbus	2012-12-06 01:25:37 UTC (rev 172788)
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# 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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-06 01:18:23 UTC (rev 172787)
+++ PKGBUILD	2012-12-06 01:25:37 UTC (rev 172788)
@@ -5,7 +5,7 @@
 #
 pkgname=dbus
 pkgver=1.6.8
-pkgrel=5
+pkgrel=6
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
@@ -21,7 +21,7 @@
 options=(!libtool)
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc}
-        dbus systemd-user-session.patch)
+        30-dbus dbus systemd-user-session.patch)
 
 build() {
   cd dbus-$pkgver
@@ -49,8 +49,11 @@
 
   install -Dm755 ../dbus "$pkgdir/etc/rc.d/dbus"
 
+  install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus"
+
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }
 md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2'
+         '9fafe8b28460aeaa6054309ef4c5ed92'
          'f0364f3f5dc5f653bb05d39aa36e3264'
          'd8a1bd529b3ddca671ee1a695a143db9')