CVS commit: pkgsrc/net/tigervnc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 27 07:31:13 UTC 2024

Modified Files:
        pkgsrc/net/tigervnc: Makefile distinfo hacks.mk
        pkgsrc/net/tigervnc/files: vncserver.pl
        pkgsrc/net/tigervnc/patches: patch-unix_vncserver_vncserver.in
            patch-unix_xserver_hw_vnc_Makefile.am
Added Files:
        pkgsrc/net/tigervnc/patches: patch-vncviewer_BaseTouchHandler.h
Removed Files:
        pkgsrc/net/tigervnc/patches: patch-CMakeLists.txt
            patch-common_rfb_util.h patch-unix_xserver_hw_vnc_vncModule.c

Log Message:
tigervnc: update to 1.14.0.1.20.13.

pkgsrc change: follow the 1.14.0 release and use .config/tigervnc instead of .vnc.

TODO: find out if we still need files/vncserver.pl

Changes:

TigerVNC 1.14.0 is now available. The most prominent changes in this release are:

Xvnc now supports hardware accelerated OpenGL and Vulkan on drivers that supports GBM¹
The viewers and servers now follow the XDG Base Directory Specification, like "~/.config", for storing files in the home directory. Existing users will continue using the legacy "~/.vnc" directory, 
but new users will get the XDG directories.
The native viewer now supports Apple's Diffie-Hellman and UltraVNC's MSLogonII authentication methods
The Java viewer now supports RealVNC's RSA-AES authentication method
Ubuntu 24.04 packages have been added
Red Hat Enterprise Linux 7 and Ubuntu 18.04 packages have been removed as they are EOL
The native viewer has received a mild refresh of the UI appearance
Reverse connections can now be forced to be view-only
The special "%u" marker can be specified for "PlainUsers" to dynamically indicate the user running the server
vncserver can be run without forking for better compatibility with more system service managers
x0vncserver now supports systemd socket activation


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/net/tigervnc/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/tigervnc/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/tigervnc/hacks.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/tigervnc/files/vncserver.pl
cvs rdiff -u -r1.6 -r0 pkgsrc/net/tigervnc/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 pkgsrc/net/tigervnc/patches/patch-common_rfb_util.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/tigervnc/patches/patch-unix_vncserver_vncserver.in
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_vncModule.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/tigervnc/patches/patch-vncviewer_BaseTouchHandler.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.73 pkgsrc/net/tigervnc/Makefile:1.74
--- pkgsrc/net/tigervnc/Makefile:1.73   Sun Aug 25 06:19:08 2024
+++ pkgsrc/net/tigervnc/Makefile        Tue Aug 27 07:31:12 2024
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.73 2024/08/25 06:19:08 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2024/08/27 07:31:12 wiz Exp $
 
-DISTNAME=              tigervnc-1.13.1
+DISTNAME=              tigervnc-1.14.0
 PKGNAME=               ${DISTNAME}.1.20.13
-PKGREVISION=           8
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=TigerVNC/}
-GITHUB_TAG=            v1.13.1
+GITHUB_TAG=            v${DISTNAME:S/tigervnc-//}
 XORG_SERVER_FILE=      xorg-server-1.20.13
 SITES.${XORG_SERVER_FILE}.tar.xz=      ${MASTER_SITE_XORG:=xserver/}
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.xz
@@ -39,6 +38,8 @@ BUILD_DIRS=   . unix/xserver
 INSTALL_DIRS=  . unix/xserver/hw/vnc
 INSTALL_TARGET=        install
 
+BUILD_DEFS+=   PKG_SYSCONFBASE
+
 # CMake build appends 'tigervnc', so this is not PKG_SYSCONFDIR
 CMAKE_CONFIGURE_ARGS+=         -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFBASE}
 

Index: pkgsrc/net/tigervnc/distinfo
diff -u pkgsrc/net/tigervnc/distinfo:1.23 pkgsrc/net/tigervnc/distinfo:1.24
--- pkgsrc/net/tigervnc/distinfo:1.23   Tue Apr 18 18:48:14 2023
+++ pkgsrc/net/tigervnc/distinfo        Tue Aug 27 07:31:12 2024
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.23 2023/04/18 18:48:14 abs Exp $
+$NetBSD: distinfo,v 1.24 2024/08/27 07:31:12 wiz Exp $
 
-BLAKE2s (tigervnc-1.13.1.tar.gz) = 1173484c18eeac14b668059e13aaf18f5f59a2bb69771ff08d958014d46f6e90
-SHA512 (tigervnc-1.13.1.tar.gz) = 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
-Size (tigervnc-1.13.1.tar.gz) = 1989081 bytes
+BLAKE2s (tigervnc-1.14.0.tar.gz) = 6706146e17534a9cd53a3b631928a7634e8dc3271b45e07aaba5cdb6ff4de130
+SHA512 (tigervnc-1.14.0.tar.gz) = ee36f0aa40957274fb00fd755624a8bea80432d797d6c183645ed1251058ab30594d2261693b5655c5ca85a22e53f93029eeccc51fe86780398d1a017fa2311c
+Size (tigervnc-1.14.0.tar.gz) = 2090452 bytes
 BLAKE2s (xorg-server-1.20.13.tar.xz) = d5fd79e44b64fb79506673ab2a851b2bfad0ee5dd1bbb6477f645ca05237a9fc
 SHA512 (xorg-server-1.20.13.tar.xz) = 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3
 Size (xorg-server-1.20.13.tar.xz) = 5122260 bytes
-SHA1 (patch-CMakeLists.txt) = 97fffe92bb6bbd5094a0bef0b6d09f6b153c2563
-SHA1 (patch-common_rfb_util.h) = 73d5fc206e192b936c224cedf5857980fca69eb0
 SHA1 (patch-media_CMakeLists.txt) = e6455ee29679ee99f7457a9471928aa10284e971
-SHA1 (patch-unix_vncserver_vncserver.in) = 715f16a4be6806778fd0a9d781e920771e35d0ca
-SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = df31836e27bb535b307404adb55e239f10bbe6c4
+SHA1 (patch-unix_vncserver_vncserver.in) = 6b72c2b3a23428b2a752d956b83f227247fd8da7
+SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = ef2899e4afb1640cf0c829bd1b41a6e3c0fcec4a
 SHA1 (patch-unix_xserver_hw_vnc_vncBlockHandler.c) = 534a621aab793625c27737d42c5bf12c9574a414
-SHA1 (patch-unix_xserver_hw_vnc_vncModule.c) = 77aff6c2bb19e6936302c783b72d581e7d6388f5
 SHA1 (patch-unix_xserver_os_inputthread.c) = da8f1a6ab905d2569f61e92d8cf9891ed14ec42a
+SHA1 (patch-vncviewer_BaseTouchHandler.h) = 058b4f0a2c9f7240bb745de0eca4de376173ee9d

Index: pkgsrc/net/tigervnc/hacks.mk
diff -u pkgsrc/net/tigervnc/hacks.mk:1.2 pkgsrc/net/tigervnc/hacks.mk:1.3
--- pkgsrc/net/tigervnc/hacks.mk:1.2    Sun Apr 14 09:14:03 2024
+++ pkgsrc/net/tigervnc/hacks.mk        Tue Aug 27 07:31:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2024/04/14 09:14:03 pho Exp $
+# $NetBSD: hacks.mk,v 1.3 2024/08/27 07:31:12 wiz Exp $
 
 .if !defined(TIGERVNC_HACKS_MK)
 TIGERVNC_HACKS_MK=     defined
@@ -18,7 +18,7 @@ TIGERVNC_HACKS_MK=    defined
 ### regression.
 ###
 .if ${MACHINE_PLATFORM:MNetBSD-9.*-aarch64} || \
-       ${MACHINE_PLATFORM:MNetBSD-10.0-aarch64}
+       ${MACHINE_PLATFORM} == NetBSD-10.0-aarch64
 PKG_HACKS+=    smart-scheduler-workaround
 CONFIGURE_ENV+=        ac_cv_func_setitimer=no
 .endif

Index: pkgsrc/net/tigervnc/files/vncserver.pl
diff -u pkgsrc/net/tigervnc/files/vncserver.pl:1.4 pkgsrc/net/tigervnc/files/vncserver.pl:1.5
--- pkgsrc/net/tigervnc/files/vncserver.pl:1.4  Fri Nov 26 16:47:21 2021
+++ pkgsrc/net/tigervnc/files/vncserver.pl      Tue Aug 27 07:31:12 2024
@@ -43,7 +43,7 @@ if($slashndx>=0) {
 $geometry = "1024x768";
 #$depth = 16;
 
-$vncUserDir = "$ENV{HOME}/.vnc";
+$vncUserDir = "$ENV{HOME}/.config/tigervnc";
 $vncUserConfig = "$vncUserDir/config";
 
 $vncSystemConfigDir = "/etc/tigervnc";

Index: pkgsrc/net/tigervnc/patches/patch-unix_vncserver_vncserver.in
diff -u pkgsrc/net/tigervnc/patches/patch-unix_vncserver_vncserver.in:1.1 pkgsrc/net/tigervnc/patches/patch-unix_vncserver_vncserver.in:1.2
--- pkgsrc/net/tigervnc/patches/patch-unix_vncserver_vncserver.in:1.1   Sun May 16 21:06:43 2021
+++ pkgsrc/net/tigervnc/patches/patch-unix_vncserver_vncserver.in       Tue Aug 27 07:31:13 2024
@@ -1,4 +1,6 @@
-$NetBSD: patch-unix_vncserver_vncserver.in,v 1.1 2021/05/16 21:06:43 wiz Exp $
+$NetBSD: patch-unix_vncserver_vncserver.in,v 1.2 2024/08/27 07:31:13 wiz Exp $
+
+Add NetBSD and pkgsrc font paths to default search path.
 
 --- unix/vncserver/vncserver.in.orig   2020-09-08 12:16:08.000000000 +0000
 +++ unix/vncserver/vncserver.in

Index: pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
diff -u pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am:1.5 pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am:1.6
--- pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am:1.5       Sun May 16 21:06:43 2021
+++ pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am   Tue Aug 27 07:31:13 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-unix_xserver_hw_vnc_Makefile.am,v 1.5 2021/05/16 21:06:43 wiz Exp $
+$NetBSD: patch-unix_xserver_hw_vnc_Makefile.am,v 1.6 2024/08/27 07:31:13 wiz Exp $
 
---- unix/xserver/hw/vnc/Makefile.am.orig       2020-09-08 12:16:08.000000000 +0000
+--- unix/xserver/hw/vnc/Makefile.am.orig       2024-07-23 08:50:25.000000000 +0000
 +++ unix/xserver/hw/vnc/Makefile.am
-@@ -8,6 +8,9 @@ NETWORK_LIB=$(TIGERVNC_BUILDDIR)/common/
- UNIXCOMMON_LIB=$(TIGERVNC_BUILDDIR)/unix/common/libunixcommon.la
- COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(OS_LIB) $(UNIXCOMMON_LIB)
+@@ -14,6 +14,9 @@ AM_CPPFLAGS = \
+       -I$(TIGERVNC_SRCDIR)/unix/common \
+       $(DIX_CFLAGS)
  
 +# Hack to get the C headers to work when included from C++ code
 +AM_CXXFLAGS = -fpermissive
@@ -12,7 +12,7 @@ $NetBSD: patch-unix_xserver_hw_vnc_Makef
  noinst_LTLIBRARIES = libvnccommon.la
  
  HDRS = vncExtInit.h vncHooks.h \
-@@ -67,6 +70,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
+@@ -78,6 +81,6 @@ libvnc_la_CPPFLAGS = $(AM_CPPFLAGS) \
  
  libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
  

Added files:

Index: pkgsrc/net/tigervnc/patches/patch-vncviewer_BaseTouchHandler.h
diff -u /dev/null pkgsrc/net/tigervnc/patches/patch-vncviewer_BaseTouchHandler.h:1.1
--- /dev/null   Tue Aug 27 07:31:13 2024
+++ pkgsrc/net/tigervnc/patches/patch-vncviewer_BaseTouchHandler.h      Tue Aug 27 07:31:13 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-vncviewer_BaseTouchHandler.h,v 1.1 2024/08/27 07:31:13 wiz Exp $
+
+Fix struct timeval.
+
+--- vncviewer/BaseTouchHandler.h.orig  2024-08-27 07:20:49.287724400 +0000
++++ vncviewer/BaseTouchHandler.h
+@@ -22,6 +22,8 @@
+ 
+ #include "GestureEvent.h"
+ 
++#include <time.h>
++
+ class BaseTouchHandler {
+   public:
+     virtual ~BaseTouchHandler();