From 2acfdc828ad7f5c82a27a437793f5c3ec11d6c3b Mon Sep 17 00:00:00 2001 From: Andrew Clemons Date: Tue, 1 Mar 2022 19:05:00 +1300 Subject: libraries/rxtx: Use zulu-openjdk8. Also only reference Java 8 JDKs, instead of all of them. Signed-off-by: Andrew Clemons Signed-off-by: Willy Sudiarto Raharjo --- libraries/rxtx/README | 4 ++-- libraries/rxtx/rxtx.SlackBuild | 3 +-- libraries/rxtx/rxtx.info | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/rxtx/README b/libraries/rxtx/README index ddc1b0180e95f..f573945dcc32c 100644 --- a/libraries/rxtx/README +++ b/libraries/rxtx/README @@ -1,7 +1,7 @@ RXTX is a Java library providing serial and parallel port communication. -RXTX's .info file says it requires the jdk package, but other JDKs can -be used instead (e.g. openjdk8, adoptopenjdk). +RXTX's .info file says it requires the zulu-openjdk8 package, but other +JDKs can be used instead (e.g. openjdk8, jdk). If you are upgrading from rxtx-2.0_7pre2, please note that the javacomm package is no longer required and should be uninstalled before building diff --git a/libraries/rxtx/rxtx.SlackBuild b/libraries/rxtx/rxtx.SlackBuild index aeff018b9fc79..540c76fef6959 100644 --- a/libraries/rxtx/rxtx.SlackBuild +++ b/libraries/rxtx/rxtx.SlackBuild @@ -69,8 +69,7 @@ fi # that's executable. we just have too many jdk choices, and some of us # don't want to jump through oracle's hoops to download their jdk. if [ -z "$JAVA_HOME" ]; then - JDKS="jdk jdk11 openjdk8 adoptopenjdk zulu-openjdk11" - JDKS+=" zulu-openjdk8 zulu-openjdk11 zulu-openjdk17" + JDKS="jdk openjdk8 zulu-openjdk8" for i in $JDKS; do if [ -x /etc/profile.d/$i.sh ]; then . /etc/profile.d/$i.sh diff --git a/libraries/rxtx/rxtx.info b/libraries/rxtx/rxtx.info index 9a581729d0e0f..c172dbaa1992b 100644 --- a/libraries/rxtx/rxtx.info +++ b/libraries/rxtx/rxtx.info @@ -5,6 +5,6 @@ DOWNLOAD="http://gentoo.osuosl.org/distfiles/rxtx-2.2pre2.zip" MD5SUM="7eedb18e3f33a427e2b0e9be8ce3f94c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" -- cgit v1.2.3