commit: 5b32857aad326b3f495f80c1e529f940ffb4cff0 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Sep 17 02:14:24 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Sep 17 02:14:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b32857a
net-misc/tigervnc: restore Java viewer in 1.11.x Thanks-to: Erik Wallin <erikw <AT> sizeit.se> Closes: https://bugs.gentoo.org/769794 Signed-off-by: Sam James <sam <AT> gentoo.org> .../tigervnc-1.11.0-install-java-viewer.patch | 26 ++++++++++++++++++++++ ...-1.11.0-r3.ebuild => tigervnc-1.11.0-r4.ebuild} | 5 +++++ 2 files changed, 31 insertions(+) diff --git a/net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch b/net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch new file mode 100644 index 00000000000..3afaf82d002 --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch @@ -0,0 +1,26 @@ +See bug for rationale, gist is that this is still useful. + +Patch from Erik Wallin <er...@sizeit.se> +https://bugs.gentoo.org/769794 +--- a/java/CMakeLists.txt ++++ b/java/CMakeLists.txt +@@ -7,6 +7,8 @@ + + find_package(Java) + ++set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share") ++ + set(DEFAULT_JAVACFLAGS "-source 8 -target 8 -encoding UTF-8 -Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes") + set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING + "Java compiler flags (Default: ${DEFAULT_JAVACFLAGS})") +@@ -172,3 +174,10 @@ + -P ${SRCDIR}/cmake/SignJar.cmake) + + add_custom_target(java ALL DEPENDS VncViewer.jar) ++ ++if(NOT WIN32) ++ install(FILES ++ ${BINDIR}/VncViewer.jar ++ ${SRCDIR}/${CLASSPATH}/README ++ DESTINATION ${DATA_DIR}/vnc/classes) ++endif() diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild similarity index 97% rename from net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild rename to net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild index 576dcb604f1..34e7e078e37 100644 --- a/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild +++ b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild @@ -74,6 +74,11 @@ DEPEND="${CDEPEND} opengl? ( >=media-libs/mesa-10.3.4-r1 ) )" +PATCHES=( + # Restore Java viewer + "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch +) + src_prepare() { if use server; then cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
