summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-03-04 17:09:52 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-03-04 17:09:52 +0000
commit73a457ecc6a09640f27d03010a8a329a48c05259 (patch)
treec8d96dd04cf607a2ea1dedba35e656cde30185c0 /meta
parentfdb00295bae640081bc06db9126a69b5f5c3859b (diff)
downloadopenembedded-core-73a457ecc6a09640f27d03010a8a329a48c05259.tar.gz
openembedded-core-73a457ecc6a09640f27d03010a8a329a48c05259.tar.bz2
openembedded-core-73a457ecc6a09640f27d03010a8a329a48c05259.zip
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
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/dbus/dbus-1.1.20/cross.patch (renamed from meta/packages/dbus/dbus-1.1.4/cross.patch)0
-rw-r--r--meta/packages/dbus/dbus-1.1.20/dbus-1.init (renamed from meta/packages/dbus/dbus-1.1.4/dbus-1.init)0
-rw-r--r--meta/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch14
-rw-r--r--meta/packages/dbus/dbus-1.1.20/fix-install-daemon.patch (renamed from meta/packages/dbus/dbus-1.1.4/fix-install-daemon.patch)0
-rw-r--r--meta/packages/dbus/dbus-1.1.20/tmpdir.patch (renamed from meta/packages/dbus/dbus-1.1.4/tmpdir.patch)0
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