[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/

[Sam James]

commit:     9dc0ec55803692786e6538bca4a12b0102e775f3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  7 23:16:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  7 23:16:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc0ec55

net-misc/tigervnc: add 1.12.0 (still masked)

Note that this doesn't yet fix the xsession handling stuff, but
am looking to see what we can do about it.

Bug: https://bugs.gentoo.org/746227
Closes: https://bugs.gentoo.org/746359
Closes: https://bugs.gentoo.org/746365
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/tigervnc/Manifest                         |  1 +
 ...tigervnc-9999.ebuild => tigervnc-1.12.0.ebuild} | 41 +++++++++++-----------
 net-misc/tigervnc/tigervnc-9999.ebuild             |  9 +++--
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 4f5a3da9f469..d58cbabda1a3 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,5 @@
 DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac SHA512 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
+DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d

diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-1.12.0.ebuild
similarity index 81%
copy from net-misc/tigervnc/tigervnc-9999.ebuild
copy to net-misc/tigervnc/tigervnc-1.12.0.ebuild
index 01ff15488f6e..3fc099abd296 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0.ebuild
@@ -2,34 +2,33 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CMAKE_IN_SOURCE_BUILD=1
 
-inherit autotools cmake flag-o-matic git-r3 systemd xdg
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
 
 XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
 HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
-EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="dri3 +drm gnutls nls +opengl pam server xinerama +xorgmodule"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
 
 CDEPEND="
 	virtual/jpeg:0
 	sys-libs/zlib:=
 	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( sys-libs/pam )
+	sys-libs/pam
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
-	x11-libs/libxcvt
 	x11-libs/pixman
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
 	server? (
 		x11-libs/libXau
 		x11-libs/libXdamage
@@ -50,10 +49,12 @@ CDEPEND="
 RDEPEND="${CDEPEND}
 	!net-misc/tightvnc
 	!net-misc/vnc
-	!net-misc/xf4vnc"
+	!net-misc/xf4vnc
+	java? ( virtual/jre:1.8 )"
 
 DEPEND="${CDEPEND}
 	nls? ( sys-devel/gettext )
+	java? ( virtual/jdk:1.8 )
 	x11-base/xorg-proto
 	media-libs/fontconfig
 	x11-libs/libICE
@@ -73,10 +74,10 @@ DEPEND="${CDEPEND}
 		opengl? ( >=media-libs/mesa-10.3.4-r1 )
 	)"
 
-src_unpack() {
-	git-r3_src_unpack
-	unpack xorg-server-${XSERVER_VERSION}.tar.xz
-}
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+)
 
 src_prepare() {
 	if use server; then
@@ -87,12 +88,11 @@ src_prepare() {
 
 	if use server; then
 		cd unix/xserver || die
-		eapply ../xserver${XSERVER_VERSION}.patch
+		eapply "${FILESDIR}"/xserver120.patch
+		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
+		sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
 		eautoreconf
-		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
-		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
 	fi
-	cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
 }
 
 src_configure() {
@@ -103,8 +103,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_GNUTLS=$(usex gnutls)
 		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=no
+		-DBUILD_JAVA=$(usex java)
 	)
 
 	cmake_src_configure

diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index 01ff15488f6e..8b91a1a47c46 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -16,20 +16,20 @@ EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="dri3 +drm gnutls nls +opengl pam server xinerama +xorgmodule"
+IUSE="dri3 +drm gnutls nls +opengl server xinerama +xorgmodule"
 
 CDEPEND="
 	virtual/jpeg:0
 	sys-libs/zlib:=
 	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( sys-libs/pam )
+	sys-libs/pam
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
 	x11-libs/libxcvt
 	x11-libs/pixman
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
 	server? (
 		x11-libs/libXau
 		x11-libs/libXdamage
@@ -103,7 +103,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_GNUTLS=$(usex gnutls)
 		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
 		-DBUILD_JAVA=no
 	)