CVS commit: pkgsrc/net/tigervnc

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Sep 14 21:50:24 UTC 2026

Modified Files:
        pkgsrc/net/tigervnc: Makefile distinfo
Added Files:
        pkgsrc/net/tigervnc/patches: patch-unix_xserver_os_xsha1.c

Log Message:
tigervnc: fix build on Linux


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/net/tigervnc/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/tigervnc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/tigervnc/patches/patch-unix_xserver_os_xsha1.c

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

Modified files:

Index: pkgsrc/net/tigervnc/Makefile
diff -u pkgsrc/net/tigervnc/Makefile:1.91 pkgsrc/net/tigervnc/Makefile:1.92
--- pkgsrc/net/tigervnc/Makefile:1.91   Wed Jun  3 11:28:53 2026
+++ pkgsrc/net/tigervnc/Makefile        Mon Sep 14 21:50:24 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2026/06/03 11:28:53 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2026/09/14 21:50:24 tnn Exp $
 
 DISTNAME=              tigervnc-1.16.2.20260506
 PKGREVISION=           1
@@ -47,6 +47,7 @@ BUILD_DEFS+=  PKG_SYSCONFBASE
 
 # CMake build appends 'tigervnc', so this is not PKG_SYSCONFDIR
 CMAKE_CONFIGURE_ARGS+=         -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFBASE}
+CMAKE_CONFIGURE_ARGS+=         -DENABLE_SELINUX=OFF
 
 # for reallocarray()
 CPPFLAGS.NetBSD+=      -D_OPENBSD_SOURCE

Index: pkgsrc/net/tigervnc/distinfo
diff -u pkgsrc/net/tigervnc/distinfo:1.34 pkgsrc/net/tigervnc/distinfo:1.35
--- pkgsrc/net/tigervnc/distinfo:1.34   Wed Jun  3 11:28:53 2026
+++ pkgsrc/net/tigervnc/distinfo        Mon Sep 14 21:50:24 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2026/06/03 11:28:53 wiz Exp $
+$NetBSD: distinfo,v 1.35 2026/09/14 21:50:24 tnn Exp $
 
 BLAKE2s (tigervnc-1.16.2.20260506-84e930679d831bcf51d5f95733689ada68dfd52a.tar.gz) = 982ce879ae06c85e75330e05890643c44157fa880e0b3e6740b05710846f493b
 SHA512 (tigervnc-1.16.2.20260506-84e930679d831bcf51d5f95733689ada68dfd52a.tar.gz) = 
4990a5aca9d16ff9683ced2c91c320ba022be9f0fa8a24a7b31fe3130d95cd64b5739ad331f9add74f8f36d565e1a9a28dbc6b514740a6b47337362ba2a5a4a3
@@ -15,3 +15,4 @@ SHA1 (patch-unix_xserver_hw_vnc_XserverD
 SHA1 (patch-unix_xserver_hw_vnc_vncBlockHandler.c) = b40191967d55b8556afbef3954763e11c3cbc9ee
 SHA1 (patch-unix_xserver_hw_xfree86_common_xf86Opt.h) = 65f6954c8d948ab0b905572153860e0cb0b8dfc4
 SHA1 (patch-unix_xserver_os_inputthread.c) = f7d4fb868f31f54b8593ef55261ee0f4da158775
+SHA1 (patch-unix_xserver_os_xsha1.c) = fc7387bf69b2060524f453ad35c86f9ca2eacb14

Added files:

Index: pkgsrc/net/tigervnc/patches/patch-unix_xserver_os_xsha1.c
diff -u /dev/null pkgsrc/net/tigervnc/patches/patch-unix_xserver_os_xsha1.c:1.1
--- /dev/null   Mon Sep 14 21:50:24 2026
+++ pkgsrc/net/tigervnc/patches/patch-unix_xserver_os_xsha1.c   Mon Sep 14 21:50:24 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-unix_xserver_os_xsha1.c,v 1.1 2026/09/14 21:50:24 tnn Exp $
+
+- handle nettle 4 API change
+
+--- unix/xserver/os/xsha1.c.orig       2026-05-24 10:08:04.017415329 +0000
++++ unix/xserver/os/xsha1.c
+@@ -143,7 +143,7 @@ x_sha1_final(void *ctx, unsigned char re
+ 
+ #elif defined(HAVE_SHA1_IN_LIBNETTLE)   /* Use libnettle for SHA1 */
+ 
+-#include <nettle/sha.h>
++#include <nettle/sha1.h>
+ 
+ void *
+ x_sha1_init(void)
+@@ -166,7 +166,7 @@ x_sha1_update(void *ctx, void *data, int
+ int
+ x_sha1_final(void *ctx, unsigned char result[20])
+ {
+-    sha1_digest(ctx, 20, result);
++    sha1_digest(ctx, result);
+     free(ctx);
+     return 1;
+ }