summaryrefslogtreecommitdiffstats
path: root/meta/packages/dbus/dbus-glib-native-0.76
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-06-13 16:09:11 +0000
committerRoss Burton <ross@openedhand.com>2008-06-13 16:09:11 +0000
commit4d650a79c62ad0c84868ab4ba4a7361b7d2b530e (patch)
tree5f01e6fe0e10240d2aa8ea49512ff17f6feb7442 /meta/packages/dbus/dbus-glib-native-0.76
parentf37e581b877f9705db219cc3f77535b3f7639cc0 (diff)
downloadpoky-4d650a79c62ad0c84868ab4ba4a7361b7d2b530e.tar.gz
dbus-glib: upgrade to 0.76
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4644 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/dbus/dbus-glib-native-0.76')
-rw-r--r--meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch
new file mode 100644
index 0000000000..a04f404f75
--- /dev/null
+++ b/meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch
@@ -0,0 +1,24 @@
1Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh
2===================================================================
3--- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh 2008-06-13 16:31:54.000000000 +0100
4+++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh 2008-06-13 16:32:54.000000000 +0100
5@@ -30,17 +30,15 @@
6 echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
7
8 ## create a configuration file based on the standard session.conf
9-cat $DBUS_TOP_SRCDIR/tools/session.conf | \
10+cat $datadir/tools/session.conf | \
11 sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \
12 sed -e 's/<include.*$//g' \
13 > $CONFIG_FILE
14
15 echo "Created configuration file $CONFIG_FILE" >&2
16
17-PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
18-export PATH
19 ## the libtool script found by the path search should already do this, but
20-LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
21+LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
22 export PATH
23 unset DBUS_SESSION_BUS_ADDRESS
24 unset DBUS_SESSION_BUS_PID