| 1 |
commit: ead3e37592f29f619d9bc33ae447fa71d15345ef |
| 2 |
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Feb 26 09:10:12 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 27 00:19:24 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ead3e375 |
| 7 |
|
| 8 |
net-misc/turbovnc: do not build vncviewer if !java |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/833509 |
| 11 |
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/24355 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
...bovnc-2.2.7-r1.ebuild => turbovnc-2.2.7-r2.ebuild} | 19 ++++++++++++------- |
| 16 |
1 file changed, 12 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild |
| 19 |
similarity index 84% |
| 20 |
rename from net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild |
| 21 |
rename to net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild |
| 22 |
index b57e81831f74..5b1a5561d896 100644 |
| 23 |
--- a/net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild |
| 24 |
+++ b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild |
| 25 |
@@ -1,7 +1,7 @@ |
| 26 |
# Copyright 1999-2022 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
-EAPI=7 |
| 30 |
+EAPI=8 |
| 31 |
|
| 32 |
inherit cmake desktop java-pkg-opt-2 |
| 33 |
|
| 34 |
@@ -18,8 +18,8 @@ DEPEND=" |
| 35 |
app-arch/bzip2 |
| 36 |
media-libs/freetype |
| 37 |
>=media-libs/libjpeg-turbo-2.0.0:=[java?] |
| 38 |
+ sys-libs/pam |
| 39 |
sys-libs/zlib |
| 40 |
- >=virtual/jdk-1.8:* |
| 41 |
virtual/opengl |
| 42 |
x11-libs/libfontenc |
| 43 |
x11-libs/libX11 |
| 44 |
@@ -29,6 +29,10 @@ DEPEND=" |
| 45 |
x11-libs/libXfont2 |
| 46 |
x11-libs/libxkbfile |
| 47 |
x11-libs/pixman |
| 48 |
+ java? ( |
| 49 |
+ >=virtual/jdk-1.8:* |
| 50 |
+ x11-libs/libXi |
| 51 |
+ ) |
| 52 |
ssl? ( |
| 53 |
!gnutls? ( dev-libs/openssl:= ) |
| 54 |
gnutls? ( net-libs/gnutls:= ) |
| 55 |
@@ -40,10 +44,6 @@ RDEPEND=" |
| 56 |
x11-apps/xkbcomp |
| 57 |
" |
| 58 |
|
| 59 |
-# net-misc/turbovnc does not build this file, it merely copies it |
| 60 |
-# from media-libs/libjpeg-turbo |
| 61 |
-QA_PREBUILT="usr/share/turbovnc/classes/libturbojpeg.so" |
| 62 |
- |
| 63 |
src_prepare() { |
| 64 |
use java && java-pkg-opt-2_src_prepare |
| 65 |
cmake_src_prepare |
| 66 |
@@ -54,7 +54,7 @@ src_configure() { |
| 67 |
-DTVNC_SYSTEMX11=ON |
| 68 |
-DTVNC_SYSTEMLIBS=ON |
| 69 |
-DTVNC_BUILDJAVA=$(usex java) |
| 70 |
- -DTVNC_BUILDNATIVE=ON |
| 71 |
+ -DTVNC_BUILDNATIVE=$(usex java) |
| 72 |
-DXKB_BIN_DIRECTORY=/usr/bin |
| 73 |
-DXKB_DFLT_RULES=base |
| 74 |
) |
| 75 |
@@ -95,6 +95,11 @@ src_install() { |
| 76 |
if use java ; then |
| 77 |
java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar |
| 78 |
make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png |
| 79 |
+ |
| 80 |
+ # turbovnc does not build this file, it merely copies it from media-libs/libjpeg-turbo |
| 81 |
+ # so let's replace it by a symlink |
| 82 |
+ rm "${ED}/"usr/share/turbovnc/classes/libturbojpeg.so || die |
| 83 |
+ dosym -r "/usr/$(get_libdir)/libturbojpeg.so" /usr/share/turbovnc/classes/libturbojpeg.so |
| 84 |
fi |
| 85 |
|
| 86 |
# Don't install incompatible init script |
Archives