Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump(x11/tigervnc): 1.14.1 #21992

Merged
merged 1 commit into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions x11-packages/tigervnc/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
48 changes: 48 additions & 0 deletions x11-packages/tigervnc/disable-pam.patch
Original file line number Diff line number Diff line change
@@ -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; }
};
}



115 changes: 0 additions & 115 deletions x11-packages/tigervnc/tigervnc-1.10.1-boolparam-0.patch

This file was deleted.

47 changes: 0 additions & 47 deletions x11-packages/tigervnc/tigervnc-1.10.1-clipboard.patch

This file was deleted.

47 changes: 0 additions & 47 deletions x11-packages/tigervnc/tigervnc-1.10.1-xorg-1.21.patch

This file was deleted.

11 changes: 0 additions & 11 deletions x11-packages/tigervnc/tigervnc-1.9.0_CMakeLists.txt.patch

This file was deleted.

Loading