commit: f3aa64b7cbcdaa200887b8ff44aeb6cde19a7096 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Thu Jul 3 08:31:56 2025 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Thu Jul 3 10:13:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3aa64b7
net-misc/tigervnc: update patches Sync live ebuild. Add and enable tests. Update no server patch. Closes: https://bugs.gentoo.org/958206 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> net-misc/tigervnc/Manifest | 1 + .../tigervnc-1.15.80-disable-server-and-pam.patch | 70 ++++++++++++++++++++++ net-misc/tigervnc/tigervnc-9999.ebuild | 15 +++-- 3 files changed, 82 insertions(+), 4 deletions(-) diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index dd726675e899..d003d6c17216 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -2,3 +2,4 @@ DIST tigervnc-1.14.1.tar.gz 2097932 BLAKE2B 44593837154e019562f63cad54afaa41d1af DIST tigervnc-1.15.0.tar.gz 2126369 BLAKE2B c8646860884ae8fec7f81d9e87967bb279e7bf7ebcc69973660ed827f5a1cf6d8700a70a364e9099e68779b6dfb168242db2afa428f5cfc11784020696261191 SHA512 0b550296b5bd06ac9d63ce10861ff54d24e79b6ac1551d80e9b81845fa873d85bfd684112c66d86188c9c61fdffb9421ea8696c1c7fd15a24fb1bf6bfe6a5e05 DIST xorg-server-21.1.14.tar.xz 5016608 BLAKE2B b64ff9bbcd1d1c632b588800acb1531d6295a52347294d323d684a7149a4f803fb38357a102d715525511c8bb8554daf2e71c28149ccb650b1c7c1990351f53e SHA512 833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973 DIST xorg-server-21.1.15.tar.xz 5009756 BLAKE2B a7d5df70a4af98b903a306850a169879cf083b2c811f6e75e1e916f85441214541f7c9fa0e0089c4bf08c67597166d97ea194c6a0a511948568120e579d1104f SHA512 677bbec81ecdd1d14e1d289a00c40249988985ec636e5473b30c4f63bad03a6cc5f9168cea94969e1550370eee8863595bc9c064c3d218a96123afc7567bf363 +DIST xorg-server-21.1.18.tar.xz 5037376 BLAKE2B 48c7b745c07a31d11d3a95f8eba056ff46bf69f2c70d499f677cbd706347e0c3c28a8197be5c0d65670c5b2f87f559ea10e7c21ee88bdc767c6a921d5fa8d3b2 SHA512 839ce759fc0e5405599c4cff0acf381f278d22b465b9fb9e335b5fd1c63f6d546788e4e869854026eb4b1e1a77a83b60d6fef472cf8534d45630f31b587a50dd diff --git a/net-misc/tigervnc/files/tigervnc-1.15.80-disable-server-and-pam.patch b/net-misc/tigervnc/files/tigervnc-1.15.80-disable-server-and-pam.patch new file mode 100644 index 000000000000..a8a29e181b08 --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.15.80-disable-server-and-pam.patch @@ -0,0 +1,70 @@ +Add BUILD_SERVER similar to BUILD_VIEWER + +Add a BUILD_SERVER option similar to BUILD_VIEWER. When BUILD_SERVER is +not active, we do not require pam, so also disable everything that needs +pam. This allows building the viewer on a machine where pam is not +installed. + +See https://bugs.gentoo.org/852830 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -278,6 +278,7 @@ if(BUILD_JAVA) + add_subdirectory(java) + endif() + ++trioption(BUILD_SERVER "Build TigerVNC server") + trioption(BUILD_VIEWER "Build TigerVNC viewer") + if(BUILD_VIEWER) + # Check for FLTK +@@ -359,7 +360,7 @@ if (ENABLE_NETTLE) + 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) +--- a/common/rfb/CMakeLists.txt ++++ b/common/rfb/CMakeLists.txt +@@ -75,7 +75,7 @@ if(WIN32) + target_sources(rfb PRIVATE WinPasswdValidator.cxx) + endif(WIN32) + +-if(UNIX AND NOT APPLE) ++if(BUILD_SERVER AND UNIX AND NOT APPLE) + target_sources(rfb PRIVATE UnixPasswordValidator.cxx) + target_link_libraries(rfb ${PAM_LIBS}) + endif() +--- a/tests/perf/CMakeLists.txt ++++ b/tests/perf/CMakeLists.txt +@@ -8,8 +8,10 @@ target_link_libraries(convperf test_util rfb) + add_executable(decperf decperf.cxx) + target_link_libraries(decperf test_util rdr rfb) + +-add_executable(encperf encperf.cxx) +-target_link_libraries(encperf test_util core rdr rfb) ++if(BUILD_SERVER) ++ add_executable(encperf encperf.cxx) ++ target_link_libraries(encperf test_util core rdr rfb) ++endif() + + if (BUILD_VIEWER) + add_executable(fbperf +--- a/unix/CMakeLists.txt ++++ b/unix/CMakeLists.txt +@@ -4,7 +4,9 @@ endif() + + 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/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild index fc3969c4f12e..097cad51b9fb 100644 --- a/net-misc/tigervnc/tigervnc-9999.ebuild +++ b/net-misc/tigervnc/tigervnc-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 CMAKE_IN_SOURCE_BUILD=1 inherit autotools cmake eapi9-ver flag-o-matic java-pkg-opt-2 optfeature systemd xdg -XSERVER_VERSION="21.1.14" +XSERVER_VERSION="21.1.18" XSERVER_PATCH_VERSION="21" DESCRIPTION="Remote desktop viewer display system" @@ -23,15 +23,17 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama" +IUSE="dri3 +drm gnutls java nls +opengl +server test +viewer xinerama" REQUIRED_USE=" dri3? ( drm ) java? ( viewer ) opengl? ( server ) || ( server viewer ) " +RESTRICT="!test? ( test )" # TODO: sys-libs/libselinux +# <fltk-1.4: https://github.com/TigerVNC/tigervnc/pull/1887#issuecomment-2545662546 COMMON_DEPEND=" dev-libs/gmp:= dev-libs/nettle:= @@ -68,7 +70,7 @@ COMMON_DEPEND=" ) viewer? ( media-video/ffmpeg:= - x11-libs/fltk:1= + <x11-libs/fltk-1.4:1= x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] @@ -95,13 +97,14 @@ DEPEND="${COMMON_DEPEND} BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) + test? ( dev-cpp/gtest ) " PATCHES=( # Restore Java viewer "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch "${FILESDIR}"/${PN}-1.14.0-xsession-path.patch - "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch + "${FILESDIR}"/${PN}-1.15.80-disable-server-and-pam.patch "${FILESDIR}"/${PN}-1.14.1-pam.patch ) @@ -195,6 +198,10 @@ src_compile() { fi } +src_test() { + ctest --test-dir tests/unit/ +} + src_install() { cmake_src_install
