diff options
Diffstat (limited to 'office/LibreOffice/LibreOffice.SlackBuild')
| -rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index 14fd0f2042..2747bc62a1 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -4,7 +4,7 @@ # Slackware build script for LibreOffice -# Copyright 2015-2019 Christoph Willing Brisbane, Australia +# Copyright 2015-2020 Christoph Willing Brisbane, Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ PRGNAM=LibreOffice SRCNAM=libreoffice -VERSION=${VERSION:-6.2.8.2} +VERSION=${VERSION:-7.0.0.3} SHORT_VERSION=${VERSION%.*.*} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -91,15 +91,15 @@ 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:-openjdk7} +JAVA=${JAVA:-jdk11} if [ "$JAVA" = "openjdk7" ]; then . /etc/profile.d/openjdk7.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 +elif [ "$JAVA" = "jdk11" ]; then + . /etc/profile.d/jdk11.sh use_java="--with-java=java" elif [ "$JAVA" = "no" ]; then use_java="--with-java=no" @@ -154,7 +154,6 @@ if pkg-config --exists python3 ; then Python3="--enable-python=system" ; else Py if pkg-config --exists Qt5 ; then qt5="--enable-qt5" ; else qt5="" ; fi if pkg-config --exists valgrind ; then valgrind="--with-valgrind" ; else valgrind="" ; fi -kde4="--enable-kde4" ; [ "${KDE4:-yes}" != "yes" ] && kde4="--disable-kde4" use_ccache="--disable-ccache" ; [ "${USE_CCACHE:-no}" != "no" ] && use_ccache="" # Extensions @@ -168,7 +167,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & ./autogen.sh \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ - NSS_CFLAGS="$(pkg-config --cflags-only-I mozilla-nss)"\ --prefix=/usr \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -188,7 +186,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & $avahi \ $Python3 \ $vlc \ - $kde4 \ $use_ccache \ $use_java \ $parallel \ |