dbus: renamed 1.1.4 -> 1.1.20 and added missing patch

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

diff --git a/meta/packages/dbus/dbus-1.1.4/cross.patch b/meta/packages/dbus/dbus-1.1.20/cross.patch
similarity index 100%
rename from meta/packages/dbus/dbus-1.1.4/cross.patch
rename to meta/packages/dbus/dbus-1.1.20/cross.patch

diff --git a/meta/packages/dbus/dbus-1.1.4/dbus-1.init b/meta/packages/dbus/dbus-1.1.20/dbus-1.init
similarity index 100%
rename from meta/packages/dbus/dbus-1.1.4/dbus-1.init
rename to meta/packages/dbus/dbus-1.1.20/dbus-1.init

diff --git a/meta/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch b/meta/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch
new file mode 100644 (file)
index 0000000..20c8d1b
--- /dev/null
+++ b/meta/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/meta/packages/dbus/dbus-1.1.4/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.1.20/fix-install-daemon.patch
similarity index 100%
rename from meta/packages/dbus/dbus-1.1.4/fix-install-daemon.patch
rename to meta/packages/dbus/dbus-1.1.20/fix-install-daemon.patch

diff --git a/meta/packages/dbus/dbus-1.1.4/tmpdir.patch b/meta/packages/dbus/dbus-1.1.20/tmpdir.patch
similarity index 100%
rename from meta/packages/dbus/dbus-1.1.4/tmpdir.patch
rename to meta/packages/dbus/dbus-1.1.20/tmpdir.patch