diff options
| author | Christoph Willing <chris.willing@iinet.net.au> | 2016-04-26 20:33:16 +1000 |
|---|---|---|
| committer | Christoph Willing <chris.willing@iinet.net.au> | 2016-04-27 14:13:18 +1000 |
| commit | af44f12df361dd0d769d16387b759bb4f7ac133b (patch) | |
| tree | 00cf30b0d6e5644a6888c8ccee2f53c58eb137e4 /office | |
| parent | f652af29bc18579cd769e6f2f98bca29b2ceb554 (diff) | |
office/LibreOffice: Updated for version 5.1.2.2
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
Diffstat (limited to 'office')
| -rw-r--r-- | office/LibreOffice/010_isnan.diff | 11 | ||||
| -rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 10 | ||||
| -rw-r--r-- | office/LibreOffice/LibreOffice.info | 8 |
3 files changed, 10 insertions, 19 deletions
diff --git a/office/LibreOffice/010_isnan.diff b/office/LibreOffice/010_isnan.diff deleted file mode 100644 index 166046331ee0..000000000000 --- a/office/LibreOffice/010_isnan.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 5686fd78dfa2..78e05c8d7807 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=LibreOffice SRCNAM=libreoffice -VERSION=${VERSION:-5.1.1.3} +VERSION=${VERSION:-5.1.2.2} SHORT_VERSION=${VERSION%.*.*} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,8 +74,6 @@ 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 \ @@ -154,7 +152,11 @@ if [ "$HAVE_SRCS_TARBALL" = "0" ]; then fi export LDFLAGS="-lboost_system" -make build +if [ "$ARCH" = "x86_64" ]; then + make build +else + make build-nocheck +fi make distro-pack-install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info index e6404fa40c93..7a868953be9e 100644 --- a/office/LibreOffice/LibreOffice.info +++ b/office/LibreOffice/LibreOffice.info @@ -1,10 +1,10 @@ PRGNAM="LibreOffice" -VERSION="5.1.1.3" +VERSION="5.1.2.2" HOMEPAGE="http://libreoffice.org" -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" +DOWNLOAD="http://download.documentfoundation.org/libreoffice/src/5.1.2/libreoffice-5.1.2.2.tar.xz \ + http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-5.1.2.2-srcs.tar.xz" MD5SUM="5354a6172015603ba057a2fbbfc9977e \ - d3724659ac71032eaf4c0e07cca6cbd5" + b143c1bef23d213090b3272442de6c99" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="avahi python3 apache-ant perl-Archive-Zip" |