From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A6D515817D for ; Sat, 22 Jun 2024 08:07:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 606BA2BC02E; Sat, 22 Jun 2024 08:07:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3BB632BC02E for ; Sat, 22 Jun 2024 08:07:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27BF433BF03 for ; Sat, 22 Jun 2024 08:07:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 844081D0E for ; Sat, 22 Jun 2024 08:07:47 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1719043621.7207649f54237df77ac5b1a56756e998d1ce6b9e.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/tigervnc/tigervnc-9999.ebuild X-VCS-Directories: net-misc/tigervnc/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: 7207649f54237df77ac5b1a56756e998d1ce6b9e X-VCS-Branch: master Date: Sat, 22 Jun 2024 08:07:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b2b192e-cee1-4dec-8d9a-876a6f8ac6b7 X-Archives-Hash: b696532c5daedfc36612bec34822f5fd commit: 7207649f54237df77ac5b1a56756e998d1ce6b9e Author: Viorel Munteanu gentoo org> AuthorDate: Sat Jun 22 08:06:56 2024 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Sat Jun 22 08:07:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7207649f net-misc/tigervnc: sync live ebuild Signed-off-by: Viorel Munteanu gentoo.org> net-misc/tigervnc/tigervnc-9999.ebuild | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild index 23b38081e296..24dd8515063c 100644 --- a/net-misc/tigervnc/tigervnc-9999.ebuild +++ b/net-misc/tigervnc/tigervnc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,8 +6,8 @@ EAPI=8 CMAKE_IN_SOURCE_BUILD=1 inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg -XSERVER_VERSION="21.1.8" -XSERVER_PATCH_VERSION="21.1.1" +XSERVER_VERSION="21.1.13" +XSERVER_PATCH_VERSION="21" DESCRIPTION="Remote desktop viewer display system" HOMEPAGE="https://tigervnc.org" @@ -121,7 +121,6 @@ src_prepare() { cd unix/xserver || die eapply ../xserver${XSERVER_PATCH_VERSION}.patch eautoreconf - sed -i 's:\(present.h\):../present/\1:' os/utils.c || die sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die if use drm; then @@ -173,7 +172,6 @@ src_configure() { --enable-dri2 \ --with-pic \ --without-dtrace \ - --disable-present \ --with-sha1=libcrypto fi } @@ -185,7 +183,7 @@ src_compile() { # 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 + damageext miext Xi xkb composite dix mi os present hw/vnc ) for d in "${subdirs[@]}"; do emake -C unix/xserver/"${d}" @@ -201,7 +199,7 @@ src_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.1.initd ${PN} + newinitd "${FILESDIR}"/${PN}-1.13.90.initd ${PN} systemd_douserunit unix/vncserver/vncserver@.service @@ -217,7 +215,11 @@ src_install() { pkg_postinst() { xdg_pkg_postinst - use server && elog 'OpenRC users: please migrate to one service per display as documented here' #FIXME: add link + 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 && \