[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server modular-xorg-server: revert PR...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b2d45c86928
branches:  trunk
changeset: 454970:3b2d45c86928
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Jun 24 18:43:08 2021 +0000

description:
modular-xorg-server: revert PR pkg/56169 patch. Different solution needed.

ok khorben

diffstat:

 x11/modular-xorg-server/Makefile.common                            |  10 +----
 x11/modular-xorg-server/distinfo                                   |   8 +--
 x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c      |  20 +--------
 x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c |  15 +------
 x11/modular-xorg-server/patches/patch-os_backtrace.c               |  14 -------
 x11/modular-xorg-server/patches/patch-xkb_XKBAlloc.c               |  20 ----------
 6 files changed, 11 insertions(+), 76 deletions(-)

diffs (152 lines):

diff -r af854f6de244 -r 3b2d45c86928 x11/modular-xorg-server/Makefile.common
--- a/x11/modular-xorg-server/Makefile.common   Thu Jun 24 17:33:34 2021 +0000
+++ b/x11/modular-xorg-server/Makefile.common   Thu Jun 24 18:43:08 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2021/06/24 15:38:41 tnn Exp $
+# $NetBSD: Makefile.common,v 1.42 2021/06/24 18:43:08 tnn Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 # used by x11/modular-xorg-xwayland/Makefile
@@ -39,13 +39,7 @@
 DEPENDS+=      xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
 
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-# XXX this brings in libnbcompat and it's namespace pollution that
-# can cause all sorts of problems. In particular it causes strlcpy
-# conflicts on Linux.
-# (since modular-xorg-server ships with it's own strlcpy replacement)
-USE_FEATURES+= strnlen err
-.endif
+
 .if ${OPSYS} == "NetBSD"
 CPPFLAGS+=             -D_OPENBSD_SOURCE       # for reallocarray(3)
 CONFIGURE_ARGS+=       --with-builder-addr="tech-x11%NetBSD.org@localhost"
diff -r af854f6de244 -r 3b2d45c86928 x11/modular-xorg-server/distinfo
--- a/x11/modular-xorg-server/distinfo  Thu Jun 24 17:33:34 2021 +0000
+++ b/x11/modular-xorg-server/distinfo  Thu Jun 24 18:43:08 2021 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.108 2021/06/08 22:51:11 khorben Exp $
+$NetBSD: distinfo,v 1.109 2021/06/24 18:43:08 tnn 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) = ec8b6128a26d605e50e8d1be3477558eda17a096
+SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 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,7 +17,5 @@
 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) = 4e34681371f7fc66f462ff00f4775aa6411d0282
-SHA1 (patch-os_backtrace.c) = 090ceba8a7f0fa61a1953d0f79603af6254b6fed
+SHA1 (patch-hw_xwayland_xwayland-input.c) = b876642a56f4930dfaa88cff77d4518cfe9d73e0
 SHA1 (patch-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f
-SHA1 (patch-xkb_XKBAlloc.c) = 099c2617b759d3ef115174610fe80a17d021c784
diff -r af854f6de244 -r 3b2d45c86928 x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c
--- a/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c     Thu Jun 24 17:33:34 2021 +0000
+++ b/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c     Thu Jun 24 18:43:08 2021 +0000
@@ -1,24 +1,10 @@
-$NetBSD: patch-hw_kdrive_ephyr_hostx.c,v 1.2 2021/06/08 22:51:11 khorben Exp $
+$NetBSD: patch-hw_kdrive_ephyr_hostx.c,v 1.3 2021/06/24 18:43:08 tnn Exp $
 
 Fix Xephyr visual with -parent option
 
---- hw/kdrive/ephyr/hostx.c.orig       2021-04-13 14:11:40.000000000 +0000
+--- hw/kdrive/ephyr/hostx.c.orig       2020-03-29 20:21:15.000000000 +0000
 +++ hw/kdrive/ephyr/hostx.c
-@@ -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)
+@@ -622,7 +622,7 @@ hostx_init(void)
                                scrpriv->win_height,
                                0,
                                XCB_WINDOW_CLASS_COPY_FROM_PARENT,
diff -r af854f6de244 -r 3b2d45c86928 x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c
--- a/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c        Thu Jun 24 17:33:34 2021 +0000
+++ b/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c        Thu Jun 24 18:43:08 2021 +0000
@@ -1,22 +1,13 @@
-$NetBSD: patch-hw_xwayland_xwayland-input.c,v 1.3 2021/06/08 22:51:11 khorben Exp $
+$NetBSD: patch-hw_xwayland_xwayland-input.c,v 1.4 2021/06/24 18:43:08 tnn Exp $
 
-Fix build on Solaris 10/amd64 (from pkg/56169)
 Support non-evdev platforms.
 
---- hw/xwayland/xwayland-input.c.orig  2021-04-13 14:11:40.000000000 +0000
+--- hw/xwayland/xwayland-input.c.orig  2019-02-26 19:28:50.000000000 +0000
 +++ hw/xwayland/xwayland-input.c
-@@ -26,7 +26,22 @@
+@@ -26,7 +26,14 @@
  
  #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 -r af854f6de244 -r 3b2d45c86928 x11/modular-xorg-server/patches/patch-os_backtrace.c
--- a/x11/modular-xorg-server/patches/patch-os_backtrace.c      Thu Jun 24 17:33:34 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$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 -r af854f6de244 -r 3b2d45c86928 x11/modular-xorg-server/patches/patch-xkb_XKBAlloc.c
--- a/x11/modular-xorg-server/patches/patch-xkb_XKBAlloc.c      Thu Jun 24 17:33:34 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$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
- 
- /***===================================================================***/
-