tigervnc: neither 1.18 nor 1.19 xservers work

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Wed Apr 28 16:32:27 2021 +0200
Changeset:	10554713036681b75da25379925208563f2819b0

Modified Files:
	tigervnc/Makefile
	tigervnc/distinfo
Added Files:
	tigervnc/patches/patch-unix_xserver_hw_vnc_vncBlockHandler.c

Log Message:
tigervnc: neither 1.18 nor 1.19 xservers work

> Xvnc
(EE) Segmentation fault at address 0x5c76e000
(EE)
Fatal server error:
(EE) Caught signal 11 (Segmentation fault). Server aborting
(EE)

Program received signal SIGSEGV, Segmentation fault.
0x00000000005e4d52 in CreateWellKnownSockets () at connection.c:397
397     connection.c: No such file or directory.
(gdb) bt
0  0x00000000005e4d52 in CreateWellKnownSockets () at connection.c:397
1  0x000000000058d882 in dix_main (argc=1, argv=0x7f7fff5556e8, envp=<optimized out>) at main.c:167
2  0x00000000004493ed in ___start ()

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

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

diffstat:
 tigervnc/Makefile                                   |  6 +++---
 tigervnc/distinfo                                   |  9 +++++----
 .../patch-unix_xserver_hw_vnc_vncBlockHandler.c     | 21 +++++++++++++++++++++
 3 files changed, 29 insertions(+), 7 deletions(-)

diffs:
diff --git a/tigervnc/Makefile b/tigervnc/Makefile
index f407a2aa06..0d7218c4f2 100644
--- a/tigervnc/Makefile
+++ b/tigervnc/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.37 2021/04/21 13:25:14 adam Exp $
 
 DISTNAME=		tigervnc-1.9.0
-PKGNAME=		${DISTNAME}.1.18.4
+PKGNAME=		${DISTNAME}.1.19.7
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GITHUB:=TigerVNC/}
 GITHUB_TAG=		v${PKGVERSION_NOREV}
-XORG_SERVER_FILE=	xorg-server-1.18.4
+XORG_SERVER_FILE=	xorg-server-1.19.7
 SITES.${XORG_SERVER_FILE}.tar.bz2=	${MASTER_SITE_XORG:=xserver/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
 
@@ -49,7 +49,7 @@ post-extract:
 	cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver
 
 post-patch:
-	cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver118.patch
+	cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver119.patch
 
 XORG_CONFIGURE_ARGS+=	--prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
 XORG_CONFIGURE_ARGS+=	--disable-xwayland --disable-kdrive --disable-xephyr
diff --git a/tigervnc/distinfo b/tigervnc/distinfo
index 6e28de2cd8..870aec0842 100644
--- a/tigervnc/distinfo
+++ b/tigervnc/distinfo
@@ -4,12 +4,13 @@ SHA1 (tigervnc-1.9.0.tar.gz) = c56656c596fb863bb2c4b67fb62b4165011d181f
 RMD160 (tigervnc-1.9.0.tar.gz) = 990e872addf459432584c176b3565504e994899e
 SHA512 (tigervnc-1.9.0.tar.gz) = 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 Size (tigervnc-1.9.0.tar.gz) = 1506520 bytes
-SHA1 (xorg-server-1.18.4.tar.bz2) = ff088ee29dee46a2d68925c8df3f0515ef15ec52
-RMD160 (xorg-server-1.18.4.tar.bz2) = 6f58d84d3bbc59a773e6a2e1eafc208827a5923f
-SHA512 (xorg-server-1.18.4.tar.bz2) = 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b
-Size (xorg-server-1.18.4.tar.bz2) = 6009508 bytes
+SHA1 (xorg-server-1.19.7.tar.bz2) = 70c06a92a531aa3bf49d9d3de66e9a97c9f1191c
+RMD160 (xorg-server-1.19.7.tar.bz2) = b77b3ec73631e7fd29aaac7cc8c471d5bb6145f3
+SHA512 (xorg-server-1.19.7.tar.bz2) = 5942c08aa53309965fbe127aaf1e7b079c5cb65dbd21acc7c2c09e74a305eb8e2fda521e2bf59f6f83a5f879d1ea061d76f33bc2af4ab302335316b1623a8947
+Size (xorg-server-1.19.7.tar.bz2) = 6104222 bytes
 SHA1 (patch-CMakeLists.txt) = 42a364f898784a9c4da46bea8ef6bc37838815b9
 SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa
 SHA1 (patch-unix_vncserver) = 9c71ad02c6657f537bcb2abaa116a831b555d7c0
 SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = 29b33e6d94a070bb0a55a264cd1c4e120c9b1b3c
+SHA1 (patch-unix_xserver_hw_vnc_vncBlockHandler.c) = 534a621aab793625c27737d42c5bf12c9574a414
 SHA1 (patch-unix_xserver_hw_vnc_vncModule.c) = 77aff6c2bb19e6936302c783b72d581e7d6388f5
diff --git a/tigervnc/patches/patch-unix_xserver_hw_vnc_vncBlockHandler.c b/tigervnc/patches/patch-unix_xserver_hw_vnc_vncBlockHandler.c
new file mode 100644
index 0000000000..7f1371de83
--- /dev/null
+++ b/tigervnc/patches/patch-unix_xserver_hw_vnc_vncBlockHandler.c
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- unix/xserver/hw/vnc/vncBlockHandler.c.orig	2018-07-16 14:08:55.000000000 +0000
++++ unix/xserver/hw/vnc/vncBlockHandler.c
+@@ -17,14 +17,14 @@
+  * USA.
+  */
+ 
++#include <X11/Xpoll.h>
++
+ #ifdef HAVE_DIX_CONFIG_H
+ #include <dix-config.h>
+ #endif
+ 
+ #include <errno.h>
+ 
+-#include <X11/Xpoll.h>
+-
+ #include "os.h"
+ #include "dix.h"
+ #include "scrnintstr.h"