modular-xorg-xephyr: fix build on Solaris 10

From pkg/56169; thanks for reporting!

6 files changed, 70 insertions, 10 deletions

diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common
index 75c3600e464..ff0cec077c0 100644
--- a/x11/modular-xorg-server/Makefile.common
+++ b/x11/modular-xorg-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2021/04/13 18:46:55 wiz Exp $
+# $NetBSD: Makefile.common,v 1.40 2021/06/08 22:51:11 khorben Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 # used by x11/modular-xorg-xwayland/Makefile
@@ -15,6 +15,7 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
 USE_LANGUAGES+=	c99
+USE_FEATURES+=	strnlen err
 
 CHECK_PORTABILITY_SKIP+=	hw/xquartz/bundle/mk_bundke.sh
 
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 3c45bf9ff07..fd85cc8e3de 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.107 2021/04/25 07:51:27 mrg Exp $
+$NetBSD: distinfo,v 1.108 2021/06/08 22:51:11 khorben Exp $
 
 SHA1 (xorg-server-1.20.11.tar.bz2) = 86ae4add5719e6026a569f5559d51e8707171d5d
 RMD160 (xorg-server-1.20.11.tar.bz2) = 9b451d5523e9384df37e0e91f52d843090590d23
 SHA512 (xorg-server-1.20.11.tar.bz2) = 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2
 Size (xorg-server-1.20.11.tar.bz2) = 6476116 bytes
 SHA1 (patch-configure) = 4c2d439e622ec14ec2f8a3a2f556c67e60259f82
-SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
+SHA1 (patch-hw_kdrive_ephyr_hostx.c) = ec8b6128a26d605e50e8d1be3477558eda17a096
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
@@ -17,5 +17,7 @@ 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-hw_xwayland_xwayland-input.c) = b876642a56f4930dfaa88cff77d4518cfe9d73e0
+SHA1 (patch-hw_xwayland_xwayland-input.c) = 4e34681371f7fc66f462ff00f4775aa6411d0282
+SHA1 (patch-os_backtrace.c) = 090ceba8a7f0fa61a1953d0f79603af6254b6fed
 SHA1 (patch-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f
+SHA1 (patch-xkb_XKBAlloc.c) = 099c2617b759d3ef115174610fe80a17d021c784
diff --git a/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c b/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c
index a3ece3b72e9..dbc02e6962a 100644
--- a/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c
+++ b/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c
@@ -1,10 +1,24 @@
-$NetBSD: patch-hw_kdrive_ephyr_hostx.c,v 1.1 2020/09/28 01:08:15 khorben Exp $
+$NetBSD: patch-hw_kdrive_ephyr_hostx.c,v 1.2 2021/06/08 22:51:11 khorben Exp $
 
 Fix Xephyr visual with -parent option
 
---- hw/kdrive/ephyr/hostx.c.orig	2020-03-29 20:21:15.000000000 +0000
+--- hw/kdrive/ephyr/hostx.c.orig	2021-04-13 14:11:40.000000000 +0000
 +++ hw/kdrive/ephyr/hostx.c
-@@ -622,7 +622,7 @@ hostx_init(void)
+@@ -36,7 +36,13 @@
+ #include <string.h>             /* for memset */
+ #include <errno.h>
+ #include <time.h>
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat/config.h>
++#include <nbcompat/cdefs.h>
++#include <nbcompat/err.h>
++#else
+ #include <err.h>
++#endif
+ 
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+@@ -622,7 +628,7 @@ hostx_init(void)
                                scrpriv->win_height,
                                0,
                                XCB_WINDOW_CLASS_COPY_FROM_PARENT,
diff --git a/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c b/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c
index b4edafc969e..3251463c148 100644
--- a/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c
+++ b/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c
@@ -1,13 +1,22 @@
-$NetBSD: patch-hw_xwayland_xwayland-input.c,v 1.2 2019/10/29 22:46:39 nia Exp $
+$NetBSD: patch-hw_xwayland_xwayland-input.c,v 1.3 2021/06/08 22:51:11 khorben Exp $
 
+Fix build on Solaris 10/amd64 (from pkg/56169)
 Support non-evdev platforms.
 
---- hw/xwayland/xwayland-input.c.orig	2019-02-26 19:28:50.000000000 +0000
+--- hw/xwayland/xwayland-input.c.orig	2021-04-13 14:11:40.000000000 +0000
 +++ hw/xwayland/xwayland-input.c
-@@ -26,7 +26,14 @@
+@@ -26,7 +26,22 @@
  
  #include "xwayland.h"
  
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat/config.h>
++#include <nbcompat/cdefs.h>
++#include <nbcompat/string.h>
++#else
++#include <string.h>
++#endif
++
 +#if defined(__linux__) || defined(__FreeBSD__)
  #include <linux/input.h>
 +#else
diff --git a/x11/modular-xorg-server/patches/patch-os_backtrace.c b/x11/modular-xorg-server/patches/patch-os_backtrace.c
new file mode 100644
index 00000000000..4644e727c1c
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-os_backtrace.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-os_backtrace.c,v 1.1 2021/06/08 22:51:11 khorben Exp $
+
+Fix build on Solaris 10/amd64 (from pkg/56169)
+
+--- os/backtrace.c.orig	2021-04-13 14:11:40.000000000 +0000
++++ os/backtrace.c
+@@ -29,6 +29,7 @@
+ #include "misc.h"
+ #include <errno.h>
+ #include <string.h>
++#include <unistd.h>
+ 
+ #ifdef HAVE_LIBUNWIND
+ 
diff --git a/x11/modular-xorg-server/patches/patch-xkb_XKBAlloc.c b/x11/modular-xorg-server/patches/patch-xkb_XKBAlloc.c
new file mode 100644
index 00000000000..1c0d7022645
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-xkb_XKBAlloc.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-xkb_XKBAlloc.c,v 1.1 2021/06/08 22:51:11 khorben Exp $
+
+Fix build on Solaris 10/amd64 (from pkg/56169)
+
+--- xkb/XKBAlloc.c.orig	2021-04-13 14:11:40.000000000 +0000
++++ xkb/XKBAlloc.c
+@@ -36,7 +36,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include <xkbsrv.h>
+ #include "xkbgeom.h"
+ #include <os.h>
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat/config.h>
++#include <nbcompat/cdefs.h>
++#include <nbcompat/string.h>
++#else
+ #include <string.h>
++#endif
+ 
+ /***===================================================================***/
+