diff options
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/Manifest.gz | bin | 54073 -> 54072 bytes | |||
| -rw-r--r-- | net-misc/turbovnc/Manifest | 5 | ||||
| -rw-r--r-- | net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch | 4 | ||||
| -rw-r--r-- | net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch | 15 | ||||
| -rw-r--r-- | net-misc/turbovnc/turbovnc-3.0.3.ebuild | 7 |
5 files changed, 25 insertions, 6 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex 503857c29bc7..7d9ac9861dc1 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 5ae6967b5120..8d5423d36579 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,5 +1,6 @@ -AUX turbovnc-3.0-fix-musl-compilation.patch 936 BLAKE2B d0785023ecf0ffa4f1c1d4f09ad8669d04780bf7c7159da06caf4ee8b58c2b46268d55c6148de95b9bfc8d4c695e2571338aa90c65ee848e1cf5886ffb909309 SHA512 dbf30af408a921a73e3100e5f05639beea2466c02cb8b3b2c8c498e904ba33bc84f92541f1e7d03ac6ae8301afcdfa537101ea9efe3c52245e2470903b13a517 +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 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 -EBUILD turbovnc-3.0.3.ebuild 3068 BLAKE2B 2095075516bf15e83ec1fb807399a60bca497f88d0bcf5438707d9520a340655ac488c66cc830d8574286b6f41d83f7f2f5d4d9f0c705bfd61bbd91c6ab16143 SHA512 8d2ef334a653b3f86c36b095252860ff5a58f2bf614d94fa34378e221abcd53305b6757ce50528719184c1b3308e1dd2ecc7c425f5b2f748065e047652f0ea00 +EBUILD turbovnc-3.0.3.ebuild 3130 BLAKE2B 45e499ce9939e968961e6f4863bbc3cba8e574b76163eaac2161ca6e7da9bf93e3ee4672c8d240f750b628a8c5d7723ada2be2987d3d3e8fc410a9b2e3f18940 SHA512 66fb246e97e6469fa8f84782c199d3a12cc654db60a20c1d9e1a25c81dc2fdaa2af557b76d075869555a8e78f96a486d38a29c12f11b1b69da03c1b28e91ace7 MISC metadata.xml 820 BLAKE2B 331426a28ac5efa9f27d1e9b21e4b75e6965b5c1cf41ce7b8d98b03187fc56d81ffb58f555fc522188d1003e64713220b6f5591131fb8a26a8fe43e277f54526 SHA512 0aa50eef5eb122e0de38bf5e2f8d0627841419dd5e88ee58444493f4a9804626111d5edc5b36aa996635f38c7fd87c71706dd543305f9b495031971b1c52be3d 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 |