diff options
| author |   Viorel Munteanu <ceamac@gentoo.org> | 2023-07-01 07:07:12 +0300 |
|---|---|---|
| committer | Viorel Munteanu <ceamac@gentoo.org> | 2023-07-01 07:08:02 +0300 |
| commit | 69d36da667d64f0e868818104b9e7a72c0e39ff7 (patch) | |
| tree | 5d8d64c8ba3bbd95caf754ecdbb9e6b237c9ea48 | |
| parent | sec-keys/openpgp-keys-vgl-turbovnc: keyword 20221229 for ~x86 (diff) | |
| download | gentoo-69d36da667d64f0e868818104b9e7a72c0e39ff7.tar.gz gentoo-69d36da667d64f0e868818104b9e7a72c0e39ff7.tar.bz2 gentoo-69d36da667d64f0e868818104b9e7a72c0e39ff7.zip | |
net-misc/turbovnc: keyword 3.0.3 for ~x86
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
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 |