diff options
Diffstat (limited to 'net-misc/tigervnc')
| -rw-r--r-- | net-misc/tigervnc/Manifest | 6 | ||||
| -rw-r--r-- | net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch | 21 | ||||
| -rw-r--r-- | net-misc/tigervnc/tigervnc-1.14.0-r2.ebuild | 240 | ||||
| -rw-r--r-- | net-misc/tigervnc/tigervnc-9999.ebuild | 6 |
4 files changed, 2 insertions, 271 deletions
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 98327185853e..0b9f1b591b17 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,15 +1,11 @@ AUX tigervnc-1.11.0-install-java-viewer.patch 788 BLAKE2B b3da744d21030bf988dc21bca66a17811b1180ad89fcbc6e3ca8b70b8803c284456cc14393dddf5f2f395d9044d90e8ac8ee50d155be7779b08c14d7bbcb270b SHA512 5f9650a6f8589ab952506cbf6a67f603fc720a70dd76a505da69812c039fb9a0a4137c9667ce11e253a35bade056a18d2fa584ac23cda8111ff1fe17e90f025a AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e -AUX tigervnc-1.14.0-typo-VncAuth.patch 763 BLAKE2B 6e0f209159aac2f6ed78784606b7d3fd4a3bb618321249eb75452441f8781571e08da8a83fb657559e75e81f0ebf5d55affb5f965c0523adf5cdf349aa2cfcd3 SHA512 8c4c80b735060a15e25eec17ec155e321f1b6fa3bf5367838cbaababc3850a0894ae89fb53821b8efced801cc97295b8602b19d9a99e72767e00b402288d990a AUX tigervnc-1.14.0-xsession-path.patch 1008 BLAKE2B f73bbab10b21a8b27b5b1773e43b254ca5e5017efd84aba8916ad6b5549c2cffabcbac7c14c0b1d8dbb2fb280299d580ceab45399b593abc8f520d692988024b SHA512 cc3ead0af6c618b00914a131723fcf401f913a10e3398e92702387e805dc94f7878558deff4ee12d58e8f2608a7d268ba937a8fcc34ed303b9e3328e77b98bf6 AUX tigervnc-1.14.0.confd 530 BLAKE2B 1152c237744ee69ab317a8d979a8282abb259cb359500b251c31faf6a683ec11c31ef283749e420f5fce54a9f5bec7e97df4ccfdae41871173d30458c8669137 SHA512 75dbae29d2bab1e1b56f9d2d73bb674cbd968a9919e085bc1d356726caed91b469474753176d657c0b5ef2afe6fdf691b661d2224062b22bc39a9752951ac6d4 AUX tigervnc-1.14.0.initd 2996 BLAKE2B 675bc890a23805aceeeb1ee559d192c4a39ee7251d520cc5d98cfd2c2f075737fb3ed192903a08f850603847ce7769e3ae01b2c29dc4591cb3444edf835c6e0d SHA512 0e4043df37125e48d4314fc87400bf5e4eb9ca9848d2afead2f34b4f94422a03b939c3cf246a40c44b91e9cf0aec261f35a3c98e9861810db2f5a73f384a3c60 AUX tigervnc-1.14.1-pam.patch 959 BLAKE2B 384b065ac6f273ff302f8469c039e81f0bc7a98f684162aa8883af5332bc3450032e2a87f12d0f0c576df167817b3b7875b6675cc8af26de14f0c0147077b353 SHA512 d6ee39c53cab920a9f3432012714aaaa7f87db90763156bfcea26e394e381fa47eed8cbe62a956cb983059b28811932b16e79dc0445390a59288c27fc77d6caa -DIST tigervnc-1.14.0.tar.gz 2090452 BLAKE2B 5211dadae0ed66b2b286609f2555f45d3d9b45eef738e6deac3193f433ac6b6858ae6245af621d5a001336d91b99237b0a4976e4642111b27f4f668dbcc79803 SHA512 ee36f0aa40957274fb00fd755624a8bea80432d797d6c183645ed1251058ab30594d2261693b5655c5ca85a22e53f93029eeccc51fe86780398d1a017fa2311c DIST tigervnc-1.14.1.tar.gz 2097932 BLAKE2B 44593837154e019562f63cad54afaa41d1af7a5199988571002019dc60af193162a54b4c3f4e57a3cef2c824253bec5d83f029ba489a7f5459873255b1968cba SHA512 d7a6cff4a3a1e4c30e2dbd6e17ad2d76145e76f5c1a93abbaf32b1c488377a4eaf936d4e8a24a97863948138ba40031c862f9da1c1cd427da35ebffa8eaa4f31 -DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1 DIST xorg-server-21.1.14.tar.xz 5016608 BLAKE2B b64ff9bbcd1d1c632b588800acb1531d6295a52347294d323d684a7149a4f803fb38357a102d715525511c8bb8554daf2e71c28149ccb650b1c7c1990351f53e SHA512 833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973 -EBUILD tigervnc-1.14.0-r2.ebuild 5714 BLAKE2B c5d1883b824ef6ae63ef62dbe192c0b0b0d29c59161bfe74c44558b7b45928d00a97b2a2e2ea3ba3a1867ac3e9b311c31fc412312aa6c565937cfd6b01806755 SHA512 283dc18afaf801a2cacd4deda7feb865af4449973c9c2dd550035aeba9ad1fd2a5bc2f1e51f2bfd2e5ff62a86e15431a47dcba08c2c7e32a457d264c47af999a EBUILD tigervnc-1.14.1-r2.ebuild 5537 BLAKE2B e974553e7d9fb0a7513723ba08f2f43c3ebba0a0bb46401b3e2fe6b91100595c48bb9c776c91e0d162bde22897b02b97c0a1caaf61d7582c8972dd0611caec9e SHA512 4c5d65a4e9266dd341fcd804bf4449b2987c6e0dd4253bf163dabd428fdc588e39056d39d9b4a1822eb1993111f8a806b81bab6a340b476f0402cfd25ecb8e6c -EBUILD tigervnc-9999.ebuild 5704 BLAKE2B 533c2e4e58426108e0436555d1849d17978c9a6135bcfe3778005bf692b789c390a7ff7dd43b3d9e7d8bc6d1b6ffb311350095918c3fca788bc6275a099b3b72 SHA512 f32eafb73811f138386e88b25f2649899cf12f8641a6f162e7e44de50afb22dc032782075f7e22409ff415b3cdc2163fdd1e3dc7ddf3632eb089487587ada51f +EBUILD tigervnc-9999.ebuild 5542 BLAKE2B 8edb8cfe98d6a0d2a7438cbe776d15f994b4ba5c455b745e58de47a92dd9f1489a793974d5066336420c457fa11d6cc779fb358cdb3363eccbd392cf3c2b1b56 SHA512 9279f578c2665dbe96561d595b80ac000a942134e6c56a572af52c64e753d3e11087eb491441ef370429de2c9c4a5ec244b4358bbc50b7aa398f1b56c922bfea MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743 diff --git a/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch b/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch deleted file mode 100644 index 8408fb77db5f..000000000000 --- a/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugs.gentoo.org/938694 -https://github.com/TigerVNC/tigervnc/commit/4f6a3521874da5a67fd746389cfa9b6199eb3582 - -From 4f6a3521874da5a67fd746389cfa9b6199eb3582 Mon Sep 17 00:00:00 2001 -From: Pierre Ossman <ossman@cendio.se> -Date: Mon, 29 Jul 2024 16:16:08 +0200 -Subject: [PATCH] Add missing comma in default security type list - -Otherwise it merges with the next entry, removing both of them from the -default list. ---- a/common/rfb/SecurityClient.cxx -+++ b/common/rfb/SecurityClient.cxx -@@ -60,7 +60,7 @@ StringParameter SecurityClient::secTypes - "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone," - #endif - #ifdef HAVE_NETTLE -- "RA2,RA2_256,RA2ne,RA2ne_256,DH,MSLogonII" -+ "RA2,RA2_256,RA2ne,RA2ne_256,DH,MSLogonII," - #endif - "VncAuth,None", - ConfViewer); diff --git a/net-misc/tigervnc/tigervnc-1.14.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.14.0-r2.ebuild deleted file mode 100644 index b17a47cb25bb..000000000000 --- a/net-misc/tigervnc/tigervnc-1.14.0-r2.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_IN_SOURCE_BUILD=1 -inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg - -XSERVER_VERSION="21.1.13" -XSERVER_PATCH_VERSION="21" - -DESCRIPTION="Remote desktop viewer display system" -HOMEPAGE="https://tigervnc.org" -SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/" -else - SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama" -REQUIRED_USE=" - dri3? ( drm ) - java? ( viewer ) - opengl? ( server ) - || ( server viewer ) -" - -# TODO: sys-libs/libselinux -COMMON_DEPEND=" - dev-libs/gmp:= - dev-libs/nettle:= - media-libs/libjpeg-turbo:= - sys-libs/zlib:= - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/pixman - gnutls? ( net-libs/gnutls:= ) - nls? ( virtual/libiconv ) - server? ( - 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-apps/xauth - x11-apps/xinit - x11-apps/xkbcomp - x11-apps/xsetroot - x11-misc/xkeyboard-config - dri3? ( - media-libs/mesa[opengl] - x11-libs/libxshmfence - ) - opengl? ( media-libs/libglvnd[X] ) - !net-misc/turbovnc[server] - ) - viewer? ( - media-video/ffmpeg:= - x11-libs/fltk:1 - x11-libs/libXi - x11-libs/libXrender - !net-misc/turbovnc[viewer] - ) -" -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.8:* ) - server? ( dev-lang/perl ) -" -DEPEND="${COMMON_DEPEND} - java? ( >=virtual/jdk-1.8:* ) - drm? ( x11-libs/libdrm ) - server? ( - media-fonts/font-util - x11-base/xorg-proto - x11-libs/libxcvt - x11-libs/libXi - x11-libs/libxkbfile - x11-libs/libXrender - x11-libs/xtrans - 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.14.0-xsession-path.patch - "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch - "${FILESDIR}"/${P}-typo-VncAuth.patch # bug #938694 -) - -src_unpack() { - if [[ ${PV} == *9999 ]]; then - git-r3_src_unpack - use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz - else - default - fi -} - -src_prepare() { - if use server; then - cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die - fi - - cmake_src_prepare - - if use server; then - cd unix/xserver || die - eapply ../xserver${XSERVER_PATCH_VERSION}.patch - eautoreconf - sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die - - if use drm; then - cd "${WORKDIR}" && \ - sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die - fi - 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) - -DBUILD_VIEWER=$(usex viewer) - ) - - 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 \ - --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 present 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}-1.14.0.confd ${PN} - newinitd "${FILESDIR}"/${PN}-1.14.0.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 - dosym -r /usr/libexec/vncserver /usr/bin/vncserver - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && { - elog 'OpenRC users: please migrate to one service per display as documented here:' - elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:' - elog - } - - use server && { - elog 'PLEASE NOTE:' - elog ' The default config directory is now ${XDG_CONFIG_HOME}/tigervnc or' - elog ' ~/.config/tigervnc instead of ~/.vnc' - elog - } - - 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} -} diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild index d19c1b53cdd3..0569447b5b6c 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 flag-o-matic java-pkg-opt-2 optfeature systemd xdg -XSERVER_VERSION="21.1.13" +XSERVER_VERSION="21.1.14" XSERVER_PATCH_VERSION="21" DESCRIPTION="Remote desktop viewer display system" @@ -207,10 +207,6 @@ src_install() { 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 dosym -r /usr/libexec/vncserver /usr/bin/vncserver fi |