Upgrade to dbus-glib 0.74

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

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 46c0e43..028d234 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -146,8 +146,8 @@ PREFERRED_VERSION_gtk+ ?= "2.6.10"
 
 PREFERRED_VERSION_dbus ?= "1.0.2"
 PREFERRED_VERSION_dbus-native ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.73"
-PREFERRED_VERSION_dbus-glib-native ?= "0.73"
+PREFERRED_VERSION_dbus-glib ?= "0.74"
+PREFERRED_VERSION_dbus-glib-native ?= "0.74"
 PREFERRED_VERSION_gnome-vfs ?= "2.16.3"
 
 PREFERRED_VERSION_dillo2 ?= "0.6.6"

diff --git a/meta/packages/dbus/dbus-glib-0.73/cross.patch b/meta/packages/dbus/dbus-glib-0.73/cross.patch
deleted file mode 100644 (file)
index b3f41c8..0000000
--- a/meta/packages/dbus/dbus-glib-0.73/cross.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: dbus-glib-0.72/configure.ac
-===================================================================
---- dbus-glib-0.72.orig/configure.ac   2006-10-27 10:05:05.000000000 +0200
-+++ dbus-glib-0.72/configure.ac        2006-10-27 10:05:48.000000000 +0200
-@@ -571,6 +571,7 @@
-     exit (0);
- ]])],
-               [have_abstract_sockets=yes],
-+              [have_abstract_sockets=no],
-               [have_abstract_sockets=no])
- AC_LANG_POP(C)
- AC_MSG_RESULT($have_abstract_sockets)

diff --git a/meta/packages/dbus/dbus-glib-0.73/no-introspect.patch b/meta/packages/dbus/dbus-glib-0.74/no-introspect.patch
similarity index 100%
rename from meta/packages/dbus/dbus-glib-0.73/no-introspect.patch
rename to meta/packages/dbus/dbus-glib-0.74/no-introspect.patch

diff --git a/meta/packages/dbus/dbus-glib-native-0.73/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch
similarity index 100%
rename from meta/packages/dbus/dbus-glib-native-0.73/run-with-tmp-session-bus.patch
rename to meta/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch

diff --git a/meta/packages/dbus/dbus-glib-native_0.73.bb b/meta/packages/dbus/dbus-glib-native_0.74.bb
similarity index 95%
rename from meta/packages/dbus/dbus-glib-native_0.73.bb
rename to meta/packages/dbus/dbus-glib-native_0.74.bb
index 842ddeb..d76cc04 100644 (file)
--- a/meta/packages/dbus/dbus-glib-native_0.73.bb
+++ b/meta/packages/dbus/dbus-glib-native_0.74.bb
@@ -5,7 +5,6 @@ DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-          file://cross.patch;patch=1 \
           file://run-with-tmp-session-bus.patch;patch=1"
 
 inherit autotools pkgconfig gettext native

diff --git a/meta/packages/dbus/dbus-glib_0.73.bb b/meta/packages/dbus/dbus-glib_0.74.bb
similarity index 96%
rename from meta/packages/dbus/dbus-glib_0.73.bb
rename to meta/packages/dbus/dbus-glib_0.74.bb
index 641f026..3754abb 100644 (file)
--- a/meta/packages/dbus/dbus-glib_0.73.bb
+++ b/meta/packages/dbus/dbus-glib_0.74.bb
@@ -6,7 +6,6 @@ LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-          file://cross.patch;patch=1 \
           file://no-examples.patch;patch=1 \
           file://no-introspect.patch;patch=1"