public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
Date: Sun, 27 Feb 2022 00:19:45 +0000 (UTC)	[thread overview]
Message-ID: <1645921164.ead3e37592f29f619d9bc33ae447fa71d15345ef.sam@gentoo> (raw)

commit:     ead3e37592f29f619d9bc33ae447fa71d15345ef
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Sat Feb 26 09:10:12 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 00:19:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ead3e375

net-misc/turbovnc: do not build vncviewer if !java

Closes: https://bugs.gentoo.org/833509
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24355
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...bovnc-2.2.7-r1.ebuild => turbovnc-2.2.7-r2.ebuild} | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
similarity index 84%
rename from net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild
rename to net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
index b57e81831f74..5b1a5561d896 100644
--- a/net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild
+++ b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake desktop java-pkg-opt-2
 
@@ -18,8 +18,8 @@ DEPEND="
 	app-arch/bzip2
 	media-libs/freetype
 	>=media-libs/libjpeg-turbo-2.0.0:=[java?]
+	sys-libs/pam
 	sys-libs/zlib
-	>=virtual/jdk-1.8:*
 	virtual/opengl
 	x11-libs/libfontenc
 	x11-libs/libX11
@@ -29,6 +29,10 @@ DEPEND="
 	x11-libs/libXfont2
 	x11-libs/libxkbfile
 	x11-libs/pixman
+	java? (
+		>=virtual/jdk-1.8:*
+		x11-libs/libXi
+	)
 	ssl? (
 		!gnutls? ( dev-libs/openssl:= )
 		gnutls? ( net-libs/gnutls:= )
@@ -40,10 +44,6 @@ RDEPEND="
 	x11-apps/xkbcomp
 "
 
-# net-misc/turbovnc does not build this file, it merely copies it
-# from media-libs/libjpeg-turbo
-QA_PREBUILT="usr/share/turbovnc/classes/libturbojpeg.so"
-
 src_prepare() {
 	use java && java-pkg-opt-2_src_prepare
 	cmake_src_prepare
@@ -54,7 +54,7 @@ src_configure() {
 		-DTVNC_SYSTEMX11=ON
 		-DTVNC_SYSTEMLIBS=ON
 		-DTVNC_BUILDJAVA=$(usex java)
-		-DTVNC_BUILDNATIVE=ON
+		-DTVNC_BUILDNATIVE=$(usex java)
 		-DXKB_BIN_DIRECTORY=/usr/bin
 		-DXKB_DFLT_RULES=base
 	)
@@ -95,6 +95,11 @@ src_install() {
 	if use java ; then
 		java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
 		make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png
+
+		# turbovnc does not build this file, it merely copies it from media-libs/libjpeg-turbo
+		# so let's replace it by a symlink
+		rm "${ED}/"usr/share/turbovnc/classes/libturbojpeg.so || die
+		dosym -r "/usr/$(get_libdir)/libturbojpeg.so" /usr/share/turbovnc/classes/libturbojpeg.so
 	fi
 
 	# Don't install incompatible init script


             reply	other threads:[~2022-02-27  0:19 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-27  0:19 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-20 15:51 [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/ Viorel Munteanu
2024-12-20 15:51 Viorel Munteanu
2024-12-20 15:51 Viorel Munteanu
2024-11-09  8:54 Viorel Munteanu
2024-08-09  7:14 Viorel Munteanu
2024-08-09  7:14 Viorel Munteanu
2024-01-28  7:38 Viorel Munteanu
2023-11-29 22:09 Viorel Munteanu
2023-11-19  7:41 Viorel Munteanu
2023-11-19  7:41 Viorel Munteanu
2023-08-18 16:48 Viorel Munteanu
2023-05-12  4:40 Viorel Munteanu
2023-05-12  4:40 Viorel Munteanu
2023-02-28  5:45 Viorel Munteanu
2023-01-15  8:39 Viorel Munteanu
2022-12-30  9:18 Viorel Munteanu
2022-12-30  9:18 Viorel Munteanu
2022-12-30  9:18 Viorel Munteanu
2022-11-02 16:17 Viorel Munteanu
2022-10-29 21:32 Sam James
2022-09-05 12:37 Joonas Niilola
2022-09-05 12:37 Joonas Niilola
2022-04-18  7:27 Joonas Niilola
2022-02-20  5:51 Sam James
2022-02-18  1:12 Sam James
2022-02-18  1:12 Sam James
2021-12-22  5:24 Sam James
2021-03-01 16:42 Sam James
2021-03-01 16:42 Sam James
2021-03-01 16:42 Sam James
2021-03-01 16:08 Sam James
2021-03-01 16:08 Sam James
2021-03-01 16:08 Sam James
2021-03-01 15:54 Sam James
2021-03-01 15:54 Sam James
2021-03-01 15:43 Sam James
2021-03-01 15:42 Sam James
2021-03-01 15:28 Sam James
2021-03-01 15:26 Sam James
2021-03-01 15:26 Sam James
2021-03-01 15:26 Sam James
2021-03-01 15:26 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1645921164.ead3e37592f29f619d9bc33ae447fa71d15345ef.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox