diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
commit | 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch) | |
tree | b9791a06ab3284e27b568412c59316c66240c682 /net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch | |
parent | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff) |
gentoo resync : 22.12.2021
Diffstat (limited to 'net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch')
-rw-r--r-- | net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch new file mode 100644 index 000000000000..c3e003d328a6 --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch @@ -0,0 +1,55 @@ +https://github.com/TigerVNC/tigervnc/commit/736b50d04e1ba965696cd15d456dc2b7fc123150.patch +https://github.com/TigerVNC/tigervnc/commit/f2577107f7f55382c524d8c738a777e5cdd80f60.patch + +From: Joakim Tjernlund <joakim.tjernlund@infinera.com> +Date: Wed, 24 Nov 2021 21:09:36 +0100 +Subject: [PATCH] xorg-version.h: Increase supported Xorg version to 1.21 + +--- a/unix/xserver/hw/vnc/xorg-version.h ++++ b/unix/xserver/hw/vnc/xorg-version.h +@@ -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 + +From: Joakim Tjernlund <joakim.tjernlund@infinera.com> +Date: Wed, 24 Nov 2021 21:10:56 +0100 +Subject: [PATCH] xvnc: adapt for 1.21 + +VENDOR_STRING is gone as is DEFAULT_LOG_VERBOSITY +site.h has been removed and is not needed. +--- a/unix/xserver/hw/vnc/xvnc.c ++++ b/unix/xserver/hw/vnc/xvnc.c +@@ -69,7 +69,6 @@ extern char buildtime[]; + #undef VENDOR_RELEASE + #undef VENDOR_STRING + #include "version-config.h" +-#include "site.h" + + #define XVNCVERSION "TigerVNC 1.12.80" + #define XVNCCOPYRIGHT ("Copyright (C) 1999-2021 TigerVNC Team and many others (see README.rst)\n" \ +@@ -111,14 +110,13 @@ static Bool Render = TRUE; + 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 + |