summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@iinet.net.au>2016-03-16 09:20:16 +1000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-03-17 17:57:27 +0700
commite385c39e1be8f49475461568436d4f694772df10 (patch)
tree1e336eb8bc8d8b1e898add8a3681f7a1d2ae7256
parent65dac6a43ab26a79b2f71cda5b3cd3ba3dc295fb (diff)
downloadslackbuilds-e385c39e1be8f49475461568436d4f694772df10.tar.gz
office/LibreOffice: Updated for version 5.1.1.3
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
-rw-r--r--office/LibreOffice/010_isnan.diff11
-rw-r--r--office/LibreOffice/LibreOffice.SlackBuild4
-rw-r--r--office/LibreOffice/LibreOffice.info10
3 files changed, 19 insertions, 6 deletions
diff --git a/office/LibreOffice/010_isnan.diff b/office/LibreOffice/010_isnan.diff
new file mode 100644
index 0000000000..166046331e
--- /dev/null
+++ b/office/LibreOffice/010_isnan.diff
@@ -0,0 +1,11 @@
+--- xmloff/source/draw/ximp3dscene.cxx.orig 2016-03-01 09:20:43.000000000 +1000
++++ xmloff/source/draw/ximp3dscene.cxx 2016-03-15 23:28:54.841653352 +1000
+@@ -66,7 +66,7 @@
+ {
+ ::basegfx::B3DVector aVal;
+ SvXMLUnitConverter::convertB3DVector(aVal, sValue);
+- if (!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ()))
++ if (!std::isnan(aVal.getX()) && !std::isnan(aVal.getY()) && !std::isnan(aVal.getZ()))
+ {
+ maDirection = aVal;
+ }
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 794acc23f0..5686fd78df 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=LibreOffice
SRCNAM=libreoffice
-VERSION=${VERSION:-5.1.0.3}
+VERSION=${VERSION:-5.1.1.3}
SHORT_VERSION=${VERSION%.*.*}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -74,6 +74,8 @@ if [ "$HAVE_SRCS_TARBALL" = "1" ]; then
tar xvf $CWD/$SRCNAM-${VERSION}-srcs.tar.xz
fi
+patch -p0 < $CWD/010_isnan.diff
+
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index 379e9e36b5..e6404fa40c 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -1,10 +1,10 @@
PRGNAM="LibreOffice"
-VERSION="5.1.0.3"
+VERSION="5.1.1.3"
HOMEPAGE="http://libreoffice.org"
-DOWNLOAD="http://download.documentfoundation.org/libreoffice/src/5.1.0/libreoffice-5.1.0.3.tar.xz \
- http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-5.1.0.3-srcs.tar.xz"
-MD5SUM="a0cbe7fe9368e35068bd619281380379 \
- 9c30af1e7ff410a663b485654e07e6a0"
+DOWNLOAD="http://download.documentfoundation.org/libreoffice/src/5.1.1/libreoffice-5.1.1.3.tar.xz \
+ http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-5.1.1.3-srcs.tar.xz"
+MD5SUM="5354a6172015603ba057a2fbbfc9977e \
+ d3724659ac71032eaf4c0e07cca6cbd5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="avahi python3 apache-ant perl-Archive-Zip"