5 files changed, 14 insertions, 0 deletions

diff --git a/meta/packages/dbus/dbus-1.1.4/cross.patch b/meta/packages/dbus/dbus-1.1.20/cross.patch
index 268a3ae3de..268a3ae3de 100644
--- a/meta/packages/dbus/dbus-1.1.4/cross.patch
+++ b/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
index 0725083c69..0725083c69 100644
--- a/meta/packages/dbus/dbus-1.1.4/dbus-1.init
+++ b/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
index 0000000000..20c8d1b501
--- /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
index c31786357d..c31786357d 100644
--- a/meta/packages/dbus/dbus-1.1.4/fix-install-daemon.patch
+++ b/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
index 838b903f0a..838b903f0a 100644
--- a/meta/packages/dbus/dbus-1.1.4/tmpdir.patch
+++ b/meta/packages/dbus/dbus-1.1.20/tmpdir.patch