diff -N --unified --recursive --text orig/PKGBUILD new/PKGBUILD
--- orig/PKGBUILD	2022-01-05 13:33:01.538222281 +0000
+++ new/PKGBUILD	2022-01-05 13:34:59.814239915 +0000
@@ -3,8 +3,8 @@
 
 pkgname=tigervnc
 pkgver=1.12.0
-pkgrel=1
-_xorgver=1.20.9
+pkgrel=2
+_xorgver=21.1.3
 pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC."
 arch=('x86_64')
 url="http://www.tigervnc.org"
@@ -23,24 +23,30 @@
 	etc/tigervnc/vncserver-config-mandatory
 	etc/tigervnc/vncserver.users)
 source=($pkgname-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v${pkgver}.tar.gz
-	https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${_xorgver}.tar.bz2
+	https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${_xorgver}.tar.gz
+        https://raw.githubusercontent.com/TigerVNC/tigervnc/master/unix/xserver21.1.1.patch
 	Xsession
 	more-xsessions.patch
-	remove-selinux.patch)
+	remove-selinux.patch
+	xorg-version.patch)
 sha256sums=('9ff3f3948f2a4e8cc06ee598ee4b1096beb62094c13e0b1462bff78587bed789'
-            'e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571'
+            'c52403a66935092da86a18052ffdcb93a2762a146901f63c1261744a708b12e2'
+            'b7a0cf460b4e19b65d6e2baf54d40ab803ffe5b80ad4ef48c2bde0ef6d85c95b'
             'c9276f6ea277cf9654fb2cc3bc9dadbb2e596b5cf8ca867ee906c0080cf7f810'
             'cb57dece026b29d7019a3e1e42fd2fb201d37fc60a70c885d2a50acffb808c06'
-            'fb8bb5bd3ec990720580a664326a70fd178ce94b97c2130462df9b1e3a3925c3')
+            'fb8bb5bd3ec990720580a664326a70fd178ce94b97c2130462df9b1e3a3925c3'
+	    'f7b75117d5ddcdc963439f2c3b450db834fc042c2dee57b13e1fc2a1c353838a')
 
 prepare() {
+  cp xserver21.1.1.patch "$srcdir"/${pkgname}-${pkgver}/unix
   cd "$srcdir"/${pkgname}-${pkgver}
+  patch -p1 -i "$srcdir"/xorg-version.patch
   patch -p1 -i "$srcdir"/more-xsessions.patch
   patch -p1 -i "$srcdir"/remove-selinux.patch
 
   cd unix/xserver
   cp -r "$srcdir"/xorg-server-${_xorgver}/* .
-  patch -Np1 -i ../xserver120.patch
+  patch -Np1 -i ../xserver21.1.1.patch
 }
 
 build() {
diff -N --unified --recursive --text orig/xorg-version.patch new/xorg-version.patch
--- orig/xorg-version.patch	1970-01-01 01:00:00.000000000 +0100
+++ new/xorg-version.patch	2022-01-05 13:33:39.954678140 +0000
@@ -0,0 +1,43 @@
+--- tigervnc-1.12.0/unix/xserver/hw/vnc/xorg-version.h	2021-11-09 07:51:28.000000000 +0000
++++ tigervnc-1.12.0/unix/xserver/hw/vnc/xorg-version.h	2022-01-05 12:50:20.788940921 +0000
+@@ -33,8 +33,8 @@
+ #error "X.Org older than 1.16 is not supported"
+ #endif
+ 
+-#if XORG_AT_LEAST(1, 21, 0)
+-#error "X.Org newer than 1.20 is not supported"
++#if XORG_AT_LEAST(1, 22, 0)
++#error "X.Org newer than 1.21 is not supported"
+ #endif
+ 
+ #endif
+--- tigervnc-1.12.0/unix/xserver/hw/vnc/xvnc.c	2021-11-09 07:51:28.000000000 +0000
++++ tigervnc-1.12.0/unix/xserver/hw/vnc/xvnc.c	2022-01-05 13:03:53.294482341 +0000
+@@ -69,9 +69,8 @@
+ #undef VENDOR_RELEASE
+ #undef VENDOR_STRING
+ #include "version-config.h"
+-#include "site.h"
+ 
+-#define XVNCVERSION "TigerVNC 1.12.0"
++#define XVNCVERSION "TigerVNC 1.12.80"
+ #define XVNCCOPYRIGHT ("Copyright (C) 1999-2021 TigerVNC Team and many others (see README.rst)\n" \
+                        "See https://www.tigervnc.org for information on TigerVNC.\n")
+ 
+@@ -111,14 +110,13 @@
+ 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