net/tigervnc: Update to 1.14.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: net/tigervnc: Update to 1.14.1
From: Michael Baeuerle (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Fri, 24 Jan 2025 13:31:04 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Jan 24 14:29:57 2025 +0100
Changeset:	040c3302070c4149f97a72bbf9a827af5c81d63f

Modified Files:
	tigervnc/COMMIT_MSG
	tigervnc/Makefile
	tigervnc/distinfo
	tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
Added Files:
	tigervnc/patches/patch-vncviewer_DesktopWindow.cxx
Removed Files:
	tigervnc/TODO
	tigervnc/patches/patch-vncviewer_BaseTouchHandler.h

Log Message:
net/tigervnc: Update to 1.14.1

- 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 see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=040c3302070c4149f97a72bbf9a827af5c81d63f

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

diffstat:
 tigervnc/COMMIT_MSG                                | 21 +++++++++++++++++-
 tigervnc/Makefile                                  |  4 ++--
 tigervnc/TODO                                      |  1 -
 tigervnc/distinfo                                  | 10 ++++-----
 .../patches/patch-unix_xserver_hw_vnc_Makefile.am  |  6 +++---
 .../patches/patch-vncviewer_BaseTouchHandler.h     | 16 --------------
 tigervnc/patches/patch-vncviewer_DesktopWindow.cxx | 25 ++++++++++++++++++++++
 7 files changed, 55 insertions(+), 28 deletions(-)

diffs:
diff --git a/tigervnc/COMMIT_MSG b/tigervnc/COMMIT_MSG
index d0c6e818ab..73e3ddd9b6 100644
--- a/tigervnc/COMMIT_MSG
+++ b/tigervnc/COMMIT_MSG
@@ -1 +1,20 @@
-net/tigervnc: Switch to FLTK 1.4.
+net/tigervnc: Update to 1.14.1
+
+- Switch to cmake/build.mk
+- 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
diff --git a/tigervnc/Makefile b/tigervnc/Makefile
index 3fc50b351d..93c328cf02 100644
--- a/tigervnc/Makefile
+++ b/tigervnc/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD$
 
-DISTNAME=		tigervnc-1.14.0
+DISTNAME=		tigervnc-1.14.1
 PKGNAME=		${DISTNAME}.1.20.13
-PKGREVISION=		4
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GITHUB:=TigerVNC/}
 GITHUB_TAG=		v${DISTNAME:S/tigervnc-//}
@@ -161,4 +160,5 @@ pre-configure:
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/tigervnc/TODO b/tigervnc/TODO
deleted file mode 100644
index 36faa48c5e..0000000000
--- a/tigervnc/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Does not build if FLTK 1.4 option "cairo" is enabled.
diff --git a/tigervnc/distinfo b/tigervnc/distinfo
index 1235787d96..3da4c8b1ed 100644
--- a/tigervnc/distinfo
+++ b/tigervnc/distinfo
@@ -1,15 +1,15 @@
 $NetBSD$
 
-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-vncviewer_DesktopWindow.cxx) = 956998f4eaf74fec744f6852d46964506707ed7d
diff --git a/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am b/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
index c7c6f1801a..96c253608f 100644
--- a/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
+++ b/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
@@ -1,10 +1,10 @@
 $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	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_Makefile.am,v 1.6 2024/08/27 07:31:13 wiz Exp
  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
  
diff --git a/tigervnc/patches/patch-vncviewer_BaseTouchHandler.h b/tigervnc/patches/patch-vncviewer_BaseTouchHandler.h
deleted file mode 100644
index 327e61d7f1..0000000000
--- a/tigervnc/patches/patch-vncviewer_BaseTouchHandler.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-vncviewer_BaseTouchHandler.h,v 1.2 2024/08/27 07:33:11 wiz Exp $
-
-Add header for struct timeval.
-https://github.com/TigerVNC/tigervnc/pull/1824
-
---- 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();
diff --git a/tigervnc/patches/patch-vncviewer_DesktopWindow.cxx b/tigervnc/patches/patch-vncviewer_DesktopWindow.cxx
new file mode 100644
index 0000000000..b868e77e8e
--- /dev/null
+++ b/tigervnc/patches/patch-vncviewer_DesktopWindow.cxx
@@ -0,0 +1,25 @@
+$NetBSD$
+
+A method Fl__Window::maximize() was added in FLTK 1.4, it should not be
+called by this code written for FLTK 1.3.
+
+--- 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: flwm: Test with FLTK 1.4
Next by Date: tigervnc: Add link to Github PR in patch
Previous by Thread: flwm: Test with FLTK 1.4
Next by Thread: tigervnc: Add link to Github PR in patch
Indexes:
Home | Main Index | Thread Index | Old Index