libreoffice: update to 5.1.4.2

This commit is contained in:
Jürgen Buchmüller 2016-06-25 12:58:36 +02:00
parent ad131b9f29
commit aac5809d9c
3 changed files with 28 additions and 18 deletions

View file

@ -1,12 +0,0 @@
Remove the failing test (on i686) from the list of unit tests.
--- sw/Module_sw.mk 2016-05-04 00:51:19.000000000 +0200
+++ sw/Module_sw.mk 2016-06-24 14:13:36.893373585 +0200
@@ -58,7 +58,6 @@
CppunitTest_sw_ooxmlexport4 \
CppunitTest_sw_ooxmlexport5 \
CppunitTest_sw_ooxmlexport6 \
- CppunitTest_sw_ooxmlexport7 \
CppunitTest_sw_ooxmlfieldexport \
CppunitTest_sw_ooxmlw14export \
CppunitTest_sw_ooxmlimport \

View file

@ -0,0 +1,22 @@
The rounding errors which seem to plague the MACOSX build also occur
for the i686 architecture on Void Linux. Since the problem seems to
be minor, also disable the failing test lines for __i386 being defined.
--- sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 2016-06-14 22:05:10.000000000 +0200
+++ sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 2016-06-25 12:32:05.783516158 +0200
@@ -1117,6 +1117,7 @@
#ifndef MACOSX /* Retina-reatled rounding rountrip error
* hard to smooth out due to the use of string compare
* instead of number */
+#ifndef __i386 /* We see rounding errors happening on the i686 architecture as well */
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
@@ -1124,6 +1125,7 @@
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
#endif
+#endif
}
#endif

View file

@ -1,7 +1,7 @@
# Template file for 'libreoffice' # Template file for 'libreoffice'
pkgname=libreoffice pkgname=libreoffice
version=5.1.3.2 version=5.1.4.2
revision=2 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-werror" configure_args="--disable-werror"
nopie=yes nopie=yes
@ -38,10 +38,10 @@ distfiles="
${_baseurl}/${pkgname}-help-${version}.tar.xz ${_baseurl}/${pkgname}-help-${version}.tar.xz
${_baseurl}/${pkgname}-translations-${version}.tar.xz" ${_baseurl}/${pkgname}-translations-${version}.tar.xz"
checksum=" checksum="
cd5a1ca7c9ea100f811f8f12dc9bae29e71a6a65b127be6de5e14f223e3c07c4 cae54a79ed858ad92044179b5c33bd29c5770a8eccde04ed80c5ebfd92078385
67b94a985d57103035f02b35d38daa51142474afe68fb50fca2d79af6f8c4b45 1e38549406858d1915cedf16a4d9795c9a8226b9baf89cc0a2b1c001c7cb3063
f58def670340d67027d8cd52ef07669fbe7db05d1c6e490700dde8b53fe6093b 60356c3e3a8e5ba8216c18e127cfa2b7d0eb55c69e50f056e8f78a7d9dc735cc
f12305ca6f5f87b26b99fc481db475eb0d733513032e20e170a99724c8932f0d" 73edd75925fa14adea2e1577c7b80d5693af74c303c4d313af194e2de2746c23"
skip_extraction=" skip_extraction="
${pkgname}-dictionaries-${version}.tar.xz ${pkgname}-dictionaries-${version}.tar.xz
${pkgname}-help-${version}.tar.xz ${pkgname}-help-${version}.tar.xz