dbus-glib: upgrade to 0.76
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4644 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
f37e581b87
commit
4d650a79c6
|
@ -147,8 +147,8 @@ PREFERRED_VERSION_gtk+ ?= "2.12.7"
|
|||
|
||||
PREFERRED_VERSION_dbus ?= "1.1.20"
|
||||
PREFERRED_VERSION_dbus-native ?= "1.1.20"
|
||||
PREFERRED_VERSION_dbus-glib ?= "0.74"
|
||||
PREFERRED_VERSION_dbus-glib-native ?= "0.74"
|
||||
PREFERRED_VERSION_dbus-glib ?= "0.76"
|
||||
PREFERRED_VERSION_dbus-glib-native ?= "0.76"
|
||||
PREFERRED_VERSION_gnome-vfs ?= "2.22.0"
|
||||
PREFERRED_VERSION_libgnomecanvas ?= "2.20.0"
|
||||
PREFERRED_VERSION_gnome-keyring ?= "2.20"
|
||||
|
|
|
@ -1,23 +1,24 @@
|
|||
Index: dbus-glib-0.72/tools/run-with-tmp-session-bus.sh
|
||||
Index: dbus-glib-0.76/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 @@
|
||||
--- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh 2008-06-13 16:31:54.000000000 +0100
|
||||
+++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh 2008-06-13 16:32:54.000000000 +0100
|
||||
@@ -30,17 +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 | \
|
||||
+cat $datadir/tools/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
|
||||
-PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
|
||||
-export 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
|
||||
|
||||
-LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
|
||||
+LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
|
||||
export PATH
|
||||
unset DBUS_SESSION_BUS_ADDRESS
|
||||
unset DBUS_SESSION_BUS_PID
|
Loading…
Reference in New Issue