diff options
| author | tnn <tnn@pkgsrc.org> | 2015-09-26 18:35:41 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2015-09-26 18:35:41 +0000 |
| commit | ddfe9962ec30c2343527890216cb803337140339 (patch) | |
| tree | 067569e83d247bdad08dace13275dddbc3b1a67a /x11 | |
| parent | 176576df999c93156f69121b9e767f41c8e07ee2 (diff) | |
| download | pkgsrc-ddfe9962ec30c2343527890216cb803337140339.tar.gz | |
kludge around non-constant expressionness of CMSG_SPACE(3) on netbsd-5
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/modular-xorg-server/distinfo | 3 | ||||
| -rw-r--r-- | x11/modular-xorg-server/patches/patch-os_xstrans.c | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index 7f88fccd904..8d224899ed8 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.63 2015/09/20 15:32:38 tnn Exp $ +$NetBSD: distinfo,v 1.64 2015/09/26 18:35:41 tnn Exp $ SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262 RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2 @@ -15,3 +15,4 @@ SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a226 SHA1 (patch-os_WaitFor.c) = 6060455bd8d145116b4177c5b0f482cf39c741ea SHA1 (patch-os_connection.c) = 19189656fbcabb0a48b68a7606660bda33e5d605 SHA1 (patch-os_io.c) = 42c41abee29d241e3d7e10d59764c573a2165d55 +SHA1 (patch-os_xstrans.c) = 489a4f4b226ecd361b922895204fb9041b065d4e diff --git a/x11/modular-xorg-server/patches/patch-os_xstrans.c b/x11/modular-xorg-server/patches/patch-os_xstrans.c new file mode 100644 index 00000000000..439158f0ef2 --- /dev/null +++ b/x11/modular-xorg-server/patches/patch-os_xstrans.c @@ -0,0 +1,21 @@ +$NetBSD: patch-os_xstrans.c,v 1.1 2015/09/26 18:35:41 tnn Exp $ + +CMSG_SPACE must evaluate to a constant, but doesn't on netbsd-5. +See sys/socket.h r1.104. + +--- os/xstrans.c.orig 2015-05-21 14:23:54.000000000 +0000 ++++ os/xstrans.c +@@ -14,4 +14,13 @@ _X_ATTRIBUTE_PRINTF(1, 2); + #define TRANS_REOPEN + #define TRANS_SERVER + #define XSERV_t ++#if defined(__NetBSD__) ++#include <sys/param.h> ++#if (__NetBSD_Version__ < 600000000) ++#include <sys/socket.h> ++#define __MY_CMSG_ALIGN(n) (((n) + 7) & ~7) ++#undef CMSG_SPACE ++#define CMSG_SPACE(l) (__MY_CMSG_ALIGN(sizeof(struct msghdr)) + __MY_CMSG_ALIGN(l)) ++#endif ++#endif + #include <X11/Xtrans/transport.c> |