summaryrefslogtreecommitdiffstats
path: root/meta/packages
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
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')
-rw-r--r--meta/packages/dbus/dbus-glib-0.76/no-examples.patch (renamed from meta/packages/dbus/dbus-glib-0.74/no-examples.patch)0
-rw-r--r--meta/packages/dbus/dbus-glib-0.76/no-introspect.patch (renamed from meta/packages/dbus/dbus-glib-0.74/no-introspect.patch)0
-rw-r--r--meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch (renamed from meta/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch)19
-rw-r--r--meta/packages/dbus/dbus-glib-native_0.76.bb (renamed from meta/packages/dbus/dbus-glib-native_0.74.bb)0
-rw-r--r--meta/packages/dbus/dbus-glib_0.76.bb (renamed from meta/packages/dbus/dbus-glib_0.74.bb)0
5 files changed, 10 insertions, 9 deletions
diff --git a/meta/packages/dbus/dbus-glib-0.74/no-examples.patch b/meta/packages/dbus/dbus-glib-0.76/no-examples.patch
index 483153db74..483153db74 100644
--- a/meta/packages/dbus/dbus-glib-0.74/no-examples.patch
+++ b/meta/packages/dbus/dbus-glib-0.76/no-examples.patch
diff --git a/meta/packages/dbus/dbus-glib-0.74/no-introspect.patch b/meta/packages/dbus/dbus-glib-0.76/no-introspect.patch
index 9115801f71..9115801f71 100644
--- a/meta/packages/dbus/dbus-glib-0.74/no-introspect.patch
+++ b/meta/packages/dbus/dbus-glib-0.76/no-introspect.patch
diff --git a/meta/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch
index ba117d0309..a04f404f75 100644
--- a/meta/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch
+++ b/meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch
@@ -1,23 +1,24 @@
1Index: dbus-glib-0.72/tools/run-with-tmp-session-bus.sh 1Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh
2=================================================================== 2===================================================================
3--- dbus-glib-0.72.orig/tools/run-with-tmp-session-bus.sh 2006-09-27 14:27:25.000000000 +0200 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.72/tools/run-with-tmp-session-bus.sh 2006-10-27 10:13:57.000000000 +0200 4+++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh 2008-06-13 16:32:54.000000000 +0100
5@@ -30,16 +30,15 @@ 5@@ -30,17 +30,15 @@
6 echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2 6 echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
7 7
8 ## create a configuration file based on the standard session.conf 8 ## create a configuration file based on the standard session.conf
9-cat $DBUS_TOP_SRCDIR/tools/session.conf | \ 9-cat $DBUS_TOP_SRCDIR/tools/session.conf | \
10+cat $datadir/dbus/session.conf | \ 10+cat $datadir/tools/session.conf | \
11 sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \ 11 sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \
12 sed -e 's/<include.*$//g' \ 12 sed -e 's/<include.*$//g' \
13 > $CONFIG_FILE 13 > $CONFIG_FILE
14 14
15 echo "Created configuration file $CONFIG_FILE" >&2 15 echo "Created configuration file $CONFIG_FILE" >&2
16 16
17-export PATH=$DBUS_TOP_BUILDDIR/bus:$PATH 17-PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
18-export PATH
18 ## the libtool script found by the path search should already do this, but 19 ## the libtool script found by the path search should already do this, but
19-export LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH 20-LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
20+export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH 21+LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
21 22 export PATH
22 unset DBUS_SESSION_BUS_ADDRESS 23 unset DBUS_SESSION_BUS_ADDRESS
23 unset DBUS_SESSION_BUS_PID 24 unset DBUS_SESSION_BUS_PID
diff --git a/meta/packages/dbus/dbus-glib-native_0.74.bb b/meta/packages/dbus/dbus-glib-native_0.76.bb
index d76cc043d4..d76cc043d4 100644
--- a/meta/packages/dbus/dbus-glib-native_0.74.bb
+++ b/meta/packages/dbus/dbus-glib-native_0.76.bb
diff --git a/meta/packages/dbus/dbus-glib_0.74.bb b/meta/packages/dbus/dbus-glib_0.76.bb
index 0a34c738c3..0a34c738c3 100644
--- a/meta/packages/dbus/dbus-glib_0.74.bb
+++ b/meta/packages/dbus/dbus-glib_0.76.bb