diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-03-31 10:04:50 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-31 10:04:50 +0100 |
commit | f8b05ca448cdc580f580ff86eb8bef367d67c9ae (patch) | |
tree | b11f11ae6a7fee98b05350f8cc542402aeb23d95 /net-misc/tigervnc/files | |
parent | 15d97fe857a00a52fd4efb0a31ed0560f9de3a24 (diff) |
gentoo auto-resync : 31:03:2023 - 10:04:50
Diffstat (limited to 'net-misc/tigervnc/files')
-rw-r--r-- | net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch | 57 | ||||
-rw-r--r-- | net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch | 55 |
2 files changed, 0 insertions, 112 deletions
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch deleted file mode 100644 index 5ae07007d467..000000000000 --- a/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch +++ /dev/null @@ -1,57 +0,0 @@ -See https://bugs.gentoo.org/852830 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -234,6 +234,7 @@ - add_subdirectory(java) - endif() - -+option(BUILD_SERVER "Build TigerVNC server" ON) - option(BUILD_VIEWER "Build TigerVNC viewer" ON) - if(BUILD_VIEWER) - # Check for FLTK -@@ -276,7 +277,7 @@ - endif() - - # Check for PAM library --if(UNIX AND NOT APPLE) -+if(BUILD_SERVER AND UNIX AND NOT APPLE) - check_include_files(security/pam_appl.h HAVE_PAM_H) - set(CMAKE_REQUIRED_LIBRARIES -lpam) - check_function_exists(pam_start HAVE_PAM_START) -@@ -315,9 +316,6 @@ - add_subdirectory(media) - endif() - --add_subdirectory(tests) -- -- - if(BUILD_VIEWER) - add_subdirectory(release) - endif() ---- a/common/rfb/CMakeLists.txt -+++ b/common/rfb/CMakeLists.txt -@@ -75,7 +75,7 @@ - - set(RFB_LIBRARIES ${JPEG_LIBRARIES} ${PIXMAN_LIBRARY} os rdr) - --if(UNIX AND NOT APPLE) -+if(BUILD_SERVER AND UNIX AND NOT APPLE) - set(RFB_SOURCES ${RFB_SOURCES} UnixPasswordValidator.cxx - UnixPasswordValidator.h pam.c pam.h) - set(RFB_LIBRARIES ${RFB_LIBRARIES} ${PAM_LIBS}) ---- a/unix/CMakeLists.txt -+++ b/unix/CMakeLists.txt -@@ -1,6 +1,8 @@ - add_subdirectory(tx) - add_subdirectory(common) --add_subdirectory(vncconfig) --add_subdirectory(vncpasswd) --add_subdirectory(vncserver) --add_subdirectory(x0vncserver) -+if(BUILD_SERVER) -+ add_subdirectory(vncconfig) -+ add_subdirectory(vncpasswd) -+ add_subdirectory(vncserver) -+ add_subdirectory(x0vncserver) -+endif() 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 deleted file mode 100644 index c3e003d328a6..000000000000 --- a/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 - |