dbus-glib: upgrade to 0.76

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4644 311d38ba-8fff-0310-9ca6-ca027cbcb966

6 files changed, 12 insertions, 11 deletions

diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 306e17f83..9a7eb0ac8 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -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"
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