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 A9BE915800A for ; Wed, 2 Aug 2023 17:07:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEE20E0D3C; Wed, 2 Aug 2023 17:07:38 +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 CE914E0D3C for ; Wed, 2 Aug 2023 17:07:38 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC5FA340CCD for ; Wed, 2 Aug 2023 17:07:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75101DC1 for ; Wed, 2 Aug 2023 17:07:36 +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: <1690996035.943649c2a1b2f0cb06d0e521710b29a82b4d8aab.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/, net-misc/turbovnc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/turbovnc/Manifest net-misc/turbovnc/files/turbovnc-3.0.90-fix-musl-compilation.patch net-misc/turbovnc/turbovnc-3.0.90.ebuild X-VCS-Directories: net-misc/turbovnc/files/ net-misc/turbovnc/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: 943649c2a1b2f0cb06d0e521710b29a82b4d8aab X-VCS-Branch: master Date: Wed, 2 Aug 2023 17:07:36 +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: 9c7672b1-aaaf-45a9-ac14-45b1e267c9ff X-Archives-Hash: 4c96a7ad0aec91a88129c645e3c05cc7 commit: 943649c2a1b2f0cb06d0e521710b29a82b4d8aab Author: Viorel Munteanu gentoo org> AuthorDate: Wed Aug 2 17:03:53 2023 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Wed Aug 2 17:07:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943649c2 net-misc/turbovnc: add 3.0.90 This is a prerelease, sourceforge 3.0.90 is git 3.1 beta1. Commit unkeyworded. Signed-off-by: Viorel Munteanu gentoo.org> net-misc/turbovnc/Manifest | 2 + .../turbovnc-3.0.90-fix-musl-compilation.patch | 20 +++ net-misc/turbovnc/turbovnc-3.0.90.ebuild | 141 +++++++++++++++++++++ 3 files changed, 163 insertions(+) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index cba3cdb710ad..607fd79cb7ce 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,2 +1,4 @@ DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 +DIST turbovnc-3.0.90.tar.gz 9028660 BLAKE2B 3c4b67894a3cc1f855018932c2b03ea3efbcb38af8eaeed86f95bdb21605e64c87ff6d51652bfedd1520b89040e97a11e3bf2f117bc78f9225fb56f4f7687795 SHA512 f3eff5109bd33fc8ded1ed5eab4df5537ea56c71c7fcf7fb471f9ac4e77a04fcde588423885cf781f2bbd2be4f25b2959e20b71df1d0de465d26910018ccd899 +DIST turbovnc-3.0.90.tar.gz.sig 543 BLAKE2B 60cd24db3b5338230bba0ead18f1f0e784fcd6bc9eef10a01edd17a9c3cee2a611f77db46f9e3b3bb1f70cb25a3ed829d0dae0a568dd68ec514cd6c954eda4f3 SHA512 1fe886fb5118d5a1cfbba1a9cbb7960a08b3dfcb5ec3bd36a10c4c0f0dd5acf47dba8a83fb9cb8db07c8b91a046077c23b67e85115c91cdf55283beb457d38d9 diff --git a/net-misc/turbovnc/files/turbovnc-3.0.90-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-3.0.90-fix-musl-compilation.patch new file mode 100644 index 000000000000..2ad9db5117ae --- /dev/null +++ b/net-misc/turbovnc/files/turbovnc-3.0.90-fix-musl-compilation.patch @@ -0,0 +1,20 @@ +See bug https://bugs.gentoo.org/836723 + +The error is this: + +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds': +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known + 1178 | struct ucred peercred; + | ^~~~~~~~ + +--- a/unix/Xvnc/programs/Xserver/os/CMakeLists.txt ++++ b/unix/Xvnc/programs/Xserver/os/CMakeLists.txt +@@ -1,7 +1,7 @@ + include_directories(../render ../../../lib/libsha1) + + add_definitions(-DUNIXCONN -DTCPCONN -DHASXDMAUTH ${ServerOSDefines} -DXDMCP +- -DHAVE_SHA1_IN_LIBSHA1) ++ -DHAVE_SHA1_IN_LIBSHA1 -D_GNU_SOURCE) + if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") + # This is already defined for Linux + add_definitions(-DHAVE_ABSTRACT_SOCKETS) diff --git a/net-misc/turbovnc/turbovnc-3.0.90.ebuild b/net-misc/turbovnc/turbovnc-3.0.90.ebuild new file mode 100644 index 000000000000..81c62a2918f2 --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.0.90.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_OPT_USE=viewer +inherit cmake desktop java-pkg-opt-2 verify-sig + +MY_PV="3.0.90%20%283.1%20beta1%29" + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/" +SRC_URI=" + https://sourceforge.net/projects/turbovnc/files/${MY_PV}/${P}.tar.gz/download -> ${P}.tar.gz + verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${MY_PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig ) +" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" + +COMMON_DEPEND=" + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-misc/xkeyboard-config + server? ( + media-libs/libjpeg-turbo:= + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/pixman + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] + ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + viewer? ( >=virtual/jre-1.8:* ) +" + +# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 +# but cmake will look for them, so add them here +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans + viewer? ( >=virtual/jdk-1.8:* ) + server? ( + app-arch/bzip2 + media-libs/freetype + x11-libs/libfontenc + ) +" + +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) +" + +PATCHES=( + "${FILESDIR}"/"${PN}"-3.0.90-fix-musl-compilation.patch +) + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vgl-turbovnc.asc + +#879797 - BSD functions +QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy ) + +pkg_pretend() { + if use ssl && ! use server; then + einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused" + fi +} + +src_prepare() { + use viewer && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTVNC_BUILDVIEWER=$(usex viewer) + -DTVNC_BUILDSERVER=$(usex server) + -DTVNC_BUILDWEBSERVER=$(usex server) + ) + + if use server ; then + mycmakeargs+=( + -DTVNC_SYSTEMLIBS=ON + -DTVNC_SYSTEMX11=ON + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + if use ssl ; then + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=OpenSSL + -DTVNC_DLOPENSSL=OFF + ) + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + fi + + if use viewer ; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use viewer ; then + java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar + make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png + fi + + # Don't install incompatible init script + rm -r "${ED}"/etc/init.d/ || die + rm -r "${ED}"/etc/sysconfig/ || die + + # Conflicts with x11-base/xorg-server + find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die + + einstalldocs +}