]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch
dbus-1.0.1: big update due to changes in DBUS API. Affected packages are: bluez-libs...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / dbus / dbus-glib-native / run-with-tmp-session-bus.patch
1 --- dbus-glib-0.71/tools/Makefile.am.orig       2006-08-27 12:54:34.351198198 +0200
2 +++ dbus-glib-0.71/tools/Makefile.am    2006-08-27 12:55:12.533584373 +0200
3 @@ -9,7 +9,7 @@
4  BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
5  
6  dbus-bus-introspect.xml:
7 -       DBUS_TOP_BUILDDIR=$(top_builddir) dbus-send --system --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
8 +       DBUS_TOP_BUILDDIR=$(top_builddir) ./run-with-tmp-session-bus.sh dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
9  
10  EXTRA_DIST = run-with-tmp-session-bus.sh
11  
12 --- dbus-glib-0.71/tools/run-with-tmp-session-bus.sh.orig       2006-08-27 11:52:17.497666746 +0200
13 +++ dbus-glib-0.71/tools/run-with-tmp-session-bus.sh    2006-08-27 12:53:22.626715838 +0200
14 @@ -27,16 +27,15 @@
15  echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
16  
17  ## create a configuration file based on the standard session.conf
18 -cat $DBUS_TOP_BUILDDIR/tools/session.conf |  \
19 +cat $datadir/dbus/session.conf |  \
20      sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' |  \
21      sed -e 's/<include.*$//g'                \
22    > $CONFIG_FILE
23  
24  echo "Created configuration file $CONFIG_FILE" >&2
25  
26 -export PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
27  ## the libtool script found by the path search should already do this, but
28 -export LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
29 +export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
30  
31  unset DBUS_SESSION_BUS_ADDRESS
32  unset DBUS_SESSION_BUS_PID