aboutsummaryrefslogtreecommitdiffstats
path: root/main/libreoffice
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-02-15 18:00:55 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-02-15 18:04:28 +0000
commitb2186a341e95da964a38086c4eff4cd4202745c5 (patch)
treeb7569195789963712ff1071c633799e2a80eb55c /main/libreoffice
parent352bcd34979a903853263bf578dc00fd8ffcc93d (diff)
downloadaports-b2186a341e95da964a38086c4eff4cd4202745c5.tar.bz2
aports-b2186a341e95da964a38086c4eff4cd4202745c5.tar.xz
main/libreoffice: upgrade to 5.1.0.3
Diffstat (limited to 'main/libreoffice')
-rw-r--r--main/libreoffice/APKBUILD32
-rw-r--r--main/libreoffice/fix-isnan.patch13
2 files changed, 31 insertions, 14 deletions
diff --git a/main/libreoffice/APKBUILD b/main/libreoffice/APKBUILD
index 3b14854885..20d73329ba 100644
--- a/main/libreoffice/APKBUILD
+++ b/main/libreoffice/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer:
pkgname=libreoffice
-pkgver=5.0.4.2
+pkgver=5.1.0.3
pkgrel=0
pkgdesc="LibreOffice - Meta package for the full office suite"
url="http://www.libreoffice.org/"
@@ -17,7 +17,7 @@ depends_dev="cups-dev libjpeg-turbo-dev boost-dev clucene-dev libe-book-dev icu-
poppler-dev cairo-dev hyphen-dev mythes-dev python3-dev harfbuzz-dev
libfreehand-dev libodfgen-dev libcdr-dev"
makedepends="$depends_dev autoconf automake tar coreutils findutils ucpp gperf
- bison flex zip perl perl-archive-zip sed libxml2-utils"
+ bison flex zip perl perl-archive-zip sed libxml2-utils doxygen"
# GNU sed is needed for in i18npool/CustomTarget_localedata.mk
install=""
subpackages="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw
@@ -36,6 +36,7 @@ source="http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice
linux-musl.patch
fix-execinfo.patch
fix-includes.patch
+ fix-isnan.patch
"
languages=""
@@ -206,24 +207,27 @@ writer() {
_split writer
}
-md5sums="0c6381581f93ef7142b00837002755dd libreoffice-5.0.4.2.tar.xz
-eaad734b700e4ccc2362097a84392ba0 libreoffice-dictionaries-5.0.4.2.tar.xz
-73711d36f4d16b0e2657367c823e1872 libreoffice-translations-5.0.4.2.tar.xz
+md5sums="a0cbe7fe9368e35068bd619281380379 libreoffice-5.1.0.3.tar.xz
+1daa2553486a991f4a19d3fd8f9ecc6a libreoffice-dictionaries-5.1.0.3.tar.xz
+76495173c3e7a74f4aa53198d8bb99e5 libreoffice-translations-5.1.0.3.tar.xz
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
bfde50b1b04c715cd172be03a204521f linux-musl.patch
1cff63a520d1b037edddf1b4de4799dc fix-execinfo.patch
-2410b3fef56a2163a0d3142330ecbcdc fix-includes.patch"
-sha256sums="647440b70fc190a43a3373cfe5b06a87558ee07711e3d74cab8fb9d8cbac6dc8 libreoffice-5.0.4.2.tar.xz
-399deeb365ce258b44f26d60ede9ea1a9fea9af7592cf8b109fb75e24dbaa02b libreoffice-dictionaries-5.0.4.2.tar.xz
-0adeb2b7ccc4ffb2fb58b036029c161f8971b03610c383cc120be2a712d1b9cd libreoffice-translations-5.0.4.2.tar.xz
+2410b3fef56a2163a0d3142330ecbcdc fix-includes.patch
+7c3c462c9d1ded3cd83305ff27caaf83 fix-isnan.patch"
+sha256sums="b41b03f008dab3439bde31c1918f0477c035eab629166a79eeebb0bb6e8757b3 libreoffice-5.1.0.3.tar.xz
+718822a5ad5400e1026b18453bc38a118851df43e26255c3769078b444ab7a82 libreoffice-dictionaries-5.1.0.3.tar.xz
+fd0eeee993b8532288b77a43bfda9db6cdf781df3cb43f753ed01b620e760ee3 libreoffice-translations-5.1.0.3.tar.xz
390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
fd0778cfd18b034a415a8966f7a3d8437c3f2ba1c6cfde8220ba663261b9c67f linux-musl.patch
7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3 fix-execinfo.patch
-2044d4c997472a46e95c68fa8bec19c1424e9074fad05df9f1c0d220dec00281 fix-includes.patch"
-sha512sums="729403edaec752bbb933548e15bf1d417a307e58e0cc6db045bfb97eb99c65b29ae785d207a2611c25b2a55a1fa25e3f0905adbb6500f571fb2f345ccfa53be8 libreoffice-5.0.4.2.tar.xz
-629669090107ebde3035bed1dbe5a5f4a0891c0520c0318574a1d212302113129d118ae640a5e5bf6066c090f45699fa4e349aa1435ef48b5e1d4e123a82fcff libreoffice-dictionaries-5.0.4.2.tar.xz
-807420bb5d2fb8d4df7a5055f88dcb8b05044058f5f6ac816ed40006862208fd9865f835854638f1828c37327d5f9d542951e36f44e816ae22ca6577f8466d6e libreoffice-translations-5.0.4.2.tar.xz
+2044d4c997472a46e95c68fa8bec19c1424e9074fad05df9f1c0d220dec00281 fix-includes.patch
+913caaeeedb53d7397c01ea9bad79570d5eab12ac75e47506498e6a4129af8dd fix-isnan.patch"
+sha512sums="ff068df64ca3a566d709e00e30d12d81095c88e9f05f785db805387ae5ff47dc7f8cd801ec6657a121fc6683fc7e32ff9abc508cae3b4f06d6ad22404a875de8 libreoffice-5.1.0.3.tar.xz
+f232d9ed068095abc2345c0023d42204d979370bd71aa9f3dd78e43df1228552e6b93bb2c5941e3c1f0c763b90ad2735d0709d8046aa2e415441ced84e43f9c6 libreoffice-dictionaries-5.1.0.3.tar.xz
+156aee6cbcd65a5b375a7cc436adb094989a3b2ce1a3869b7f6504806c3bce00cecc8c4a8cbe17e3f37d5f416e2d2aeaf7b9635627f504bd292d49c9d34cc6af libreoffice-translations-5.1.0.3.tar.xz
5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
6abfd9c6cf1917e9ee89695086013c94f5ec68f9732ad60faeeaabe6f3765f5ff19df575a3ef0098d6dd6ba3c76369cec871770396f5cd84829031c3e38485a8 linux-musl.patch
567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860 fix-execinfo.patch
-15defc8362fb0e53db32b75d9c4ece73e1ee8bd1cc05b4dd8f072f808e6943b385a5415513b237d3daa130dedce3c6ac6370e05ec0b4a25065ce27aadd269e92 fix-includes.patch"
+15defc8362fb0e53db32b75d9c4ece73e1ee8bd1cc05b4dd8f072f808e6943b385a5415513b237d3daa130dedce3c6ac6370e05ec0b4a25065ce27aadd269e92 fix-includes.patch
+bde66dfcbbeb44ed2544e5167e1c6bd4e3f1ab4e9399d8dc63691bd530d9d0980e1e59c109dd52b187b93a14133b4f8bc2bda920495ed1d9d71a00acc3677b1e fix-isnan.patch"
diff --git a/main/libreoffice/fix-isnan.patch b/main/libreoffice/fix-isnan.patch
new file mode 100644
index 0000000000..6859fa3bce
--- /dev/null
+++ b/main/libreoffice/fix-isnan.patch
@@ -0,0 +1,13 @@
+diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
+index 83c2033..645bdd0 100644
+--- a/xmloff/source/draw/ximp3dscene.cxx
++++ b/xmloff/source/draw/ximp3dscene.cxx
+@@ -66,7 +66,7 @@ SdXML3DLightContext::SdXML3DLightContext(
+ {
+ ::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;
+ }