aboutsummaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorFlorent Thoumie <flz@FreeBSD.org>2008-05-29 11:02:54 +0000
committerFlorent Thoumie <flz@FreeBSD.org>2008-05-29 11:02:54 +0000
commit808deb28b31c268e87df35e2d348754504573da4 (patch)
treee021a850f8a4abe5c0e9a58e6e6e0688528d1e83 /x11-servers
parentb24a5794ba1a671219da88339256b4866c522a1c (diff)
Notes
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/xorg-server/Makefile2
-rw-r--r--x11-servers/xorg-server/files/patch-config_dbus-core.c14
2 files changed, 15 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 136248112239..1c2409e20a6b 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xorg-server
PORTVERSION= 1.4
-PORTREVISION= 8
+PORTREVISION= 9
PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/:fdo \
diff --git a/x11-servers/xorg-server/files/patch-config_dbus-core.c b/x11-servers/xorg-server/files/patch-config_dbus-core.c
new file mode 100644
index 000000000000..32a9f5667674
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-config_dbus-core.c
@@ -0,0 +1,14 @@
+--- config/dbus-core.c.orig 2008-05-28 18:04:17.000000000 +0000
++++ config/dbus-core.c 2008-05-28 18:04:01.000000000 +0000
+@@ -87,7 +87,8 @@
+ dbus_connection_unref(bus_info.connection);
+
+ RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, &bus_info);
+- RemoveGeneralSocket(bus_info.fd);
++ if (bus_info.fd != -1)
++ RemoveGeneralSocket(bus_info.fd);
+ bus_info.fd = -1;
+ bus_info.connection = NULL;
+
+
+