dbus 1.1.4 update to 1.1.20 (new default version)

12 files changed, 26 insertions, 13 deletions

diff --git a/packages/dbus/dbus-1.1.4/.mtn2git_empty b/packages/dbus/dbus-1.1.20/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dbus/dbus-1.1.4/.mtn2git_empty
+++ b/packages/dbus/dbus-1.1.20/.mtn2git_empty
diff --git a/packages/dbus/dbus-1.1.4/cross.patch b/packages/dbus/dbus-1.1.20/cross.patch
index 268a3ae3de..268a3ae3de 100644
--- a/packages/dbus/dbus-1.1.4/cross.patch
+++ b/packages/dbus/dbus-1.1.20/cross.patch
diff --git a/packages/dbus/dbus-1.1.4/dbus-1.init b/packages/dbus/dbus-1.1.20/dbus-1.init
index 0725083c69..0725083c69 100644
--- a/packages/dbus/dbus-1.1.4/dbus-1.init
+++ b/packages/dbus/dbus-1.1.20/dbus-1.init
diff --git a/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch b/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch
new file mode 100644
index 0000000000..20c8d1b501
--- /dev/null
+++ b/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch
@@ -0,0 +1,14 @@
+Index: dbus-1.1.20/tools/dbus-launch.c
+===================================================================
+--- dbus-1.1.20.orig/tools/dbus-launch.c
++++ dbus-1.1.20/tools/dbus-launch.c
+@@ -966,7 +966,9 @@ main (int argc, char **argv)
+       char write_pid_fd_as_string[MAX_FD_LEN];
+       char write_address_fd_as_string[MAX_FD_LEN];
+ 
++#ifdef DBUS_BUILD_X11
+       xdisplay = NULL;
++#endif
+ 
+       if (close_stderr)
+ 	do_close_stderr ();
diff --git a/packages/dbus/dbus-1.1.4/fix-install-daemon.patch b/packages/dbus/dbus-1.1.20/fix-install-daemon.patch
index c31786357d..c31786357d 100644
--- a/packages/dbus/dbus-1.1.4/fix-install-daemon.patch
+++ b/packages/dbus/dbus-1.1.20/fix-install-daemon.patch
diff --git a/packages/dbus/dbus-1.1.4/tmpdir.patch b/packages/dbus/dbus-1.1.20/tmpdir.patch
index 838b903f0a..838b903f0a 100644
--- a/packages/dbus/dbus-1.1.4/tmpdir.patch
+++ b/packages/dbus/dbus-1.1.20/tmpdir.patch
diff --git a/packages/dbus/dbus-native_1.0.2.bb b/packages/dbus/dbus-native_1.0.2.bb
index ebd57b2876..0149ab374f 100644
--- a/packages/dbus/dbus-native_1.0.2.bb
+++ b/packages/dbus/dbus-native_1.0.2.bb
@@ -1,5 +1,6 @@
 require dbus.inc
-DEFAULT_PREFERENCE = "1"
+
+DEFAULT_PREFERENCE = "-1"
 
 inherit native
 
@@ -25,4 +26,3 @@ do_stage() {
 do_install() {
 	:
 }
-
diff --git a/packages/dbus/dbus-native_1.1.4.bb b/packages/dbus/dbus-native_1.1.20.bb
index a006965a32..c97a6c6420 100644
--- a/packages/dbus/dbus-native_1.1.4.bb
+++ b/packages/dbus/dbus-native_1.1.20.bb
@@ -5,9 +5,10 @@ DEPENDS = "glib-2.0-native libxml2-native expat-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
 
 SRC_URI = "\
-  http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+  http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
   file://cross.patch;patch=1 \
   file://tmpdir.patch;patch=1 \
+  file://fix-dbus-launch-x11.patch;patch=1 \
   file://dbus-1.init \
 "
 
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index a8fd31d8c7..bca75856df 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -4,10 +4,8 @@ SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "\
-  http://freedesktop.org/software/dbus/releases/dbus/dbus-${PV}.tar.gz \
+  http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
   file://cross.patch;patch=1 \
   file://tmpdir.patch;patch=1 \
   file://fix-install-daemon.patch;patch=1 \
diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb
index e803cb7189..da0a298459 100644
--- a/packages/dbus/dbus_1.0.2.bb
+++ b/packages/dbus/dbus_1.0.2.bb
@@ -1,6 +1,4 @@
 require dbus.inc
-DEFAULT_PREFERENCE = "1"
-
-PR = "r9"
-
+PR = "r10"
 
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/dbus/dbus_1.1.20.bb b/packages/dbus/dbus_1.1.20.bb
new file mode 100644
index 0000000000..247e465769
--- /dev/null
+++ b/packages/dbus/dbus_1.1.20.bb
@@ -0,0 +1,5 @@
+include dbus.inc
+
+PR = "r0"
+
+SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"
diff --git a/packages/dbus/dbus_1.1.4.bb b/packages/dbus/dbus_1.1.4.bb
deleted file mode 100644
index 7838e55ca1..0000000000
--- a/packages/dbus/dbus_1.1.4.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include dbus.inc
-
-PR = "r2"