commit: 394d4037791c1c6f62cd84a0a01794295c645948
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Wed May 3 17:04:33 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Wed May 3 17:04:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394d4037
net-misc/tigervnc: sync live
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../files/tigervnc-1.13.80-depend-po-files.patch | 36 ----------------------
net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild | 1 -
net-misc/tigervnc/tigervnc-9999.ebuild | 9 +++---
3 files changed, 5 insertions(+), 41 deletions(-)
diff --git a/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
b/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
deleted file mode 100644
index d611ece53fb1..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Currently the live version does not build because of this dependency. Remove
it for now
-
---- a/vncviewer/CMakeLists.txt
-+++ b/vncviewer/CMakeLists.txt
-@@ -81,7 +81,6 @@
- --desktop --template vncviewer.desktop.in
- -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
-- ${CMAKE_SOURCE_DIR}/po/*.po
- )
- elseif(INTLTOOL_MERGE_EXECUTABLE)
- add_custom_command(OUTPUT vncviewer.desktop
-@@ -93,7 +92,6 @@
- -d ${CMAKE_SOURCE_DIR}/po
- vncviewer.desktop.intl vncviewer.desktop
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
-- ${CMAKE_SOURCE_DIR}/po/*.po
- )
- else()
- add_custom_command(OUTPUT vncviewer.desktop
-@@ -110,7 +108,6 @@
- --xml --template
${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
- -d ${CMAKE_SOURCE_DIR}/po -o
org.tigervnc.vncviewer.metainfo.xml
- DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
-- ${CMAKE_SOURCE_DIR}/po/*.po
- )
- elseif(INTLTOOL_MERGE_EXECUTABLE)
- add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
-@@ -123,7 +120,6 @@
- -x ${CMAKE_SOURCE_DIR}/po
- org.tigervnc.vncviewer.metainfo.xml.intl
org.tigervnc.vncviewer.metainfo.xml
- DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
-- ${CMAKE_SOURCE_DIR}/po/*.po
- )
- else()
- add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
index 7c3dbedebb53..891ae952cf7e 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
@@ -103,7 +103,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
)
-[[ ${PV} == *9999 ]] && PATCHES+=(
"${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
src_unpack() {
if [[ ${PV} == *9999 ]]; then
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild
b/net-misc/tigervnc/tigervnc-9999.ebuild
index fc6cb7d77a07..891ae952cf7e 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -6,7 +6,8 @@ EAPI=8
CMAKE_IN_SOURCE_BUILD=1
inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
-XSERVER_VERSION="21.1.1"
+XSERVER_VERSION="21.1.8"
+XSERVER_PATCH_VERSION="21.1.1"
DESCRIPTION="Remote desktop viewer display system"
HOMEPAGE="https://tigervnc.org";
@@ -71,13 +72,14 @@ COMMON_DEPEND="
)
"
RDEPEND="${COMMON_DEPEND}
- java? ( virtual/jre:1.8 )
+ java? ( >=virtual/jre-1.8:* )
server? (
dev-lang/perl
sys-process/psmisc
)
"
DEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jdk-1.8:* )
drm? ( x11-libs/libdrm )
server? (
media-fonts/font-util
@@ -101,7 +103,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
)
-[[ ${PV} == *9999 ]] && PATCHES+=(
"${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
src_unpack() {
if [[ ${PV} == *9999 ]]; then
@@ -121,7 +122,7 @@ src_prepare() {
if use server; then
cd unix/xserver || die
- eapply ../xserver${XSERVER_VERSION}.patch
+ eapply ../xserver${XSERVER_PATCH_VERSION}.patch
eautoreconf
sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c ||
die
