dbus: Fix build issue when libx11 isn't installed.

This commit is contained in:
Brett Goulder 2008-03-11 14:31:58 -04:00
parent da6105a5c7
commit d47ef7b3fa
3 changed files with 19 additions and 2 deletions

View File

@ -1,3 +1,4 @@
23bc5ff22fe4f9a208d65fbbfd489ad9 30-dbus.launch
85d76404ef5ce9e86f7009dfd4c4b5a6 dbus-1.1.20-fix-build.patch
c552b9bc4b69e4c602644abc21b7661e dbus-1.1.20.tar.gz
dd882e45b9397a5dbf8650057ee9a340 rc.dbus

View File

@ -6,12 +6,14 @@
name=dbus
version=1.1.20
release=1
release=2
source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \
rc.dbus 30-dbus.launch)
rc.dbus 30-dbus.launch \
$name-$version-fix-build.patch)
build() {
cd $name-$version
patch -p1 -i $SRC/$name-$version-fix-build.patch
./configure --prefix=/usr \
--with-dbus-daemondir=/usr/sbin \
--localstatedir=/var \

View File

@ -0,0 +1,14 @@
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 5d6e77e..6a10ffa 100644
--- a/tools/dbus-launch.c
+++ b/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 ();