From 4b9176f841205f7680f5c667938765635732c3d0 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@mobile.openelec.tv>
Date: Sun, 22 Nov 2009 14:39:30 +0100
Subject: [PATCH] dbus: - build and install without x11 support - various
 cleanups

---
 packages/devel/dbus/build   |  8 +++-----
 packages/devel/dbus/install | 20 +++++++++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/packages/devel/dbus/build b/packages/devel/dbus/build
index 1b269297d7..7e8fccd28b 100755
--- a/packages/devel/dbus/build
+++ b/packages/devel/dbus/build
@@ -4,13 +4,10 @@
 
 $SCRIPTS/build toolchain
 $SCRIPTS/build expat
-$SCRIPTS/build libX11
+#$SCRIPTS/build libX11
 
 export ac_cv_have_abstract_sockets=set
 
-export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include"
-export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib"
-
 cd $PKG_BUILD
 
 mkdir -p .build-target
@@ -20,6 +17,7 @@ cd .build-target
              --build=$HOST_NAME \
              --prefix=/usr \
              --sysconfdir=/etc \
+             --libexecdir=/usr/lib/dbus \
              --localstatedir=/var \
              --disable-static \
              --enable-shared \
@@ -37,7 +35,7 @@ cd .build-target
              --disable-dnotify \
              --enable-inotify \
              --with-xml=expat \
-             --with-x \
+             --without-x \
              --with-dbus-user=dbus \
 
 make
diff --git a/packages/devel/dbus/install b/packages/devel/dbus/install
index b7ba34858b..07da935c99 100755
--- a/packages/devel/dbus/install
+++ b/packages/devel/dbus/install
@@ -3,14 +3,16 @@
 . config/options
 
 $SCRIPTS/install expat
-$SCRIPTS/install libX11
+#$SCRIPTS/install libX11
 
 add_user dbus x 81 81 "System message bus" "/" "/bin/sh"
 add_group dbus 81
 add_group netdev 497
 
 mkdir -p $INSTALL/usr/bin
+#  cp $PKG_BUILD/.build-target/tools/dbus-cleanup-sockets $INSTALL/usr/bin
   cp $PKG_BUILD/.build-target/bus/dbus-daemon $INSTALL/usr/bin
+#  cp $PKG_BUILD/.build-target/tools/.libs/dbus-monitor $INSTALL/usr/bin
   cp $PKG_BUILD/.build-target/tools/.libs/dbus-uuidgen $INSTALL/usr/bin
   cp $PKG_BUILD/.build-target/tools/dbus-launch $INSTALL/usr/bin
   cp $PKG_BUILD/.build-target/tools/.libs/dbus-send $INSTALL/usr/bin #DEVTOOLS only
@@ -18,16 +20,20 @@ mkdir -p $INSTALL/usr/bin
 mkdir -p $INSTALL/usr/lib
   cp -PR $PKG_BUILD/.build-target/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib
 
-mkdir -p $INSTALL/usr/lib/dbus-1.0
-  cp $PKG_BUILD/.build-target/bus/dbus-daemon-launch-helper $INSTALL/usr/lib/dbus-1.0
+mkdir -p $INSTALL/usr/lib/dbus
+  cp $PKG_BUILD/.build-target/bus/dbus-daemon-launch-helper $INSTALL/usr/lib/dbus
+    echo "chmod 4750 $INSTALL/usr/lib/dbus/dbus-daemon-launch-helper" >> $ROOT/.fakeroot
+    echo "chown 0:81 $INSTALL/usr/lib/dbus/dbus-daemon-launch-helper" >> $ROOT/.fakeroot
+
+mkdir -p $INSTALL/etc/dbus-1
+  cp $PKG_BUILD/.build-target/bus/session.conf $INSTALL/etc/dbus-1
+  cp $PKG_BUILD/.build-target/bus/system.conf $INSTALL/etc/dbus-1
 
 mkdir -p $INSTALL/etc/dbus-1/event.d
 mkdir -p $INSTALL/etc/dbus-1/system.d
 mkdir -p $INSTALL/etc/dbus-1/session.d
-
 mkdir -p $INSTALL/usr/share/dbus-1/services
 mkdir -p $INSTALL/usr/share/dbus-1/system-services
 
-cp $PKG_BUILD/.build-target/bus/session.conf $INSTALL/etc/dbus-1
-  sed 's%<servicehelper>.*</servicehelper>%<servicehelper>/usr/lib/dbus-1.0/dbus-daemon-launch-helper</servicehelper>%' \
-    $PKG_BUILD/.build-target/bus/system.conf > $INSTALL/etc/dbus-1/system.conf
+#  sed 's%<servicehelper>.*</servicehelper>%<servicehelper>/usr/lib/dbus-1.0/dbus-daemon-launch-helper</servicehelper>%' \
+#    $PKG_BUILD/.build-target/bus/system.conf > $INSTALL/etc/dbus-1/system.conf