From b2519f95fdcc4c34874b99ada283907bfc6147ec Mon Sep 17 00:00:00 2001 From: Andrew Clemons Date: Tue, 1 Mar 2022 21:56:01 +1300 Subject: various: Use zulu jdk builds for REQUIRES. As noted in the FAQ, you can still use Oracle's JDK for building or running, but we'll default to the Zulu builds in the REQUIRES since they are easily downloadable. Zulu is a good default for us at SBo since it is available for both 32 and 64 bit, freely downloadable and compatible and they provide builds for all the LTS branches. We don't currently have builds for Adoptium (previously AdoptOpenJDK, not part of the Eclipse Foundation), but if someone wants to submit builds for them, we can include them too. Note though that they do not provide 32 bit builds. Software should run with either Zulu or Oracle's JDK, or indeed any other builds of OpenJDK, so if I have broken your build with this change, apologies. This should be rare and we can change the REQUIRES back to jdkX in that case and note it in the README, but I do not expect this should be the case. Signed-off-by: Andrew Clemons Signed-off-by: Willy Sudiarto Raharjo --- office/LanguageTool/LanguageTool.info | 2 +- office/LibreOffice/LibreOffice.SlackBuild | 41 ++++++++++++---------- office/LibreOffice/LibreOffice.info | 2 +- office/ProjectLibre/ProjectLibre.info | 2 +- office/bookbinder/bookbinder.info | 2 +- office/briss/briss.info | 2 +- office/broffice.org/broffice.org.info | 2 +- office/flowkeeper/flowkeeper.info | 2 +- office/freemind/freemind.info | 2 +- office/ganttproject/ganttproject.info | 2 +- office/jpdfbookmarks/jpdfbookmarks.info | 2 +- office/jstock/jstock.info | 2 +- office/libreoffice/libreoffice.info | 2 +- .../multivalent-tool-pdf/multivalent-tool-pdf.info | 2 +- office/pdfstudio/pdfstudio.info | 2 +- office/pdfstudioviewer/pdfstudioviewer.info | 2 +- office/xmind/xmind.info | 2 +- 17 files changed, 39 insertions(+), 34 deletions(-) (limited to 'office') diff --git a/office/LanguageTool/LanguageTool.info b/office/LanguageTool/LanguageTool.info index 1bb3381b56f4..97406cf7dc01 100644 --- a/office/LanguageTool/LanguageTool.info +++ b/office/LanguageTool/LanguageTool.info @@ -5,6 +5,6 @@ DOWNLOAD="https://www.languagetool.org/download/LanguageTool-3.5.zip" MD5SUM="b750011ec97d2fd94e41fc37899844d3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index 143d1db258de..f9c470122393 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -92,7 +92,6 @@ else HAVE_SRCS_TARBALL=0 fi - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -110,24 +109,30 @@ jval="$(echo $MAKEFLAGS |grep -o "\-j *[0-9]*" | grep -o "[0-9]*")" || true # If PARALLEL environment variable is set, use that to override everything. [ "${PARALLEL:-0}" != "0" ] && parallel="--with-parallelism=$PARALLEL" -JAVA=${JAVA:-jdk11} -if [ "$JAVA" = "jdk11" ]; then - . /etc/profile.d/jdk11.sh - use_java="--with-jdk-home=$JAVA_HOME" -elif [ "$JAVA" = "jdk12" ]; then - . /etc/profile.d/jdk12.sh - use_java="--with-jdk-home=$JAVA_HOME" -elif [ "$JAVA" = "jdk13" ]; then - . /etc/profile.d/jdk13.sh - use_java="--with-jdk-home=$JAVA_HOME" -elif [ "$JAVA" = "jdk14" ]; then - . /etc/profile.d/jdk14.sh - use_java="--with-jdk-home=$JAVA_HOME" -elif [ "$JAVA" = "jdk15" ]; then - . /etc/profile.d/jdk15.sh - use_java="--with-jdk-home=$JAVA_HOME" -elif [ "$JAVA" = "no" ]; then +JAVA=${JAVA:-} +if [ "$JAVA" = "no" ]; then use_java="--with-java=no" +else + if [ -z "$JAVA_HOME" ]; then + # if JAVA_HOME isn't set, try to set it by sourcing the profile script + for i in /etc/profile.d/*jdk*.sh; do + if [ -x $i ]; then + source $i + break + fi + done + fi + + if [ -z "$JAVA_HOME" ]; then + cat <