diff options
| -rw-r--r-- | x11/modular-xorg-server/distinfo | 8 | ||||
| -rw-r--r-- | x11/modular-xorg-server/patches/patch-os_WaitFor.c | 16 | ||||
| -rw-r--r-- | x11/modular-xorg-server/patches/patch-os_connection.c | 16 | ||||
| -rw-r--r-- | x11/modular-xorg-server/patches/patch-os_io.c | 16 |
4 files changed, 19 insertions, 37 deletions
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index 8d224899ed8..c6bd20afd41 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.64 2015/09/26 18:35:41 tnn Exp $ +$NetBSD: distinfo,v 1.65 2015/10/11 17:40:23 tnn Exp $ SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262 RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2 @@ -12,7 +12,7 @@ SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453a SHA1 (patch-hw_xfree86_os-support_bsd_sparc64__video.c) = eddf15142e26f10f9028088f8e4e910bb6b5df59 SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 74ddd0ce09b8d4426accca5a1a1d25bc6cea6524 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544 -SHA1 (patch-os_WaitFor.c) = 6060455bd8d145116b4177c5b0f482cf39c741ea -SHA1 (patch-os_connection.c) = 19189656fbcabb0a48b68a7606660bda33e5d605 -SHA1 (patch-os_io.c) = 42c41abee29d241e3d7e10d59764c573a2165d55 +SHA1 (patch-os_WaitFor.c) = a76c5ef4e3725f5299fa3f0860183e89c6004a71 +SHA1 (patch-os_connection.c) = d6b9bbc1ab34cec6457aa68546105ea5deb6ded6 +SHA1 (patch-os_io.c) = 6216e35e780706a8d5aaa60652c9ae7b4ec8e6e6 SHA1 (patch-os_xstrans.c) = 489a4f4b226ecd361b922895204fb9041b065d4e diff --git a/x11/modular-xorg-server/patches/patch-os_WaitFor.c b/x11/modular-xorg-server/patches/patch-os_WaitFor.c index 135396063cd..dcc6816ee30 100644 --- a/x11/modular-xorg-server/patches/patch-os_WaitFor.c +++ b/x11/modular-xorg-server/patches/patch-os_WaitFor.c @@ -1,24 +1,18 @@ -$NetBSD: patch-os_WaitFor.c,v 1.1 2015/07/25 04:10:53 markd Exp $ +$NetBSD: patch-os_WaitFor.c,v 1.2 2015/10/11 17:40:24 tnn Exp $ move X11/Xpoll.h include earlier than sys/select.h to avoid missing out on setting FD_SETSIZE early enough. ---- os/WaitFor.c.orig 2015-07-21 21:58:16.000000000 +0000 +--- os/WaitFor.c.orig 2015-05-21 14:23:54.000000000 +0000 +++ os/WaitFor.c -@@ -52,6 +52,8 @@ SOFTWARE. +@@ -52,6 +52,10 @@ SOFTWARE. * *****************************************************************/ ++#ifdef __NetBSD__ +#include <X11/Xpoll.h> ++#endif + #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif -@@ -66,7 +68,6 @@ SOFTWARE. - #include "misc.h" - - #include "osdep.h" --#include <X11/Xpoll.h> - #include "dixstruct.h" - #include "opaque.h" - #ifdef DPMSExtension diff --git a/x11/modular-xorg-server/patches/patch-os_connection.c b/x11/modular-xorg-server/patches/patch-os_connection.c index c7f9c442503..768d5a87fd2 100644 --- a/x11/modular-xorg-server/patches/patch-os_connection.c +++ b/x11/modular-xorg-server/patches/patch-os_connection.c @@ -1,24 +1,18 @@ -$NetBSD: patch-os_connection.c,v 1.1 2015/07/25 04:10:53 markd Exp $ +$NetBSD: patch-os_connection.c,v 1.2 2015/10/11 17:40:24 tnn Exp $ move X11/Xpoll.h include earlier than sys/select.h to avoid missing out on setting FD_SETSIZE early enough. ---- os/connection.c.orig 2015-07-21 21:58:52.000000000 +0000 +--- os/connection.c.orig 2015-06-16 15:21:07.000000000 +0000 +++ os/connection.c -@@ -60,6 +60,8 @@ SOFTWARE. +@@ -60,6 +60,10 @@ SOFTWARE. * *****************************************************************/ ++#ifdef __NetBSD__ +#include <X11/Xpoll.h> ++#endif + #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif -@@ -103,7 +105,6 @@ SOFTWARE. - #endif /* WIN32 */ - #include "misc.h" /* for typedef of pointer */ - #include "osdep.h" --#include <X11/Xpoll.h> - #include "opaque.h" - #include "dixstruct.h" - #include "xace.h" diff --git a/x11/modular-xorg-server/patches/patch-os_io.c b/x11/modular-xorg-server/patches/patch-os_io.c index 065490b8476..6929fae14ae 100644 --- a/x11/modular-xorg-server/patches/patch-os_io.c +++ b/x11/modular-xorg-server/patches/patch-os_io.c @@ -1,24 +1,18 @@ -$NetBSD: patch-os_io.c,v 1.1 2015/07/25 04:10:53 markd Exp $ +$NetBSD: patch-os_io.c,v 1.2 2015/10/11 17:40:24 tnn Exp $ move X11/Xpoll.h include earlier than sys/select.h to avoid missing out on setting FD_SETSIZE early enough. ---- os/io.c.orig 2015-07-21 21:58:59.000000000 +0000 +--- os/io.c.orig 2015-05-21 14:23:54.000000000 +0000 +++ os/io.c -@@ -51,6 +51,8 @@ SOFTWARE. +@@ -51,6 +51,10 @@ SOFTWARE. * *****************************************************************/ ++#ifdef __NetBSD__ +#include <X11/Xpoll.h> ++#endif + #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif -@@ -74,7 +76,6 @@ SOFTWARE. - #include <X11/Xproto.h> - #include "os.h" - #include "osdep.h" --#include <X11/Xpoll.h> - #include "opaque.h" - #include "dixstruct.h" - #include "misc.h" |