From 9674c34a112cc93958fc6b713a0f7b6ce533684e Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 21 Apr 2008 16:43:45 +0000 Subject: [PATCH] dbus: drop unneeded fix-dbus-launch-x11.patch to complement ec238858461bb40d136b48ac17f1ad9ee6b50c9e --- packages/dbus/dbus-1.2.1/fix-dbus-launch-x11.patch | 14 -------------- packages/dbus/dbus_1.2.1.bb | 2 -- 2 files changed, 16 deletions(-) delete mode 100644 packages/dbus/dbus-1.2.1/fix-dbus-launch-x11.patch diff --git a/packages/dbus/dbus-1.2.1/fix-dbus-launch-x11.patch b/packages/dbus/dbus-1.2.1/fix-dbus-launch-x11.patch deleted file mode 100644 index 20c8d1b501..0000000000 --- a/packages/dbus/dbus-1.2.1/fix-dbus-launch-x11.patch +++ /dev/null @@ -1,14 +0,0 @@ -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.2.1.bb b/packages/dbus/dbus_1.2.1.bb index ffbdbdd7bf..f331b140aa 100644 --- a/packages/dbus/dbus_1.2.1.bb +++ b/packages/dbus/dbus_1.2.1.bb @@ -1,5 +1,3 @@ include dbus.inc PR = "r0" - -#SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1" -- 2.39.5