commit: ba963608f5e3c998e78040fb92c793341244a697 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Fri Mar 31 07:02:38 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Fri Mar 31 07:03:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba963608
net-misc/tigervnc: drop 1.12.0-r7 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> net-misc/tigervnc/Manifest | 2 - .../tigervnc-1.12.0-disable-server-and-pam.patch | 57 ------ .../tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch | 55 ------ net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild | 199 --------------------- 4 files changed, 313 deletions(-) diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 3d98f06d8bf5..9527ec8e616e 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,5 +1,3 @@ -DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d -DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb DIST tigervnc-1.13.0.tar.gz 1986759 BLAKE2B 675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d SHA512 55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd9666686b8d4ac5fc3389c6f9319df16b90be8 DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d 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.tjernl...@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.tjernl...@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 - diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild deleted file mode 100644 index 4f68a5bed85a..000000000000 --- a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_IN_SOURCE_BUILD=1 -inherit autotools cmake eapi8-dosym flag-o-matic java-pkg-opt-2 optfeature systemd xdg - -XSERVER_VERSION="21.1.1" - -DESCRIPTION="Remote desktop viewer display system" -HOMEPAGE="https://tigervnc.org"; -SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz - server? ( - ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz - https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch -> ${P}-xserver-21.patch - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="dri3 +drm gnutls java nls +opengl +server xinerama" -REQUIRED_USE=" - dri3? ( drm ) - opengl? ( server ) -" - -CDEPEND=" - media-libs/libjpeg-turbo:= - sys-libs/zlib:= - x11-libs/fltk:1 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/pixman - gnutls? ( net-libs/gnutls:= ) - nls? ( virtual/libiconv ) - server? ( - dev-libs/libbsd - dev-libs/openssl:0= - sys-libs/pam - x11-libs/libXau - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXfixes - x11-libs/libXfont2 - x11-libs/libXtst - x11-libs/pixman - x11-libs/xtrans - x11-apps/xauth - x11-apps/xinit - x11-apps/xkbcomp - x11-apps/xsetroot - x11-misc/xkeyboard-config - opengl? ( media-libs/libglvnd[X] ) - ) - " - -RDEPEND="${CDEPEND} - java? ( virtual/jre:1.8 ) - server? ( - dev-lang/perl - sys-process/psmisc - )" - -DEPEND="${CDEPEND} - drm? ( x11-libs/libdrm ) - server? ( - media-fonts/font-util - x11-base/xorg-proto - x11-libs/libxcvt - x11-libs/libxkbfile - x11-misc/util-macros - opengl? ( media-libs/mesa ) - )" - -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) - " - -PATCHES=( - # Restore Java viewer - "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch - "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch - "${FILESDIR}"/${PN}-1.12.0-disable-server-and-pam.patch -) - -src_prepare() { - if use server; then - cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die - eapply "${FILESDIR}"/${P}-xorg-1.21.patch - eapply "${DISTDIR}"/${P}-xserver-21.patch - fi - - cmake_src_prepare - - if use server; then - cd unix/xserver || die - eapply ../xserver${XSERVER_VERSION}.patch - eautoreconf - sed -i 's:\(present.h\):../present/\1:' os/utils.c || die - sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die - fi -} - -src_configure() { - if use arm || use hppa; then - append-flags "-fPIC" - fi - - local mycmakeargs=( - -DENABLE_GNUTLS=$(usex gnutls) - -DENABLE_NLS=$(usex nls) - -DBUILD_JAVA=$(usex java) - -DBUILD_SERVER=$(usex server) - ) - - cmake_src_configure - - if use server; then - cd unix/xserver || die - econf \ - $(use_enable opengl glx) \ - $(use_enable drm libdrm) \ - --disable-config-hal \ - --disable-config-udev \ - --disable-devel-docs \ - --disable-dri \ - $(use_enable dri3) \ - --disable-glamor \ - --disable-kdrive \ - --disable-libunwind \ - --disable-linux-acpi \ - --disable-record \ - --disable-selective-werror \ - --disable-static \ - --disable-unit-tests \ - --disable-xephyr \ - $(use_enable xinerama) \ - --disable-xnest \ - --disable-xorg \ - --disable-xvfb \ - --disable-xwin \ - --enable-dri2 \ - --with-pic \ - --without-dtrace \ - --disable-present \ - --with-sha1=libcrypto - fi -} - -src_compile() { - cmake_src_compile - - if use server; then - # deps of the vnc module and the module itself - local d subdirs=( - fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render - damageext miext Xi xkb composite dix mi os hw/vnc - ) - for d in "${subdirs[@]}"; do - emake -C unix/xserver/"${d}" - done - fi -} - -src_install() { - cmake_src_install - - if use server; then - emake -C unix/xserver/hw/vnc DESTDIR="${D}" install - rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die - - newconfd "${FILESDIR}"/${PN}-${PV}.confd ${PN} - newinitd "${FILESDIR}"/${PN}-${PV}.initd ${PN} - - systemd_douserunit unix/vncserver/vncserver@.service - - # comment out pam_selinux.so, the server does not start if missing - # part of bug #746227 - sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die - - # install vncserver to /usr/bin too, see bug #836620 - dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim" - use server && \ - optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \ - optfeature_header "Install any additional display manager package:" && \ - optfeature "proper session support" ${OPTIONAL_DM} -}
