From 0c8bcb9058bf77c2583e51e8ef8889c7757b9b28 Mon Sep 17 00:00:00 2001
From: Christoph Willing <chris.willing@iinet.net.au>
Date: Thu, 2 Mar 2017 22:08:51 +1000
Subject: office/LibreOffice: Full local help. New JDK options

Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
---
 office/LibreOffice/LibreOffice.SlackBuild | 20 ++++++++++++++++----
 office/LibreOffice/LibreOffice.info       |  2 +-
 office/LibreOffice/README                 |  8 ++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'office')

diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index b7c6dfd137..5683f4355c 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -28,7 +28,7 @@ PRGNAM=LibreOffice
 SRCNAM=libreoffice
 VERSION=${VERSION:-5.3.0.3}
 SHORT_VERSION=${VERSION%.*.*}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PACKAGER=${PACKAGER:-"AnonymousCoward"}
 
@@ -89,8 +89,19 @@ vlc=""               ; [ "${VLC:-no}" != "no" ]        && vlc="--enable-vlc"
 kde4="--enable-kde4" ; [ "${KDE4:-yes}" != "yes" ]     && kde4="--disable-kde4"
 LOLANGS=${LOLANGS:-"de es fr id it ja nl vi zh-CN"}
 
-# LibreOffice.info REQUIRES jdk
-[ -z $JAVA_HOME ] && . /etc/profile.d/jdk.sh
+JAVA=${JAVA:-openjdk}
+if [ "$JAVA" = "openjdk" ]; then
+  . /etc/profile.d/openjdk.sh
+  use_java="--with-java=java"
+elif [ "$JAVA" = "openjdk8" ]; then
+  . /etc/profile.d/openjdk8.sh
+  use_java="--with-java=java"
+elif [ "$JAVA" = "jdk" ]; then
+  . /etc/profile.d/jdk.sh
+  use_java="--with-java=java"
+elif [ "$JAVA" = "no" ]; then
+  use_java="--with-java=no"
+fi
 
 #    --with-system-harfbuzz \
 ./configure \
@@ -113,13 +124,14 @@ LOLANGS=${LOLANGS:-"de es fr id it ja nl vi zh-CN"}
     $avahi \
     $vlc \
     $kde4 \
+    $use_java \
     --with-x \
     --with-tls="nss" \
     --without-krb5 \
     --without-gssapi \
     --without-junit \
     --with-ant-home=lib$LIBDIRSUFFIX/apache-ant \
-    --with-help=common \
+    --with-help \
     --with-system-boost \
     --with-system-cairo \
     --with-system-curl \
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index f2b237e8d8..152e815ecd 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -7,6 +7,6 @@ MD5SUM="204c492a0b5e58dd0be9788c74a364ab   \
         20d3cee8f200ce35b6f1c966ef5abb3e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 jdk apache-ant perl-Archive-Zip"
+REQUIRES="python3 openjdk apache-ant perl-Archive-Zip"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
diff --git a/office/LibreOffice/README b/office/LibreOffice/README
index a0776202ee..cb12be8a0d 100644
--- a/office/LibreOffice/README
+++ b/office/LibreOffice/README
@@ -28,6 +28,14 @@ Build time environment variables that may set to vary features are as follows:
    Additionally, setting LOLANGS="ALL" will build in support for all available
    languages.
 
+5. A number of Java Development Kits are suitable for building LibreOffice.
+   The default JDK for this SlackBuild is openjdk. Others may be chosen by
+   setting the JAVA environment variable when running the SlackBuild. Recognised
+   values are openjdk (the default, not explicitly required), openjdk8 and jdk
+   e.g. JAVA=jdk (to use SBo jdk package with Oracle binary version). Using an
+   alternate JDK will require presesnce of the appropriate package when building
+   LibreOffice. Setting JAVA=no will build LibreOffice without any Java support.
+
 For performance reasons, this Slackbuild sets GTK2 to be used at runtime.
 Alternatives (gen, gtk3, kde4) may still be used by setting SAL_USE_VCLPLUGIN
 in the user environment.
-- 
cgit v1.2.3-65-gdbad