From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9A4E8158092 for ; Fri, 17 Sep 2021 02:34:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1DACE081E; Fri, 17 Sep 2021 02:34:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF794E081E for ; Fri, 17 Sep 2021 02:34:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 404CA342EB5 for ; Fri, 17 Sep 2021 02:34:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90870AC for ; Fri, 17 Sep 2021 02:34:01 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1631844864.5b32857aad326b3f495f80c1e529f940ffb4cff0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild X-VCS-Directories: net-misc/tigervnc/ net-misc/tigervnc/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5b32857aad326b3f495f80c1e529f940ffb4cff0 X-VCS-Branch: master Date: Fri, 17 Sep 2021 02:34:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5e33ac0f-af82-41c6-a0a3-3074554dd433 X-Archives-Hash: a6252b6fff4f8e034a24b54304a36b15 commit: 5b32857aad326b3f495f80c1e529f940ffb4cff0 Author: Sam James gentoo org> AuthorDate: Fri Sep 17 02:14:24 2021 +0000 Commit: Sam James gentoo 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 sizeit.se> Closes: https://bugs.gentoo.org/769794 Signed-off-by: Sam James 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 +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