From 1228641af810c467e3e15c1a3a70864e4644460d Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Sun, 2 Jun 2024 16:42:08 +0200 Subject: [PATCH] dev-java/swt: add x11-libs/libX11 to RDEPEND MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/2Kmm/java/issues/10 https://github.com/2Kmm/java/issues/9 https://github.com/2Kmm/java/issues/8 https://github.com/2Kmm/java/issues/7 Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/36978 Signed-off-by: Miroslav Šulc --- dev-java/swt/{swt-4.10-r3.ebuild => swt-4.10-r4.ebuild} | 3 ++- dev-java/swt/{swt-4.29.ebuild => swt-4.29-r1.ebuild} | 5 +++-- dev-java/swt/{swt-4.30-r1.ebuild => swt-4.30-r2.ebuild} | 3 ++- dev-java/swt/{swt-4.31.ebuild => swt-4.31-r1.ebuild} | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) rename dev-java/swt/{swt-4.10-r3.ebuild => swt-4.10-r4.ebuild} (99%) rename dev-java/swt/{swt-4.29.ebuild => swt-4.29-r1.ebuild} (97%) rename dev-java/swt/{swt-4.30-r1.ebuild => swt-4.30-r2.ebuild} (98%) rename dev-java/swt/{swt-4.31.ebuild => swt-4.31-r1.ebuild} (98%) diff --git a/dev-java/swt/swt-4.10-r3.ebuild b/dev-java/swt/swt-4.10-r4.ebuild similarity index 99% rename from dev-java/swt/swt-4.10-r3.ebuild rename to dev-java/swt/swt-4.10-r4.ebuild index 5b0d33375cad..9c3211738446 100644 --- a/dev-java/swt/swt-4.10-r3.ebuild +++ b/dev-java/swt/swt-4.10-r4.ebuild @@ -47,7 +47,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXt x11-libs/libXtst" RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" + >=virtual/jre-1.8:* + x11-libs/libX11" # JNI libraries don't need SONAME, bug #253756 QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so' diff --git a/dev-java/swt/swt-4.29.ebuild b/dev-java/swt/swt-4.29-r1.ebuild similarity index 97% rename from dev-java/swt/swt-4.29.ebuild rename to dev-java/swt/swt-4.29-r1.ebuild index 08361076b0b5..6dbc30c768f9 100644 --- a/dev-java/swt/swt-4.29.ebuild +++ b/dev-java/swt/swt-4.29-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -44,7 +44,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXt x11-libs/libXtst" RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" + >=virtual/jre-1.8:* + x11-libs/libX11" BDEPEND=" app-arch/unzip virtual/pkgconfig diff --git a/dev-java/swt/swt-4.30-r1.ebuild b/dev-java/swt/swt-4.30-r2.ebuild similarity index 98% rename from dev-java/swt/swt-4.30-r1.ebuild rename to dev-java/swt/swt-4.30-r2.ebuild index f0ea9b557f4b..61d849831270 100644 --- a/dev-java/swt/swt-4.30-r1.ebuild +++ b/dev-java/swt/swt-4.30-r2.ebuild @@ -45,7 +45,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXtst" # error: pattern matching in instanceof is not supported in -source 11 RDEPEND="${COMMON_DEP} - >=virtual/jre-17:*" + >=virtual/jre-17:* + x11-libs/libX11" BDEPEND=" app-arch/unzip virtual/pkgconfig diff --git a/dev-java/swt/swt-4.31.ebuild b/dev-java/swt/swt-4.31-r1.ebuild similarity index 98% rename from dev-java/swt/swt-4.31.ebuild rename to dev-java/swt/swt-4.31-r1.ebuild index 5d3dfd9effdc..382a538ccff2 100644 --- a/dev-java/swt/swt-4.31.ebuild +++ b/dev-java/swt/swt-4.31-r1.ebuild @@ -50,7 +50,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXtst" # error: pattern matching in instanceof is not supported in -source 11 RDEPEND="${COMMON_DEP} - >=virtual/jre-17:*" + >=virtual/jre-17:* + x11-libs/libX11" HTML_DOCS=( ../about.html )