diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-08-02 22:51:20 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-02 22:51:20 +0100 |
commit | 1e9c38efad2f42ea208e40924d1e5936810ac7c0 (patch) | |
tree | dbcaa52c820c84eaba974e8a5bf4ba2b05a4bed2 /net-misc/turbovnc | |
parent | 1f6d51a43dbfcb87ef81da70c688d354560e846a (diff) |
gentoo auto-resync : 02:08:2023 - 22:51:19
Diffstat (limited to 'net-misc/turbovnc')
-rw-r--r-- | net-misc/turbovnc/Manifest | 4 | ||||
-rw-r--r-- | net-misc/turbovnc/files/turbovnc-3.0.90-fix-musl-compilation.patch | 20 | ||||
-rw-r--r-- | net-misc/turbovnc/turbovnc-3.0.90.ebuild | 141 |
3 files changed, 165 insertions, 0 deletions
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 8d5423d36579..38218b78820d 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,6 +1,10 @@ AUX turbovnc-3.0-fix-musl-compilation.patch 863 BLAKE2B 6ef29d43b0849bf746c83eb2fc1477ba1eef9262cac75335b697bfb1867cca3113f755a9cd04f6f2638a212ae8cfb67b354dd28b96258ab1c84212863fc5d4cb SHA512 bea6cf58dbd27a4fe5d7ba08eabe3c8e2440e9bb28737e427a174ff0c2c77b5f0ab94be17fc31040c119226a3b939c440c4d48a3a152ff1d2e15b2a318eae37e AUX turbovnc-3.0.3-java-launcher-32-bit.patch 601 BLAKE2B 9142ac45a5113921872a102ff71e5266a5d1960a4ffa673ea811dd02fbae6dba44ed44e3cca7ded8b6a0cbd902d7c5780242d2c43567bc21c94dda5562da6a43 SHA512 52cfdd1a9d65292ad1192a5515f659321fe54de855ae9fff8fe5207ea2c79635f6ad3f01955ea79f50762ba7efdba0303e26c07a78e8c5b061f6411699c6531b +AUX turbovnc-3.0.90-fix-musl-compilation.patch 869 BLAKE2B e44b15693e9df497ff646162cca2d96a47e753e899e2a9a40074b567600bf44e6c4ef9d7770d114f164399ec30d6dccf687647508bc14831b5c5c2117b400d6b SHA512 2ce59ee4cf98376fd1c08c01918356b3cfa9e5cde3ff1a3179507086bc97749543423a9459e7b7518e95e0a0ebc3be4ab9f93cdb4a4460a9d8d5b36513c3c30a 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 EBUILD turbovnc-3.0.3.ebuild 3130 BLAKE2B 45e499ce9939e968961e6f4863bbc3cba8e574b76163eaac2161ca6e7da9bf93e3ee4672c8d240f750b628a8c5d7723ada2be2987d3d3e8fc410a9b2e3f18940 SHA512 66fb246e97e6469fa8f84782c199d3a12cc654db60a20c1d9e1a25c81dc2fdaa2af557b76d075869555a8e78f96a486d38a29c12f11b1b69da03c1b28e91ace7 +EBUILD turbovnc-3.0.90.ebuild 3058 BLAKE2B 942470d0e4ff8b8ab483e3863aeb994911cd20fb34a35128b359527f7fc3b1ae9c345dafd12d0882c61db629a2a6b7b85b93af23c290bb5c0a0889f2df9b343f SHA512 dacc0efc47e38af06b2e3d5f688b082f2282955a313e87c0d130e851625f2781476c1ed28940c4402004ebc6a1df5999a289ccc0e46250ec902cb783fca2fa2f MISC metadata.xml 820 BLAKE2B 331426a28ac5efa9f27d1e9b21e4b75e6965b5c1cf41ce7b8d98b03187fc56d81ffb58f555fc522188d1003e64713220b6f5591131fb8a26a8fe43e277f54526 SHA512 0aa50eef5eb122e0de38bf5e2f8d0627841419dd5e88ee58444493f4a9804626111d5edc5b36aa996635f38c7fd87c71706dd543305f9b495031971b1c52be3d 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 +} |