diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-09-30 21:03:23 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-09-30 21:03:23 +0000 |
| commit | 16cbf4ea61c3c1c4b8bd384e27e2bc14cd98c512 (patch) | |
| tree | ca5ed4fe514a08db4109f64bbb7f9e8e1134bac0 /packages/dbus/dbus-glib-native-0.74 | |
| parent | 6009c3769647135923e1ce7b1c3617a8073df6ab (diff) | |
packages/dbus/dbus-glib_0.74.bb : add updated version from poky, remove
older version
This will fix networkmanager
Diffstat (limited to 'packages/dbus/dbus-glib-native-0.74')
| -rw-r--r-- | packages/dbus/dbus-glib-native-0.74/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch | 23 |
2 files changed, 23 insertions, 0 deletions
diff --git a/packages/dbus/dbus-glib-native-0.74/.mtn2git_empty b/packages/dbus/dbus-glib-native-0.74/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dbus/dbus-glib-native-0.74/.mtn2git_empty diff --git a/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch b/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch new file mode 100644 index 0000000000..ba117d0309 --- /dev/null +++ b/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch @@ -0,0 +1,23 @@ +Index: dbus-glib-0.72/tools/run-with-tmp-session-bus.sh +=================================================================== +--- dbus-glib-0.72.orig/tools/run-with-tmp-session-bus.sh 2006-09-27 14:27:25.000000000 +0200 ++++ dbus-glib-0.72/tools/run-with-tmp-session-bus.sh 2006-10-27 10:13:57.000000000 +0200 +@@ -30,16 +30,15 @@ + echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2 + + ## create a configuration file based on the standard session.conf +-cat $DBUS_TOP_SRCDIR/tools/session.conf | \ ++cat $datadir/dbus/session.conf | \ + sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \ + sed -e 's/<include.*$//g' \ + > $CONFIG_FILE + + echo "Created configuration file $CONFIG_FILE" >&2 + +-export PATH=$DBUS_TOP_BUILDDIR/bus:$PATH + ## the libtool script found by the path search should already do this, but +-export LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH ++export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH + + unset DBUS_SESSION_BUS_ADDRESS + unset DBUS_SESSION_BUS_PID |