* [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/, net-misc/turbovnc/
@ 2022-06-15 21:07 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-06-15 21:07 UTC (permalink / raw
To: gentoo-commits
commit: c55b548846bee43e4bfc56e7499109ed4738b72e
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Sun Jun 12 13:59:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 21:07:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c55b5488
net-misc/turbovnc: add 3.0
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25864
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/turbovnc/Manifest | 1 +
.../files/turbovnc-3.0-fix-musl-compilation.patch | 20 ++++
net-misc/turbovnc/turbovnc-3.0.ebuild | 102 +++++++++++++++++++++
3 files changed, 123 insertions(+)
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 1e90b89a91ba..faae4b9ed0f4 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1 +1,2 @@
DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788
+DIST turbovnc-3.0.tar.gz 8665757 BLAKE2B 98600dc1f4fd91b30c8c48f2e465aa4cb9c53190c08611374ed6e1ef59be585f1694a1c6827939dec9cf259bd0e9a8fbdea9194653f5a3c66eb97cca1e12b09b SHA512 baa5f62fa1d76a09dc16262d853598b9d9ba8a12f3804c27df6af4983700b4dc1ad7f981ea02e2dc4d36c29b0cd7a1d7a7a8c98b7ae971cbc688ca30fd5c19ec
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
new file mode 100644
index 000000000000..d96b7bc1ca28
--- /dev/null
+++ b/net-misc/turbovnc/files/turbovnc-3.0-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;
+ | ^~~~~~~~
+
+--- ./unix/Xvnc/programs/Xserver/os/CMakeLists.txt~ 2022-06-12 15:41:05.980270914 +0300
++++ ./unix/Xvnc/programs/Xserver/os/CMakeLists.txt 2022-06-12 15:43:14.113823213 +0300
+@@ -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/turbovnc-3.0.ebuild b/net-misc/turbovnc/turbovnc-3.0.ebuild
new file mode 100644
index 000000000000..26c0c3cbe94e
--- /dev/null
+++ b/net-misc/turbovnc/turbovnc-3.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop java-pkg-opt-2
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ssl"
+
+COMMON_DEPEND="
+ app-arch/bzip2
+ media-libs/freetype
+ >=media-libs/libjpeg-turbo-2.0.0:=[java?]
+ sys-libs/pam
+ sys-libs/zlib
+ virtual/opengl
+ x11-apps/xauth
+ x11-libs/libfontenc
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libXfont2
+ x11-libs/libxkbfile
+ x11-libs/pixman
+ x11-misc/xkeyboard-config
+ java? (
+ >=virtual/jdk-1.8:*
+ x11-libs/libXi
+ )
+ ssl? ( dev-libs/openssl:= )
+ !net-misc/tigervnc
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-apps/xkbcomp
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/xtrans
+"
+
+PATCHES=( "${FILESDIR}"/"${P}"-fix-musl-compilation.patch )
+
+src_prepare() {
+ use java && java-pkg-opt-2_src_prepare
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DTVNC_SYSTEMX11=ON
+ -DTVNC_SYSTEMLIBS=ON
+ -DTVNC_BUILDVIEWER=$(usex java)
+ -DTVNC_BUILDHELPER=$(usex java)
+ -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
+
+ if use java ; 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 java ; 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
+
+ find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die
+
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/, net-misc/turbovnc/
@ 2023-07-01 4:08 Viorel Munteanu
0 siblings, 0 replies; 4+ messages in thread
From: Viorel Munteanu @ 2023-07-01 4:08 UTC (permalink / raw
To: gentoo-commits
commit: 69d36da667d64f0e868818104b9e7a72c0e39ff7
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 1 04:07:12 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Jul 1 04:08:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d36da6
net-misc/turbovnc: keyword 3.0.3 for ~x86
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../files/turbovnc-3.0-fix-musl-compilation.patch | 4 ++--
.../files/turbovnc-3.0.3-java-launcher-32-bit.patch | 15 +++++++++++++++
net-misc/turbovnc/turbovnc-3.0.3.ebuild | 7 +++++--
3 files changed, 22 insertions(+), 4 deletions(-)
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
index d96b7bc1ca28..0769f00ffa56 100644
--- a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch
+++ b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch
@@ -7,8 +7,8 @@ The error is this:
1178 | struct ucred peercred;
| ^~~~~~~~
---- ./unix/Xvnc/programs/Xserver/os/CMakeLists.txt~ 2022-06-12 15:41:05.980270914 +0300
-+++ ./unix/Xvnc/programs/Xserver/os/CMakeLists.txt 2022-06-12 15:43:14.113823213 +0300
+--- 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)
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
new file mode 100644
index 000000000000..a94c76ddfd24
--- /dev/null
+++ b/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch
@@ -0,0 +1,15 @@
+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
index 7cd8e44d220b..2175f83cbc8c 100644
--- a/net-misc/turbovnc/turbovnc-3.0.3.ebuild
+++ b/net-misc/turbovnc/turbovnc-3.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE="+server +ssl +viewer"
REQUIRED_USE="|| ( server viewer )"
@@ -66,7 +66,10 @@ BDEPEND="
verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc )
"
-PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch )
+PATCHES=(
+ "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch
+ "${FILESDIR}"/"${PN}"-3.0.3-java-launcher-32-bit.patch
+)
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vgl-turbovnc.asc
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/, net-misc/turbovnc/
@ 2023-08-02 17:07 Viorel Munteanu
0 siblings, 0 replies; 4+ messages in thread
From: Viorel Munteanu @ 2023-08-02 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 943649c2a1b2f0cb06d0e521710b29a82b4d8aab
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 2 17:03:53 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> 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 <ceamac <AT> 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/, net-misc/turbovnc/
@ 2024-08-09 7:14 Viorel Munteanu
0 siblings, 0 replies; 4+ messages in thread
From: Viorel Munteanu @ 2024-08-09 7:14 UTC (permalink / raw
To: gentoo-commits
commit: a7c041d54bb662f41837c438b4ee6bb24fe5c60e
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 9 06:45:28 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Aug 9 07:14:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c041d5
net-misc/turbovnc: drop 3.0.3
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
net-misc/turbovnc/Manifest | 2 -
.../files/turbovnc-3.0-fix-musl-compilation.patch | 20 ---
.../turbovnc-3.0.3-java-launcher-32-bit.patch | 15 ---
net-misc/turbovnc/turbovnc-3.0.3.ebuild | 142 ---------------------
4 files changed, 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-09 7:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-15 21:07 [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/, net-misc/turbovnc/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-07-01 4:08 Viorel Munteanu
2023-08-02 17:07 Viorel Munteanu
2024-08-09 7:14 Viorel Munteanu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox