summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViorel Munteanu <ceamac@gentoo.org>2024-08-09 09:45:28 +0300
committerViorel Munteanu <ceamac@gentoo.org>2024-08-09 10:14:41 +0300
commita7c041d54bb662f41837c438b4ee6bb24fe5c60e (patch)
treedaaaf9b81b68d2bdfc5330134c2437b4d15bd254 /net-misc
parentnet-misc/turbovnc: add 3.1.2 (diff)
downloadgentoo-a7c041d54bb662f41837c438b4ee6bb24fe5c60e.tar.gz
gentoo-a7c041d54bb662f41837c438b4ee6bb24fe5c60e.tar.bz2
gentoo-a7c041d54bb662f41837c438b4ee6bb24fe5c60e.zip
net-misc/turbovnc: drop 3.0.3
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/turbovnc/Manifest2
-rw-r--r--net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch20
-rw-r--r--net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch15
-rw-r--r--net-misc/turbovnc/turbovnc-3.0.3.ebuild142
4 files changed, 0 insertions, 179 deletions
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index c849c6b776e1..9948242a24cb 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,5 +1,3 @@
-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.1.1.tar.gz 9032635 BLAKE2B 84b6d656bcadf310368f4c59e03c25d2997e8264141bf54dc670e76c1f52e4ea63a71670f134643018f9cae76aa20d51d15a4a9f919a25d21abac80fbc0b43db SHA512 d855b5f6aca9db73474d6a63868212a847c472ae01e4d26ea877bccb911d910730409e13183928426ce07a401da38a55fbcb39e411530f993d758e8dbf244cd1
DIST turbovnc-3.1.1.tar.gz.sig 543 BLAKE2B 2563db72dbca74781b0c2d76867298c400db61bff120e8bd4167c90347c94a26824f7aa252a2ac9fc1b0c101d56caeaceec74155ae5593428ad23a36373e998a SHA512 0dd0bde26bba3fe7ebbbe3c1a0af5f7e223026f140f031ae29405a47dd5d62183f22ea9fd6e1902b23016887503d80b65f77c48759e540ae8969a17046e41c60
DIST turbovnc-3.1.2.tar.gz 9037445 BLAKE2B 0a645c510ce9caf7b0a8cbbf74debf1d1c6a159a46798176d7c6103f18b81b1191c5f82e365fa6eadb8e128a6a4f5060b6d456cda858f4d87361a5ca4bf7d842 SHA512 ab66ac516c1d8cbadeb205c3a46233d25893bf415eeb1004825c613997f9b17c858e823d7264a92459a82e24e9c9b372298b7bcec7c413a4b9206dadcc99e29c
diff --git a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch
deleted file mode 100644
index 0769f00ffa56..000000000000
--- a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
- add_definitions(-DLOCALCONN)
- elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch b/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch
deleted file mode 100644
index a94c76ddfd24..000000000000
--- a/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Jdk 8 does not need -d32
-Jdk 11+ doesn't recognize it at all, so the viewer doesn't start on x86
-
---- a/unix/vncviewer/vncviewer.in
-+++ b/unix/vncviewer/vncviewer.in
-@@ -53,8 +53,4 @@
- LD_LIBRARY_PATH=$JAWT_PATH:$LD_LIBRARY_PATH
- export LD_LIBRARY_PATH
- fi
--if [ "@BITS@" = "32" ]; then
-- exec $JAVA -server -d@BITS@ -Djava.library.path=$TVNC_JAVADIR -jar $TVNC_JAVADIR/VncViewer.jar ${1+"$@"}
--else
-- exec $JAVA -server -Djava.library.path=$TVNC_JAVADIR -jar $TVNC_JAVADIR/VncViewer.jar ${1+"$@"}
--fi
-+exec $JAVA -server -Djava.library.path=$TVNC_JAVADIR -jar $TVNC_JAVADIR/VncViewer.jar ${1+"$@"}
diff --git a/net-misc/turbovnc/turbovnc-3.0.3.ebuild b/net-misc/turbovnc/turbovnc-3.0.3.ebuild
deleted file mode 100644
index 8bc1560582eb..000000000000
--- a/net-misc/turbovnc/turbovnc-3.0.3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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
-
-DESCRIPTION="A fast replacement for TigerVNC"
-HOMEPAGE="https://www.turbovnc.org/"
-SRC_URI="
- https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz
- verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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-fix-musl-compilation.patch
- "${FILESDIR}"/"${PN}"-3.0.3-java-launcher-32-bit.patch
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/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_BUILDHELPER=$(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 -rf "${ED}"/etc/init.d/ || die
- rm -rf "${ED}"/etc/sysconfig/ || die
-
- # Conflicts with x11-base/xorg-server
- find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die
-
- einstalldocs
-}