CVS commit: pkgsrc/net/tigervnc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/tigervnc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sun, 2 Feb 2025 16:23:07 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Feb  2 16:23:07 UTC 2025

Modified Files:
        pkgsrc/net/tigervnc: Makefile PLIST distinfo hacks.mk
        pkgsrc/net/tigervnc/patches: patch-unix_xserver_hw_vnc_Makefile.am
            patch-unix_xserver_os_inputthread.c
Added Files:
        pkgsrc/net/tigervnc/patches: patch-vncviewer_DesktopWindow.cxx
Removed Files:
        pkgsrc/net/tigervnc/patches: patch-vncviewer_BaseTouchHandler.h

Log Message:
net/tigervnc: Update to 1.14.1

>From micha@ via wip.

- Switch to FLTK 1.4
- Remove pkgsrc patch that was merged upstream

The bugfix release TigerVNC 1.14.1 is now available. This release fixes a
number of regressions, the most prominent being:

- Default installation of native viewer can once again handle VncAuth
- Graphic acceleration now can now be disabled through the vncserver config
  file the same way as other features
- Command vncpasswd can again correctly update passwords
- Native viewer once again consider passwd file that contain more than one
  password valid
- Native viewer can once again connect to RealVNC servers
- Users of x0vncserver should no longer experience the mouse cursor moving
  to the upper left corner
- H264 encoding no longer causes crashing


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/net/tigervnc/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/tigervnc/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/tigervnc/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/tigervnc/hacks.mk
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/tigervnc/patches/patch-unix_xserver_os_inputthread.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/net/tigervnc/patches/patch-vncviewer_BaseTouchHandler.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/tigervnc/patches/patch-vncviewer_DesktopWindow.cxx

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.77 pkgsrc/net/tigervnc/Makefile:1.78
--- pkgsrc/net/tigervnc/Makefile:1.77   Thu Nov 14 22:21:18 2024
+++ pkgsrc/net/tigervnc/Makefile        Sun Feb  2 16:23:06 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2024/11/14 22:21:18 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2025/02/02 16:23:06 wiz Exp $
 
-DISTNAME=              tigervnc-1.14.0
+DISTNAME=              tigervnc-1.14.1
 PKGNAME=               ${DISTNAME}.1.20.13
-PKGREVISION=           3
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=TigerVNC/}
 GITHUB_TAG=            v${DISTNAME:S/tigervnc-//}
@@ -142,14 +141,13 @@ pre-configure:
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/fltk/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
-BUILDLINK_API_DEPENDS.fltk+=   fltk>=1.3.3
-.include "../../x11/fltk13/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"
@@ -162,4 +160,5 @@ BUILDLINK_API_DEPENDS.fltk+=        fltk>=1.3.3
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/tigervnc/PLIST
diff -u pkgsrc/net/tigervnc/PLIST:1.11 pkgsrc/net/tigervnc/PLIST:1.12
--- pkgsrc/net/tigervnc/PLIST:1.11      Mon Jun  5 08:29:59 2023
+++ pkgsrc/net/tigervnc/PLIST   Sun Feb  2 16:23:06 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2023/06/05 08:29:59 hauke Exp $
+@comment $NetBSD: PLIST,v 1.12 2025/02/02 16:23:06 wiz Exp $
 bin/Xvnc
 bin/vncconfig
 bin/vncpasswd

Index: pkgsrc/net/tigervnc/distinfo
diff -u pkgsrc/net/tigervnc/distinfo:1.26 pkgsrc/net/tigervnc/distinfo:1.27
--- pkgsrc/net/tigervnc/distinfo:1.26   Thu Oct 10 20:12:16 2024
+++ pkgsrc/net/tigervnc/distinfo        Sun Feb  2 16:23:06 2025
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.26 2024/10/10 20:12:16 nia Exp $
+$NetBSD: distinfo,v 1.27 2025/02/02 16:23:06 wiz Exp $
 
-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 (tigervnc-1.14.1.tar.gz) = 1191cbae8001769eb5a57078782f858ad18c95ba5f2469ade773f3e51ff432ea
+SHA512 (tigervnc-1.14.1.tar.gz) = d7a6cff4a3a1e4c30e2dbd6e17ad2d76145e76f5c1a93abbaf32b1c488377a4eaf936d4e8a24a97863948138ba40031c862f9da1c1cd427da35ebffa8eaa4f31
+Size (tigervnc-1.14.1.tar.gz) = 2097932 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-media_CMakeLists.txt) = e6455ee29679ee99f7457a9471928aa10284e971
 SHA1 (patch-unix_tx_TXDialog.h) = ba35a1ff22c1c42cafb4ad1ef14b53ff2faba47a
 SHA1 (patch-unix_vncserver_vncserver.in) = 6b72c2b3a23428b2a752d956b83f227247fd8da7
-SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = ef2899e4afb1640cf0c829bd1b41a6e3c0fcec4a
+SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = 4ef672a8836883cba95d6e6ac6e48ff55331f478
 SHA1 (patch-unix_xserver_hw_vnc_vncBlockHandler.c) = 534a621aab793625c27737d42c5bf12c9574a414
-SHA1 (patch-unix_xserver_os_inputthread.c) = da8f1a6ab905d2569f61e92d8cf9891ed14ec42a
-SHA1 (patch-vncviewer_BaseTouchHandler.h) = f820e37a4087dffc1647f3c80e9e62899cd7905e
+SHA1 (patch-unix_xserver_os_inputthread.c) = f7d4fb868f31f54b8593ef55261ee0f4da158775
+SHA1 (patch-vncviewer_DesktopWindow.cxx) = 42ac9b8a70f55ed4ca8827f299c7b5cf2eaa55b7

Index: pkgsrc/net/tigervnc/hacks.mk
diff -u pkgsrc/net/tigervnc/hacks.mk:1.3 pkgsrc/net/tigervnc/hacks.mk:1.4
--- pkgsrc/net/tigervnc/hacks.mk:1.3    Tue Aug 27 07:31:12 2024
+++ pkgsrc/net/tigervnc/hacks.mk        Sun Feb  2 16:23:06 2025
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.3 2024/08/27 07:31:12 wiz Exp $
+# $NetBSD: hacks.mk,v 1.4 2025/02/02 16:23:06 wiz Exp $
 
 .if !defined(TIGERVNC_HACKS_MK)
 TIGERVNC_HACKS_MK=     defined

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.6 pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am:1.7
--- pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am:1.6       Tue Aug 27 07:31:13 2024
+++ pkgsrc/net/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am   Sun Feb  2 16:23:06 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-unix_xserver_hw_vnc_Makefile.am,v 1.6 2024/08/27 07:31:13 wiz Exp $
+$NetBSD: patch-unix_xserver_hw_vnc_Makefile.am,v 1.7 2025/02/02 16:23:06 wiz Exp $
 
---- unix/xserver/hw/vnc/Makefile.am.orig       2024-07-23 08:50:25.000000000 +0000
+--- unix/xserver/hw/vnc/Makefile.am.orig       2024-10-22 13:45:27.000000000 +0000
 +++ unix/xserver/hw/vnc/Makefile.am
 @@ -14,6 +14,9 @@ AM_CPPFLAGS = \
        -I$(TIGERVNC_SRCDIR)/unix/common \
-       $(DIX_CFLAGS)
+       $(DIX_CFLAGS) $(LIBXCVT_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 \
-@@ -78,6 +81,6 @@ libvnc_la_CPPFLAGS = $(AM_CPPFLAGS) \
+@@ -82,6 +85,6 @@ libvnc_la_CPPFLAGS = $(AM_CPPFLAGS) \
  
  libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
  

Index: pkgsrc/net/tigervnc/patches/patch-unix_xserver_os_inputthread.c
diff -u pkgsrc/net/tigervnc/patches/patch-unix_xserver_os_inputthread.c:1.1 pkgsrc/net/tigervnc/patches/patch-unix_xserver_os_inputthread.c:1.2
--- pkgsrc/net/tigervnc/patches/patch-unix_xserver_os_inputthread.c:1.1 Sun May 16 21:06:43 2021
+++ pkgsrc/net/tigervnc/patches/patch-unix_xserver_os_inputthread.c     Sun Feb  2 16:23:06 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix_xserver_os_inputthread.c,v 1.1 2021/05/16 21:06:43 wiz Exp $
+$NetBSD: patch-unix_xserver_os_inputthread.c,v 1.2 2025/02/02 16:23:06 wiz Exp $
 
 --- unix/xserver/os/inputthread.c.orig 2021-04-28 14:41:01.046740215 +0000
 +++ unix/xserver/os/inputthread.c
-@@ -318,7 +317,9 @@ InputThreadDoWork(void *arg)
+@@ -318,7 +318,9 @@ InputThreadDoWork(void *arg)
      sigfillset(&set);
      pthread_sigmask(SIG_BLOCK, &set, NULL);
  

Added files:

Index: pkgsrc/net/tigervnc/patches/patch-vncviewer_DesktopWindow.cxx
diff -u /dev/null pkgsrc/net/tigervnc/patches/patch-vncviewer_DesktopWindow.cxx:1.1
--- /dev/null   Sun Feb  2 16:23:07 2025
+++ pkgsrc/net/tigervnc/patches/patch-vncviewer_DesktopWindow.cxx       Sun Feb  2 16:23:06 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-vncviewer_DesktopWindow.cxx,v 1.1 2025/02/02 16:23:06 wiz Exp $
+
+A method Fl__Window::maximize() was added in FLTK 1.4, it should not be
+called by this code written for FLTK 1.3.
+<https://github.com/TigerVNC/tigervnc/pull/1887>
+
+--- vncviewer/DesktopWindow.cxx.orig   2024-10-22 13:45:27.000000000 +0000
++++ vncviewer/DesktopWindow.cxx
+@@ -174,7 +174,7 @@ DesktopWindow::DesktopWindow(int w, int 
+ #ifdef __APPLE__
+   // On OS X we can do the maximize thing properly before the
+   // window is showned. Other platforms handled further down...
+-  if (maximize) {
++  if (::maximize) {
+     int dummy;
+     Fl::screen_work_area(dummy, dummy, w, h, geom_x, geom_y);
+   }
+@@ -208,7 +208,7 @@ DesktopWindow::DesktopWindow(int w, int 
+   // maximized property on Windows and X11 before showing the window.
+   // See STR #2083 and STR #2178
+ #ifndef __APPLE__
+-  if (maximize) {
++  if (::maximize) {
+     maximizeWindow();
+   }
+ #endif

Prev by Date: CVS commit: pkgsrc/lang/ghc910
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/lang/ghc910
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index