diff options
author | Viorel Munteanu <ceamac@gentoo.org> | 2024-07-27 22:28:43 +0300 |
---|---|---|
committer | Viorel Munteanu <ceamac@gentoo.org> | 2024-07-27 22:36:03 +0300 |
commit | 72163fbdb05d4eaaf637cd971c41f85c4739b5ce (patch) | |
tree | 7e92f3e5aa4ef324821ae8a6c08585d6f8d0ea33 | |
parent | net-misc/tigervnc-xorg-module: drop 1.13.90 (diff) | |
download | gentoo-72163fbdb05d4eaaf637cd971c41f85c4739b5ce.tar.gz gentoo-72163fbdb05d4eaaf637cd971c41f85c4739b5ce.tar.bz2 gentoo-72163fbdb05d4eaaf637cd971c41f85c4739b5ce.zip |
net-misc/tigervnc: drop 1.13.90-r1
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
-rw-r--r-- | net-misc/tigervnc/Manifest | 1 | ||||
-rw-r--r-- | net-misc/tigervnc/files/tigervnc-1.13.90.initd | 91 | ||||
-rw-r--r-- | net-misc/tigervnc/tigervnc-1.13.90-r1.ebuild | 229 |
3 files changed, 0 insertions, 321 deletions
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 783200316a71..7ccc45a9c450 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,5 +1,4 @@ DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5 -DIST tigervnc-1.13.90.tar.gz 2082778 BLAKE2B 204f2bdc503f4f13ead2cb641c78390763ebc590822d5759fdb3f1c1e052c761ffa443bdbb8f380d5b6b9f45215506bbd1c20d4bae336ee14d9e3621161a182a SHA512 8787d8b18e491df841947b42492e6ac09ed57c72a2b3a1aa901676b7b73bd8dfab5ce45177333913cf66d604804c55357d15eefe5747c31e97b91ce2b9f44093 DIST tigervnc-1.14.0.tar.gz 2090452 BLAKE2B 5211dadae0ed66b2b286609f2555f45d3d9b45eef738e6deac3193f433ac6b6858ae6245af621d5a001336d91b99237b0a4976e4642111b27f4f668dbcc79803 SHA512 ee36f0aa40957274fb00fd755624a8bea80432d797d6c183645ed1251058ab30594d2261693b5655c5ca85a22e53f93029eeccc51fe86780398d1a017fa2311c DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1 DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937 diff --git a/net-misc/tigervnc/files/tigervnc-1.13.90.initd b/net-misc/tigervnc/files/tigervnc-1.13.90.initd deleted file mode 100644 index bf9eee12787b..000000000000 --- a/net-misc/tigervnc/files/tigervnc-1.13.90.initd +++ /dev/null @@ -1,91 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License, v2 or later - -# shellcheck shell=sh - -# Create symlinks for all displays. -# For example for display :1, run `ln -s tigervnc /etc/init.d/tigervnc.1` -# Then `rc-update add tigervnc.1 default` -# For compatibility, /etc/init.d/tigervnc will start all displays. - -DISPLAYS=${SVCNAME#*.} -if [ "$DISPLAYS" = "tigervnc" ]; then - should_warn=1 - DISPLAYS=$(grep -v "^#" /etc/tigervnc/vncserver.users | sed -e 's/=.*//' -e 's/^://') -fi - -depend() { - need net -} - -checkconfig() { - if [ -n "${DISPLAYS}" ]; then - if [ "$1" = "start" ]; then - for display in $DISPLAYS; do - user="$(grep "^:${display}" /etc/tigervnc/vncserver.users)" - user=${user#*=} - # bug #690046 - if [ -z "${user}" ]; then - eerror "User is not defined for display :${display} in /etc/tigervnc/vncserver.users" - return 1 - # 1.13.90 changed the default config directory to ~/.config/tigervnc - # but still supports ~/.vnc if not found - elif ! runuser -l "${user}" -s /bin/bash -c \ - "[[ ( -d ${XDG_CONFIG_HOME:-~/.config}/tigervnc && -f ${XDG_CONFIG_HOME:-~/.config}/tigervnc/passwd ) || ( ! -d ${XDG_CONFIG_HOME:-~/.config}/tigervnc && -f ~/.vnc/passwd ) ]]"; then - eerror "There are no passwords defined for user ${user}." - return 1 - elif [ -e "/tmp/.X11-unix/X${display}" ]; then - eerror "Display :${display} appears to be already in use because of /tmp/.X11-unix/X${display}" - eerror "Remove this file if there is no X server for :${display}" - return 1 - elif [ -e "/tmp/.X${display}-lock" ]; then - eerror "Display :${display} appears to be already in use because of /tmp/.X${display}-lock" - eerror "Remove this file if there is no X server for :${display}" - return 1 - fi - FREEDISPLAYS="${FREEDISPLAYS} ${display}" - done - fi - return 0 - else - eerror 'There are no displays configured in /etc/tigervnc/vncserver.users' - return 1 - fi -} - -checkwarn() { - if [ "${should_warn}" = "1" ]; then - ewarn 'Running /etc/init.d/tigervnc in compatibility mode' - ewarn 'Please migrate to one service per display as detailed here:' - ewarn 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:' - fi -} - -start() { - checkwarn - FREEDISPLAYS="" - checkconfig start || return 1 - for display in $FREEDISPLAYS; do - [ -n "${TIGERVNC_XSESSION_FILE}" ] && export TIGERVNC_XSESSION_FILE - ebegin "Starting TigerVNC server :${display}" - start-stop-daemon --start --pidfile=/run/vncsession-":${display}".pid /usr/libexec/vncsession-start -- ":${display}" - eend $? - done -} - -stop() { - checkconfig stop || return 2 - for display in $DISPLAYS; do - ebegin "Stopping TigerVNC server :${display}" - start-stop-daemon --stop --pidfile=/run/vncsession-":${display}".pid - eend $? - done - # Do not fail if a server is missing - /bin/true -} - -restart() { - svc_stop - svc_start -} diff --git a/net-misc/tigervnc/tigervnc-1.13.90-r1.ebuild b/net-misc/tigervnc/tigervnc-1.13.90-r1.ebuild deleted file mode 100644 index 24dd8515063c..000000000000 --- a/net-misc/tigervnc/tigervnc-1.13.90-r1.ebuild +++ /dev/null @@ -1,229 +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 ~ia64 ~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/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-apps/xauth - x11-apps/xinit - x11-apps/xkbcomp - x11-apps/xsetroot - x11-misc/xkeyboard-config - 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.12.0-xsession-path.patch - "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch -) - -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.13.1.confd ${PN} - newinitd "${FILESDIR}"/${PN}-1.13.90.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 - } - - 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} -} |