pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

modular-xorg-server-devel: remove patch for NetBSD 5.x



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Fri May 11 15:44:04 2018 +0200
Changeset:	dc1a54b4a43a29a40303293329aea97692db383a

Modified Files:
	modular-xorg-server-devel/distinfo
Removed Files:
	modular-xorg-server-devel/patches/patch-os_xstrans.c

Log Message:
modular-xorg-server-devel: remove patch for NetBSD 5.x

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dc1a54b4a43a29a40303293329aea97692db383a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 modular-xorg-server-devel/distinfo                  |  1 -
 .../patches/patch-os_xstrans.c                      | 21 ---------------------
 2 files changed, 22 deletions(-)

diffs:
diff --git a/modular-xorg-server-devel/distinfo b/modular-xorg-server-devel/distinfo
index 651cebbfa0..3d37e1a6e1 100644
--- a/modular-xorg-server-devel/distinfo
+++ b/modular-xorg-server-devel/distinfo
@@ -15,4 +15,3 @@ SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060e
 SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
 SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
-SHA1 (patch-os_xstrans.c) = 489a4f4b226ecd361b922895204fb9041b065d4e
diff --git a/modular-xorg-server-devel/patches/patch-os_xstrans.c b/modular-xorg-server-devel/patches/patch-os_xstrans.c
deleted file mode 100644
index 439158f0ef..0000000000
--- a/modular-xorg-server-devel/patches/patch-os_xstrans.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$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>


Home | Main Index | Thread Index | Old Index