From 73a457ecc6a09640f27d03010a8a329a48c05259 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 4 Mar 2008 17:09:52 +0000 Subject: [PATCH] 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 --- .../dbus/{dbus-1.1.4 => dbus-1.1.20}/cross.patch | 0 .../dbus/{dbus-1.1.4 => dbus-1.1.20}/dbus-1.init | 0 .../dbus/dbus-1.1.20/fix-dbus-launch-x11.patch | 14 ++++++++++++++ .../fix-install-daemon.patch | 0 .../dbus/{dbus-1.1.4 => dbus-1.1.20}/tmpdir.patch | 0 5 files changed, 14 insertions(+) rename meta/packages/dbus/{dbus-1.1.4 => dbus-1.1.20}/cross.patch (100%) rename meta/packages/dbus/{dbus-1.1.4 => dbus-1.1.20}/dbus-1.init (100%) create mode 100644 meta/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch rename meta/packages/dbus/{dbus-1.1.4 => dbus-1.1.20}/fix-install-daemon.patch (100%) rename meta/packages/dbus/{dbus-1.1.4 => dbus-1.1.20}/tmpdir.patch (100%) 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 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 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 -- 2.40.1