summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
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 483153db7..483153db7 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 9115801f7..9115801f7 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 ba117d030..a04f404f7 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 @@
-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
diff --git a/meta/packages/dbus/dbus-glib-native_0.74.bb b/meta/packages/dbus/dbus-glib-native_0.76.bb
index d76cc043d..d76cc043d 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 0a34c738c..0a34c738c 100644
--- a/meta/packages/dbus/dbus-glib_0.74.bb
+++ b/meta/packages/dbus/dbus-glib_0.76.bb