summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@iinet.net.au>2017-04-10 13:33:51 +1000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-04-15 07:18:02 +0700
commitf9bb12fdfcb2833133c4692675cb453786bb2e68 (patch)
treeea62ac3525ea56ee558f72421c954d471c90c2d2
parent89a24981761a83f7ba3a95ed8110f209e68550d5 (diff)
downloadslackbuilds-f9bb12fdfcb2833133c4692675cb453786bb2e68.tar.gz
office/LibreOffice: Updated for version 5.3.2.2
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
-rw-r--r--office/LibreOffice/LibreOffice.SlackBuild3
-rw-r--r--office/LibreOffice/LibreOffice.info10
-rw-r--r--office/LibreOffice/README8
3 files changed, 12 insertions, 9 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 0dff27339b..78a23bcd14 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=LibreOffice
SRCNAM=libreoffice
-VERSION=${VERSION:-5.3.1.2}
+VERSION=${VERSION:-5.3.2.2}
SHORT_VERSION=${VERSION%.*.*}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -102,7 +102,6 @@ elif [ "$JAVA" = "no" ]; then
use_java="--with-java=no"
fi
-# --with-system-harfbuzz \
./configure \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index 44deca3574..9be2ef3792 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -1,10 +1,10 @@
PRGNAM="LibreOffice"
-VERSION="5.3.1.2"
+VERSION="5.3.2.2"
HOMEPAGE="http://libreoffice.org"
-DOWNLOAD="http://download.documentfoundation.org/libreoffice/src/5.3.1/libreoffice-5.3.1.2.tar.xz \
- http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-5.3.1.2-srcs.tar.xz"
-MD5SUM="4ba66c0812165af9af8e03f3f60280a5 \
- 2ca9b33502785c152217e0ff4092292e"
+DOWNLOAD="http://download.documentfoundation.org/libreoffice/src/5.3.2/libreoffice-5.3.2.2.tar.xz \
+ http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-5.3.2.2-srcs.tar.xz"
+MD5SUM="7775d814f0c13d0f2e3d7cafd930ae17 \
+ 9f9f8a2dcfd6bed6d46045cc6773f507"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="python3 openjdk apache-ant perl-Archive-Zip"
diff --git a/office/LibreOffice/README b/office/LibreOffice/README
index cb12be8a0d..45aca1dcf6 100644
--- a/office/LibreOffice/README
+++ b/office/LibreOffice/README
@@ -33,8 +33,12 @@ Build time environment variables that may set to vary features are as follows:
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.
+ alternate JDK will require presence of the appropriate package when building
+ LibreOffice. Since the apache-ant package is already required by openjdk,
+ 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.
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