diff --git a/x11-packages/tigervnc/build.sh b/x11-packages/tigervnc/build.sh
index df9dbaae44cb18..cc727d2fb06eb3 100644
--- a/x11-packages/tigervnc/build.sh
+++ b/x11-packages/tigervnc/build.sh
@@ -2,15 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://tigervnc.org/
 TERMUX_PKG_DESCRIPTION="Suite of VNC servers. Based on the VNC 4 branch of TightVNC."
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-# No update anymore. v1.11.x requires support of PAM.
-TERMUX_PKG_VERSION=(1.10.1
+TERMUX_PKG_VERSION=(1.14.1
                     21.1.8)
-TERMUX_PKG_REVISION=41
-TERMUX_PKG_SRCURL=(https://github.com/TigerVNC/tigervnc/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SRCURL=(https://github.com/TigerVNC/tigervnc/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
                    https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION[1]}.tar.xz)
-TERMUX_PKG_SHA256=(19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4
+TERMUX_PKG_SHA256=(579d0d04eb5b806d240e99a3c756b38936859e6f7db2f4af0d5656cc9a989d7c
                    38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152)
-TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libgnutls, libjpeg-turbo, libpixman, libx11, libxau, libxdamage, libxdmcp, libxext, libxfixes, libxfont2, libxrandr, libxtst, opengl, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp, zlib"
+TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libgmp, libgnutls, libjpeg-turbo, libnettle, libpixman, libx11, libxau, libxdamage, libxdmcp, libxext, libxfixes, libxfont2, libxrandr, libxshmfence, libxtst, opengl, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp, zlib"
 TERMUX_PKG_BUILD_DEPENDS="xorg-font-util, xorg-server-xvfb, xorg-util-macros, xorgproto, xtrans"
 TERMUX_PKG_SUGGESTS="aterm, xorg-twm"
 
diff --git a/x11-packages/tigervnc/disable-pam.patch b/x11-packages/tigervnc/disable-pam.patch
new file mode 100644
index 00000000000000..2443a13e398322
--- /dev/null
+++ b/x11-packages/tigervnc/disable-pam.patch
@@ -0,0 +1,48 @@
++++ ./CMakeLists.txt	2018-09-12 11:14:21.772989769 +0300
+@@ -288,7 +288,7 @@
+ endif()
+ 
+ # Check for PAM library
+-if(UNIX AND NOT APPLE)
++if(FALSE)
+   check_include_files(security/pam_appl.h HAVE_PAM_H)
+   set(CMAKE_REQUIRED_LIBRARIES -lpam)
+   check_function_exists(pam_start HAVE_PAM_START)
+@@ -351,7 +351,6 @@
+   add_subdirectory(media)
+ endif()
+ 
+-add_subdirectory(tests)
+ 
+ 
+ if(BUILD_VIEWER)
++++ ./common/rfb/CMakeLists.txt
+@@ -92,7 +92,7 @@
+   target_sources(rfb PRIVATE WinPasswdValidator.cxx)
+ endif(WIN32)
+ 
+-if(UNIX AND NOT APPLE)
++if(FALSE)
+   target_sources(rfb PRIVATE UnixPasswordValidator.cxx pam.c)
+   target_link_libraries(rfb ${PAM_LIBS})
+ endif()
++++ ./unix/CMakeLists.txt
+@@ -6,5 +6,4 @@
+ add_subdirectory(common)
+ add_subdirectory(vncconfig)
+ add_subdirectory(vncpasswd)
+-add_subdirectory(vncserver)
+ add_subdirectory(x0vncserver)
+
++++ ./common/rfb/UnixPasswordValidator.h
+@@ -28,7 +28,7 @@
+   class UnixPasswordValidator: public PasswordValidator {
+   protected:
+     bool validateInternal(SConnection * sc, const char *username,
+-			   const char *password);
++			   const char *password) { return false; }
+   };
+ }
+ 
+
+
diff --git a/x11-packages/tigervnc/tigervnc-1.10.1-boolparam-0.patch b/x11-packages/tigervnc/tigervnc-1.10.1-boolparam-0.patch
deleted file mode 100644
index a7fc53ac70b3bc..00000000000000
--- a/x11-packages/tigervnc/tigervnc-1.10.1-boolparam-0.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-https://github.com/TigerVNC/tigervnc/commit/38c6848b30cb1908171f2b4628e345fbf6727b39
-
-Patch for vncserver.in is omitted.
-
-From 38c6848b30cb1908171f2b4628e345fbf6727b39 Mon Sep 17 00:00:00 2001
-From: Pierre Ossman <ossman@cendio.se>
-Date: Fri, 18 Sep 2020 10:44:32 +0200
-Subject: [PATCH] Tolerate specifying -BoolParam 0 and similar
-
-This is needed by vncserver which doesn't know which parameters are
-boolean, and it cannot use the -Param=Value form as that isn't tolerated
-by the Xorg code.
----
- unix/vncserver/vncserver.in    |  8 ++++----
- unix/xserver/hw/vnc/RFBGlue.cc | 16 ++++++++++++++++
- unix/xserver/hw/vnc/RFBGlue.h  |  1 +
- unix/xserver/hw/vnc/xvnc.c     | 14 ++++++++++++++
- vncviewer/vncviewer.cxx        | 20 ++++++++++++++++++++
- 5 files changed, 55 insertions(+), 4 deletions(-)
-
-diff --git a/unix/xserver/hw/vnc/RFBGlue.cc b/unix/xserver/hw/vnc/RFBGlue.cc
-index f108fae43..7c32bea8f 100644
---- a/unix/xserver/hw/vnc/RFBGlue.cc
-+++ b/unix/xserver/hw/vnc/RFBGlue.cc
-@@ -143,6 +143,22 @@ const char* vncGetParamDesc(const char *name)
-   return param->getDescription();
- }
- 
-+int vncIsParamBool(const char *name)
-+{
-+  VoidParameter *param;
-+  BoolParameter *bparam;
-+
-+  param = rfb::Configuration::getParam(name);
-+  if (param == NULL)
-+    return false;
-+
-+  bparam = dynamic_cast<BoolParameter*>(param);
-+  if (bparam == NULL)
-+    return false;
-+
-+  return true;
-+}
-+
- int vncGetParamCount(void)
- {
-   int count;
-diff --git a/unix/xserver/hw/vnc/RFBGlue.h b/unix/xserver/hw/vnc/RFBGlue.h
-index 112405b84..695cea105 100644
---- a/unix/xserver/hw/vnc/RFBGlue.h
-+++ b/unix/xserver/hw/vnc/RFBGlue.h
-@@ -41,6 +41,7 @@ int vncSetParam(const char *name, const char *value);
- int vncSetParamSimple(const char *nameAndValue);
- char* vncGetParam(const char *name);
- const char* vncGetParamDesc(const char *name);
-+int vncIsParamBool(const char *name);
- 
- int vncGetParamCount(void);
- char *vncGetParamList(void);
-diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
-index 4eb0b0b13..5744acac8 100644
---- a/unix/xserver/hw/vnc/xvnc.c
-+++ b/unix/xserver/hw/vnc/xvnc.c
-@@ -618,6 +618,20 @@ ddxProcessArgument(int argc, char *argv[], int i)
-         exit(0);
-     }
- 
-+    /* We need to resolve an ambiguity for booleans */
-+    if (argv[i][0] == '-' && i+1 < argc &&
-+        vncIsParamBool(&argv[i][1])) {
-+        if ((strcasecmp(argv[i+1], "0") == 0) ||
-+            (strcasecmp(argv[i+1], "1") == 0) ||
-+            (strcasecmp(argv[i+1], "true") == 0) ||
-+            (strcasecmp(argv[i+1], "false") == 0) ||
-+            (strcasecmp(argv[i+1], "yes") == 0) ||
-+            (strcasecmp(argv[i+1], "no") == 0)) {
-+            vncSetParam(&argv[i][1], argv[i+1]);
-+            return 2;
-+        }
-+    }
-+
-     if (vncSetParamSimple(argv[i]))
- 	return 1;
-     
-diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
-index d4dd3063c..77ba3d3f4 100644
---- a/vncviewer/vncviewer.cxx
-+++ b/vncviewer/vncviewer.cxx
-@@ -556,6 +556,26 @@ int main(int argc, char** argv)
-   }
- 
-   for (int i = 1; i < argc;) {
-+    /* We need to resolve an ambiguity for booleans */
-+    if (argv[i][0] == '-' && i+1 < argc) {
-+        VoidParameter *param;
-+
-+        param = Configuration::getParam(&argv[i][1]);
-+        if ((param != NULL) &&
-+            (dynamic_cast<BoolParameter*>(param) != NULL)) {
-+          if ((strcasecmp(argv[i+1], "0") == 0) ||
-+              (strcasecmp(argv[i+1], "1") == 0) ||
-+              (strcasecmp(argv[i+1], "true") == 0) ||
-+              (strcasecmp(argv[i+1], "false") == 0) ||
-+              (strcasecmp(argv[i+1], "yes") == 0) ||
-+              (strcasecmp(argv[i+1], "no") == 0)) {
-+              param->setParam(argv[i+1]);
-+              i += 2;
-+              continue;
-+          }
-+      }
-+    }
-+
-     if (Configuration::setParam(argv[i])) {
-       i++;
-       continue;
diff --git a/x11-packages/tigervnc/tigervnc-1.10.1-clipboard.patch b/x11-packages/tigervnc/tigervnc-1.10.1-clipboard.patch
deleted file mode 100644
index 4861048b179860..00000000000000
--- a/x11-packages/tigervnc/tigervnc-1.10.1-clipboard.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 331a27addf46d39635fb4d195ae2f94058689832 Mon Sep 17 00:00:00 2001
-From: Pierre Ossman <ossman@cendio.se>
-Date: Fri, 21 Aug 2020 15:52:45 +0200
-Subject: [PATCH] Call correct wrappers for clipboard handling
-
-We incorrectly called the underlying functions instead of the safe
-wrappers for the new clipboard functions. This had the effect of a)
-crashing the entire server if one of these functions failed, and b) not
-respecting the settings disabling the clipboard.
----
- common/rfb/VNCServerST.cxx | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx
-index 35f65a2e..f09715a4 100644
---- a/common/rfb/VNCServerST.cxx
-+++ b/common/rfb/VNCServerST.cxx
-@@ -339,7 +339,7 @@ void VNCServerST::requestClipboard()
-   if (clipboardClient == NULL)
-     return;
- 
--  clipboardClient->requestClipboard();
-+  clipboardClient->requestClipboardOrClose();
- }
- 
- void VNCServerST::announceClipboard(bool available)
-@@ -353,7 +353,7 @@ void VNCServerST::announceClipboard(bool available)
- 
-   for (ci = clients.begin(); ci != clients.end(); ci = ci_next) {
-     ci_next = ci; ci_next++;
--    (*ci)->announceClipboard(available);
-+    (*ci)->announceClipboardOrClose(available);
-   }
- }
- 
-@@ -367,7 +367,7 @@ void VNCServerST::sendClipboardData(const char* data)
-   for (ci = clipboardRequestors.begin();
-        ci != clipboardRequestors.end(); ci = ci_next) {
-     ci_next = ci; ci_next++;
--    (*ci)->sendClipboardData(data);
-+    (*ci)->sendClipboardDataOrClose(data);
-   }
- 
-   clipboardRequestors.clear();
--- 
-2.39.2
-
diff --git a/x11-packages/tigervnc/tigervnc-1.10.1-xorg-1.21.patch b/x11-packages/tigervnc/tigervnc-1.10.1-xorg-1.21.patch
deleted file mode 100644
index de5afb62e4f281..00000000000000
--- a/x11-packages/tigervnc/tigervnc-1.10.1-xorg-1.21.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Backport of
-
-https://github.com/TigerVNC/tigervnc/commit/736b50d04e1ba965696cd15d456dc2b7fc123150
-https://github.com/TigerVNC/tigervnc/commit/f2577107f7f55382c524d8c738a777e5cdd80f60
-
---- a/unix/xserver/hw/vnc/xorg-version.h
-+++ b/unix/xserver/hw/vnc/xorg-version.h
-@@ -54,8 +54,10 @@
- #define XORG 119
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (20 * 100000) + (99 * 1000))
- #define XORG 120
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (21 * 100000) + (99 * 1000))
-+#define XORG 121
- #else
--#error "X.Org newer than 1.20 is not supported"
-+#error "X.Org newer than 1.21 is not supported"
- #endif
- 
- #endif
---- a/unix/xserver/hw/vnc/xvnc.c
-+++ b/unix/xserver/hw/vnc/xvnc.c
-@@ -85,7 +85,6 @@
- #undef VENDOR_RELEASE
- #undef VENDOR_STRING
- #include "version-config.h"
--#include "site.h"
- 
- #define XVNCVERSION "TigerVNC 1.10.0"
- #define XVNCCOPYRIGHT ("Copyright (C) 1999-2019 TigerVNC Team and many others (see README.rst)\n" \
-@@ -153,15 +152,14 @@
- static Bool displaySpecified = FALSE;
- static char displayNumStr[16];
- 
--static int vncVerbose = DEFAULT_LOG_VERBOSITY;
-+static int vncVerbose = 0;
- 
- 
- static void
- vncPrintBanner(void)
- {
-     ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT);
--    ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE,
--           VENDOR_STRING);
-+    ErrorF("Underlying X server release %d\n\n", VENDOR_RELEASE);
- }
- 
- static void
diff --git a/x11-packages/tigervnc/tigervnc-1.9.0_CMakeLists.txt.patch b/x11-packages/tigervnc/tigervnc-1.9.0_CMakeLists.txt.patch
deleted file mode 100644
index ad37e76b592026..00000000000000
--- a/x11-packages/tigervnc/tigervnc-1.9.0_CMakeLists.txt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr tigervnc-1.9.0/CMakeLists.txt tigervnc-1.9.0.mod/CMakeLists.txt
---- tigervnc-1.9.0/CMakeLists.txt	2018-07-16 17:08:55.000000000 +0300
-+++ tigervnc-1.9.0.mod/CMakeLists.txt	2018-09-12 11:14:21.772989769 +0300
-@@ -303,7 +303,6 @@
-   add_subdirectory(media)
- endif()
- 
--add_subdirectory(tests)
- 
- 
- include(cmake/BuildPackages.cmake)
diff --git a/x11-packages/tigervnc/tigervnc-1.9.0_unix_vncserver.patch b/x11-packages/tigervnc/tigervnc-1.9.0_unix_vncserver.patch
deleted file mode 100644
index ec9707d5e4a98e..00000000000000
--- a/x11-packages/tigervnc/tigervnc-1.9.0_unix_vncserver.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -uNr tigervnc-1.9.0/unix/vncserver tigervnc-1.9.0.mod/unix/vncserver
---- tigervnc-1.9.0/unix/vncserver	2018-07-16 17:08:55.000000000 +0300
-+++ tigervnc-1.9.0.mod/unix/vncserver	2018-09-12 11:14:21.786323593 +0300
-@@ -51,7 +51,7 @@
- $vncUserDir = "$ENV{HOME}/.vnc";
- $vncUserConfig = "$vncUserDir/config";
- 
--$vncSystemConfigDir = "/etc/tigervnc";
-+$vncSystemConfigDir = "@TERMUX_PREFIX@/etc/tigervnc";
- $vncSystemConfigDefaultsFile = "$vncSystemConfigDir/vncserver-config-defaults";
- $vncSystemConfigMandatoryFile = "$vncSystemConfigDir/vncserver-config-mandatory";
- 
-@@ -60,7 +60,7 @@
- 
- $xstartupFile = $vncUserDir . "/xstartup";
- $defaultXStartup
--    = ("#!/bin/sh\n\n".
-+    = ("#!@TERMUX_PREFIX@/bin/sh\n\n".
-        "unset SESSION_MANAGER\n".
-        "unset DBUS_SESSION_BUS_ADDRESS\n".
-        "OS=`uname -s`\n".
-@@ -74,11 +74,11 @@
-        "      ;;\n".
-        "  esac\n".
-        "fi\n".
--       "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
--       "  exec /etc/X11/xinit/xinitrc\n".
-+       "if [ -x @TERMUX_PREFIX@/etc/X11/xinit/xinitrc ]; then\n".
-+       "  exec @TERMUX_PREFIX@/etc/X11/xinit/xinitrc\n".
-        "fi\n".
--       "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
--       "  exec sh /etc/X11/xinit/xinitrc\n".
-+       "if [ -f @TERMUX_PREFIX@/etc/X11/xinit/xinitrc ]; then\n".
-+       "  exec sh @TERMUX_PREFIX@/etc/X11/xinit/xinitrc\n".
-        "fi\n".
-        "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
-        "xsetroot -solid grey\n".
-@@ -98,15 +98,15 @@
- 
- chop($host = `uname -n`);
- 
--if (-d "/etc/X11/fontpath.d") {
--    $fontPath = "catalogue:/etc/X11/fontpath.d";
-+if (-d "@TERMUX_PREFIX@/etc/X11/fontpath.d") {
-+    $fontPath = "catalogue:@TERMUX_PREFIX@/etc/X11/fontpath.d";
- }
- 
--@fontpaths = ('/usr/share/X11/fonts', '/usr/share/fonts', '/usr/share/fonts/X11/');
--if (! -l "/usr/lib/X11") {push(@fontpaths, '/usr/lib/X11/fonts');}
--if (! -l "/usr/X11") {push(@fontpaths, '/usr/X11/lib/X11/fonts');}
--if (! -l "/usr/X11R6") {push(@fontpaths, '/usr/X11R6/lib/X11/fonts');}
--push(@fontpaths, '/usr/share/fonts/default');
-+@fontpaths = ('@TERMUX_PREFIX@/share/X11/fonts', '@TERMUX_PREFIX@/share/fonts', '@TERMUX_PREFIX@/share/fonts/X11/');
-+if (! -l "@TERMUX_PREFIX@/lib/X11") {push(@fontpaths, '@TERMUX_PREFIX@/lib/X11/fonts');}
-+if (! -l "@TERMUX_PREFIX@/X11") {push(@fontpaths, '@TERMUX_PREFIX@X11/lib/X11/fonts');}
-+if (! -l "@TERMUX_PREFIX@/X11R6") {push(@fontpaths, '@TERMUX_PREFIX@/X11R6/lib/X11/fonts');}
-+push(@fontpaths, '@TERMUX_PREFIX@/share/fonts/default');
- 
- @fonttypes = ('misc',
-              '75dpi',
-@@ -404,8 +404,8 @@
- # If the unix domain socket exists then use that (DISPLAY=:n) otherwise use
- # TCP (DISPLAY=host:n)
- 
--if (-e "/tmp/.X11-unix/X$displayNumber" ||
--    -e "/usr/spool/sockets/X11/$displayNumber")
-+if (-e "@TERMUX_PREFIX@/tmp/.X11-unix/X$displayNumber" ||
-+    -e "@TERMUX_PREFIX@/spool/sockets/X11/$displayNumber")
- {
-     $ENV{DISPLAY}= ":$displayNumber";
- } else {
-@@ -546,21 +546,21 @@
-     }
-     close(S);
- 
--    if (-e "/tmp/.X$n-lock") {
--	warn "\nWarning: $host:$n is taken because of /tmp/.X$n-lock\n";
-+    if (-e "@TERMUX_PREFIX@/tmp/.X$n-lock") {
-+	warn "\nWarning: $host:$n is taken because of @TERMUX_PREFIX@/tmp/.X$n-lock\n";
- 	warn "Remove this file if there is no X server $host:$n\n";
- 	return 0;
-     }
- 
--    if (-e "/tmp/.X11-unix/X$n") {
--	warn "\nWarning: $host:$n is taken because of /tmp/.X11-unix/X$n\n";
-+    if (-e "@TERMUX_PREFIX@/tmp/.X11-unix/X$n") {
-+	warn "\nWarning: $host:$n is taken because of @TERMUX_PREFIX@/tmp/.X11-unix/X$n\n";
- 	warn "Remove this file if there is no X server $host:$n\n";
- 	return 0;
-     }
- 
--    if (-e "/usr/spool/sockets/X11/$n") {
-+    if (-e "@TERMUX_PREFIX@/spool/sockets/X11/$n") {
- 	warn("\nWarning: $host:$n is taken because of ".
--             "/usr/spool/sockets/X11/$n\n");
-+             "@TERMUX_PREFIX@/spool/sockets/X11/$n\n");
- 	warn "Remove this file if there is no X server $host:$n\n";
- 	return 0;
-     }
-@@ -760,15 +760,15 @@
- 	warn "Xvnc process ID $pid already killed\n";
- 	$opt{'-kill'} =~ s/://;
- 
--	if (-e "/tmp/.X11-unix/X$opt{'-kill'}") {
-+	if (-e "@TERMUX_PREFIX@/tmp/.X11-unix/X$opt{'-kill'}") {
- 	    print "Xvnc did not appear to shut down cleanly.";
--	    print " Removing /tmp/.X11-unix/X$opt{'-kill'}\n";
--	    unlink "/tmp/.X11-unix/X$opt{'-kill'}";
-+	    print " Removing @TERMUX_PREFIX@/tmp/.X11-unix/X$opt{'-kill'}\n";
-+	    unlink "@TERMUX_PREFIX@/tmp/.X11-unix/X$opt{'-kill'}";
- 	}
--	if (-e "/tmp/.X$opt{'-kill'}-lock") {
-+	if (-e "@TERMUX_PREFIX@/tmp/.X$opt{'-kill'}-lock") {
- 	    print "Xvnc did not appear to shut down cleanly.";
--	    print " Removing /tmp/.X$opt{'-kill'}-lock\n";
--	    unlink "/tmp/.X$opt{'-kill'}-lock";
-+	    print " Removing @TERMUX_PREFIX@/tmp/.X$opt{'-kill'}-lock\n";
-+	    unlink "@TERMUX_PREFIX@/tmp/.X$opt{'-kill'}-lock";
- 	}
-     }
- 
diff --git a/x11-packages/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch b/x11-packages/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch
deleted file mode 100644
index cc2d5a99ebc3a8..00000000000000
--- a/x11-packages/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/NixOS/nixpkgs/commit/f216b03d5b01490aadc54e5e9d5e3cb607816262
-
-Origin: https://build.opensuse.org/package/view_file/X11:XOrg/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch
-diff -u -p -r tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c
---- tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c	2020-01-15 11:19:19.486731848 +0000
-+++ tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c	2020-01-15 11:37:33.275445409 +0000
-@@ -295,6 +295,15 @@ void ddxBeforeReset(void)
- }
- #endif
- 
-+#if INPUTTHREAD
-+/** This function is called in Xserver/os/inputthread.c when starting
-+    the input thread. */
-+void
-+ddxInputThreadInit(void)
-+{
-+}
-+#endif
-+
- void ddxUseMsg(void)
- {
-     vncPrintBanner();
-
diff --git a/x11-packages/tigervnc/vncserver b/x11-packages/tigervnc/vncserver
index 77f1c0f153e084..5a5adddd4bdd23 100755
--- a/x11-packages/tigervnc/vncserver
+++ b/x11-packages/tigervnc/vncserver
@@ -196,7 +196,6 @@ $default_opts{auth} = $xauthorityFile;
 $default_opts{geometry} = $geometry if ($geometry);
 $default_opts{depth} = $depth if ($depth);
 $default_opts{pixelformat} = $pixelformat if ($pixelformat);
-$default_opts{rfbwait} = 30000;
 $default_opts{rfbauth} = "$vncUserDir/passwd";
 $default_opts{rfbport} = $vncPort;
 $default_opts{fp} = $fontPath if ($fontPath);
diff --git a/x11-packages/tigervnc/xserver21.1.1.diff b/x11-packages/tigervnc/xserver21.1.1.diff
index a349af75dcbf82..203e0d56581924 100644
--- a/x11-packages/tigervnc/xserver21.1.1.diff
+++ b/x11-packages/tigervnc/xserver21.1.1.diff
@@ -1,7 +1,5 @@
-diff -urpN xorg-server-1.20.0/configure.ac xorg-server-1.20.0/configure.ac
---- xorg-server-1.20.0/configure.ac	2018-05-10 09:32:34.000000000 -0700
-+++ xorg-server-1.20.0/configure.ac	2018-06-13 19:04:47.536413626 -0700
-@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x
++++ ./configure.ac
+@@ -72,6 +72,7 @@
  AC_CONFIG_HEADERS(include/version-config.h)
  
  AM_PROG_AS
@@ -9,7 +7,7 @@ diff -urpN xorg-server-1.20.0/configure.ac xorg-server-1.20.0/configure.ac
  AC_PROG_LN_S
  LT_PREREQ([2.2])
  LT_INIT([disable-static win32-dll])
-@@ -1777,6 +1778,10 @@ if test "x$XVFB" = xyes; then
+@@ -1712,6 +1713,11 @@
  	AC_SUBST([XVFB_SYS_LIBS])
  fi
  
@@ -17,19 +15,20 @@ diff -urpN xorg-server-1.20.0/configure.ac xorg-server-1.20.0/configure.ac
 +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
 +AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
 +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
++
  
  dnl Xnest DDX
  
-@@ -1812,6 +1817,8 @@ if test "x$XORG" = xauto; then
+@@ -1747,6 +1753,8 @@
  fi
  AC_MSG_RESULT([$XORG])
  
 +AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
 +
  if test "x$XORG" = xyes; then
- 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
- 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-@@ -2029,7 +2036,6 @@ if test "x$XORG" = xyes; then
+ 	PKG_CHECK_MODULES([LIBXCVT], $LIBXCVT)
+ 
+@@ -1955,7 +1963,6 @@
  	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
  	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
  	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
@@ -37,29 +36,25 @@ diff -urpN xorg-server-1.20.0/configure.ac xorg-server-1.20.0/configure.ac
  	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
  	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
  	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-@@ -2565,6 +2571,7 @@ hw/dmx/Makefile
- hw/dmx/man/Makefile
+@@ -2338,6 +2345,7 @@
+ hw/xfree86/utils/gtf/Makefile
  hw/vfb/Makefile
  hw/vfb/man/Makefile
 +hw/vnc/Makefile
  hw/xnest/Makefile
  hw/xnest/man/Makefile
  hw/xwin/Makefile
-diff -urpN xorg-server-1.20.0/hw/Makefile.am xorg-server-1.20.0/hw/Makefile.am
---- xorg-server-1.20.0/hw/Makefile.am	2018-05-10 09:32:34.000000000 -0700
-+++ xorg-server-1.20.0/hw/Makefile.am	2018-06-13 19:04:47.536413626 -0700
-@@ -44,3 +44,5 @@
++++ ./hw/Makefile.am
+@@ -34,3 +34,5 @@
  
  relink:
  	$(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done
 +
 +SUBDIRS += vnc
-diff -urpN xorg-server-1.20.0/mi/miinitext.c xorg-server-1.20.0/mi/miinitext.c
---- xorg-server-1.20.0/mi/miinitext.c	2018-05-10 09:32:37.000000000 -0700
-+++ xorg-server-1.20.0/mi/miinitext.c	2018-06-13 19:05:14.742200675 -0700
-@@ -107,8 +107,15 @@ SOFTWARE.
- #include "os.h"
- #include "globals.h"
++++ ./mi/miinitext.c
+@@ -106,8 +106,15 @@
+ 
+ #include "miinitext.h"
  
 +#ifdef TIGERVNC
 +extern void vncExtensionInit(void);