summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Christoph Willing2019-12-01 08:29:35 +0100
committer Matteo Bernardini2019-12-07 19:07:05 +0100
commitd1589bb26eb74c58ba74ef3e2b8a0f69cf691987 (patch)
tree2a1e27396b78aa519beed54d4e0b2bf25af183ad
parent4b7b01aae75cc2cc8db1eedc90b43f8400bef53e (diff)
downloadslackbuilds-LibreOffice.tar.gz
office/LibreOffice: Updated for version 6.3.1.2.LibreOffice
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--office/LibreOffice/LibreOffice.SlackBuild9
-rw-r--r--office/LibreOffice/LibreOffice.info12
-rw-r--r--office/LibreOffice/README20
3 files changed, 18 insertions, 23 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 14fd0f2042..416819871f 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -26,9 +26,9 @@
PRGNAM=LibreOffice
SRCNAM=libreoffice
-VERSION=${VERSION:-6.2.8.2}
+VERSION=${VERSION:-6.3.1.2}
SHORT_VERSION=${VERSION%.*.*}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PACKAGER=${PACKAGER:-"AnonymousCoward"}
@@ -91,7 +91,7 @@ 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:-jdk}
if [ "$JAVA" = "openjdk7" ]; then
. /etc/profile.d/openjdk7.sh
use_java="--with-java=java"
@@ -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 \
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index fc9a4c48ec..32a6570afe 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -1,12 +1,12 @@
PRGNAM="LibreOffice"
-VERSION="6.2.8.2"
+VERSION="6.3.1.2"
HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/6.2.8/libreoffice-6.2.8.2.tar.xz \
- http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-6.2.8.2-srcs.tar.xz"
-MD5SUM="1438fdfae3076b8b1b1460054a318f0b \
- b5d5e57832056d8a5625b1d5dc3aa024"
+DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/6.3.1/libreoffice-6.3.1.2.tar.xz \
+ http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-6.3.1.2-srcs.tar.xz"
+MD5SUM="d6d546055af3569b3c4064f273d3baf1 \
+ 030c8647db051c7ef51c6594b854427f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="python3 openjdk7 apache-ant perl-Archive-Zip"
+REQUIRES="python3 apache-ant perl-Archive-Zip jdk"
MAINTAINER="Christoph Willing"
EMAIL="chris.willing@linux.com"
diff --git a/office/LibreOffice/README b/office/LibreOffice/README
index 69c212624c..addec25a27 100644
--- a/office/LibreOffice/README
+++ b/office/LibreOffice/README
@@ -35,10 +35,7 @@ Build time environment variables that may be set to vary features are as follows
VLC="yes"
This requires the vlc package (available from SBo) to be installed.
-3. disable kde4 support (enabled by default) with:
- KDE4="no"
-
-4. support additional languages by overriding the LOLANGS variable, whose
+2. support additional languages by overriding the LOLANGS variable, whose
default setting is LOLANGS="de es fr id it ja nl vi zh-CN". Note that en-US
is always added to whatever LOLANGS is set. Thus building with, for example,
LOLANGS="de" sh LibreOffice
@@ -46,19 +43,20 @@ Build time environment variables that may be 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 openjdk7. Others may be chosen by
+3. A number of Java Development Kits are suitable for building LibreOffice.
+ The default JDK for this SlackBuild is jdk. Others may be chosen by
setting the JAVA environment variable when running the SlackBuild. Recognised
- values are openjdk7 (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 presence of the appropriate package when building
+ values are jdk, openjdk7 and openjdk8. For example:
+ JAVA=jdk
+ (to use SBo jdk package with Oracle binary version). Using an alternate
+ JDK will require the presence of the appropriate package when building
LibreOffice. Since the apache-ant package is already required by openjdk7,
hence openjdk8, its listing in the REQUIRES field is redundant in these cases.
However it remains listed to accomodate the case of JAVA=jdk, in which the
apache-ant package is needed to build LibreOffice.
Finally, setting JAVA=no will build LibreOffice without any Java support.
-6. The number of parallel make jobs used by the LibreOffice build system defaults
+4. The number of parallel make jobs used by the LibreOffice build system defaults
to the number of available cpu cores. If the MAKEFLAGS environment variable
contains the -j option e.g.
MAKEFLAGS=-j6
@@ -69,7 +67,7 @@ Build time environment variables that may be set to vary features are as follows
which would limit building to a single make process, overriding any value set
with the -j option in MAKEFLAGS.
-7. Use of ccache during building is turned off by default to save disk space (and
+5. Use of ccache during building is turned off by default to save disk space (and
possible build failure due to lack of disk space). It may be reinstated by
setting the USE_CCACHE environment to "yes" e.g.
USE_CCACHE=yes sh LibreOffice.SlackBuild