CVS commit: pkgsrc/net/tigervnc

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Oct  4 10:26:57 UTC 2025

Modified Files:
        pkgsrc/net/tigervnc: Makefile distinfo
Added Files:
        pkgsrc/net/tigervnc/patches:
            patch-unix_xserver_hw_xfree86_common_xf86Opt.h

Log Message:
tigervnc: fix build w/ GCC 15


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/net/tigervnc/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/tigervnc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_xfree86_common_xf86Opt.h

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.81 pkgsrc/net/tigervnc/Makefile:1.82
--- pkgsrc/net/tigervnc/Makefile:1.81   Thu Apr 24 14:15:29 2025
+++ pkgsrc/net/tigervnc/Makefile        Sat Oct  4 10:26:56 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2025/04/24 14:15:29 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2025/10/04 10:26:56 tnn Exp $
 
 DISTNAME=              tigervnc-1.15.0
 PKGNAME=               ${DISTNAME}.1.20.13
@@ -66,6 +66,8 @@ SUBST_VARS.hpath+=    PREFIX X11BASE
 REPLACE_PERL+=         unix/vncserver
 REPLACE_PERL+=         vncserver.pl
 
+CHECK_PORTABILITY_SKIP+=       unix/xserver/hw/xquartz/bundle/mk_bundke.sh
+
 post-extract:
        cd ${WRKDIR} && ${EXTRACTOR} ${_DISTDIR}/${XORG_SERVER_FILE}.tar.xz
        cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver

Index: pkgsrc/net/tigervnc/distinfo
diff -u pkgsrc/net/tigervnc/distinfo:1.28 pkgsrc/net/tigervnc/distinfo:1.29
--- pkgsrc/net/tigervnc/distinfo:1.28   Mon Feb 24 13:04:58 2025
+++ pkgsrc/net/tigervnc/distinfo        Sat Oct  4 10:26:56 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2025/02/24 13:04:58 wiz Exp $
+$NetBSD: distinfo,v 1.29 2025/10/04 10:26:56 tnn Exp $
 
 BLAKE2s (tigervnc-1.15.0.tar.gz) = ef9af0bf4942dcdcb2bc8834dc611a77a5a549210cde2699e2d11d4e5091ea17
 SHA512 (tigervnc-1.15.0.tar.gz) = 0b550296b5bd06ac9d63ce10861ff54d24e79b6ac1551d80e9b81845fa873d85bfd684112c66d86188c9c61fdffb9421ea8696c1c7fd15a24fb1bf6bfe6a5e05
@@ -11,5 +11,6 @@ SHA1 (patch-unix_tx_TXDialog.h) = ba35a1
 SHA1 (patch-unix_vncserver_vncserver.in) = 6b72c2b3a23428b2a752d956b83f227247fd8da7
 SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = 96303b933b28c834e08c3f8c4d7a8d0636f371c1
 SHA1 (patch-unix_xserver_hw_vnc_vncBlockHandler.c) = 534a621aab793625c27737d42c5bf12c9574a414
+SHA1 (patch-unix_xserver_hw_xfree86_common_xf86Opt.h) = 65f6954c8d948ab0b905572153860e0cb0b8dfc4
 SHA1 (patch-unix_xserver_os_inputthread.c) = f7d4fb868f31f54b8593ef55261ee0f4da158775
 SHA1 (patch-vncviewer_DesktopWindow.cxx) = 42ac9b8a70f55ed4ca8827f299c7b5cf2eaa55b7

Added files:

Index: pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_xfree86_common_xf86Opt.h
diff -u /dev/null pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_xfree86_common_xf86Opt.h:1.1
--- /dev/null   Sat Oct  4 10:26:57 2025
+++ pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_xfree86_common_xf86Opt.h  Sat Oct  4 10:26:56 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-unix_xserver_hw_xfree86_common_xf86Opt.h,v 1.1 2025/10/04 10:26:56 tnn Exp $
+
+- don't conflict w/ C23 bool
+
+--- unix/xserver/hw/xfree86/common/xf86Opt.h.orig      2025-10-04 10:22:49.197046394 +0000
++++ unix/xserver/hw/xfree86/common/xf86Opt.h
+@@ -41,7 +41,7 @@ typedef union {
+     unsigned long num;
+     const char *str;
+     double realnum;
+-    Bool bool;
++    Bool bool_;
+     OptFrequency freq;
+ } ValueUnion;
+