[oe-commits] org.oe.dev dbus-glib-native-0.71: fix introspection data / binding header generation

[pH5 commit]

dbus-glib-native-0.71: fix introspection data / binding header generation

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: c2ec93861c0fdb4bf2076b696915c911d2a0708a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c2ec93861c0fdb4bf2076b696915c911d2a0708a
Files:
1
packages/dbus/dbus-glib-native
packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch
packages/dbus/dbus-glib-native_0.71.bb
Diffs:

#
# mt diff -rcecec739c02c73f3f476b4e26d531df390fd024c -rc2ec93861c0fdb4bf2076b696915c911d2a0708a
#
# 
# 
# add_dir "packages/dbus/dbus-glib-native"
# 
# add_file "packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch"
#  content [cf85e8bf02b32ef7298a4a60f1df7dfa0bf80912]
# 
# patch "packages/dbus/dbus-glib-native_0.71.bb"
#  from [505932ac5d56fc65f636b1d7fc48b3a030349fea]
#    to [a89773aa8790976bc7014df0a6c5efb9a4412ed8]
# 
============================================================
--- packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch	cf85e8bf02b32ef7298a4a60f1df7dfa0bf80912
+++ packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch	cf85e8bf02b32ef7298a4a60f1df7dfa0bf80912
@@ -0,0 +1,32 @@
+--- dbus-glib-0.71/tools/Makefile.am.orig	2006-08-27 12:54:34.351198198 +0200
++++ dbus-glib-0.71/tools/Makefile.am	2006-08-27 12:55:12.533584373 +0200
+@@ -9,7 +9,7 @@
+ BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
+ 
+ dbus-bus-introspect.xml:
+-	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
++	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
+ 
+ EXTRA_DIST = run-with-tmp-session-bus.sh
+ 
+--- dbus-glib-0.71/tools/run-with-tmp-session-bus.sh.orig	2006-08-27 11:52:17.497666746 +0200
++++ dbus-glib-0.71/tools/run-with-tmp-session-bus.sh	2006-08-27 12:53:22.626715838 +0200
+@@ -27,16 +27,15 @@
+ echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
+ 
+ ## create a configuration file based on the standard session.conf
+-cat $DBUS_TOP_BUILDDIR/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
============================================================
--- packages/dbus/dbus-glib-native_0.71.bb	505932ac5d56fc65f636b1d7fc48b3a030349fea
+++ packages/dbus/dbus-glib-native_0.71.bb	a89773aa8790976bc7014df0a6c5efb9a4412ed8
@@ -6,7 +6,8 @@ SRC_URI = "http://freedesktop.org/softwa
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \
-	   file://cross.patch;patch=1"
+	   file://cross.patch;patch=1 \
+	   file://run-with-tmp-session-bus.patch;patch=1"
 
 inherit autotools pkgconfig gettext native