summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user/libreoffice/APKBUILD6
-rw-r--r--user/libreoffice/disable-crc-test.patch39
2 files changed, 43 insertions, 2 deletions
diff --git a/user/libreoffice/APKBUILD b/user/libreoffice/APKBUILD
index 2e7c9475b..fd36400dd 100644
--- a/user/libreoffice/APKBUILD
+++ b/user/libreoffice/APKBUILD
@@ -53,7 +53,7 @@ depends="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw
# 3. File formats
makedepends="apr-dev bash bison boost-dev cairo-dev clucene-dev cmd:which
coreutils cppunit-dev cups-dev dbus-glib-dev findutils flex
- fontconfig-dev freetype-dev gettext-tiny-dev glm-dev gperf gpgme-dev
+ fontconfig-dev freetype-dev gettext-tiny-dev glm gperf gpgme-dev
gst-plugins-base-dev gstreamer-dev harfbuzz-dev hunspell-dev
hyphen-dev icu icu-dev lcms2-dev libcmis-dev libexttextcat-dev
libjpeg-turbo-dev libpng-dev libxml2-utils libxslt-dev mdds mythes-dev
@@ -88,6 +88,7 @@ source="https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-$pkg
fix-execinfo.patch
fix-includes.patch
gettext-tiny.patch
+ disable-crc-test.patch
"
ldpath="/usr/lib/$pkgname/program"
@@ -477,4 +478,5 @@ fcc2ffeefde50abb80e539f7395efec6e022462b8b8938c2077df6fb3be217808cc2b96eb51539d5
10a1ee056ebce41b2f6d3863b220f8529f70b7fd159ff2d36967ad96d9653166737db4ba865c10769c37afad553f59fb9629437c0d8a1afbbff963fc36dbbf1a linux-musl.patch
4aa595588226ac2060ae78f4f857db1b148735429a47389f75313df61cabf0819ad2add15c09cae5c5ebbce64852589ca89932c72281ba662ab53dddec4e1336 fix-execinfo.patch
ae36500897db9d758e95da1791ef2577d59b0e0865baba316b4a1f1f48ce9fd5e52fc3f14fa45aeeab73c5b93f57e89f9a42c996bdb3c85eb3beb2634543d85e fix-includes.patch
-c50272ec2cf0471e629bf817d23e5c51ff59e94961fab1ee107f43352409353a37f2988c1ff75f423c4c5aedb1e38b432849619700e25124a33c99a589d7a80b gettext-tiny.patch"
+c50272ec2cf0471e629bf817d23e5c51ff59e94961fab1ee107f43352409353a37f2988c1ff75f423c4c5aedb1e38b432849619700e25124a33c99a589d7a80b gettext-tiny.patch
+4ce3bacada3ab99dc09c6d29529bfc5e70eb287bcb61bc6e9a4ba4334cf77624121191d240f2a8f31b63e7510886904ce7842425752252e174478e0034988055 disable-crc-test.patch"
diff --git a/user/libreoffice/disable-crc-test.patch b/user/libreoffice/disable-crc-test.patch
new file mode 100644
index 000000000..35e6ce678
--- /dev/null
+++ b/user/libreoffice/disable-crc-test.patch
@@ -0,0 +1,39 @@
+--- libreoffice-6.0.6.2/vcl/qa/cppunit/svm/svmtest.cxx
++++ libreoffice-6.0.6.2/vcl/qa/cppunit/svm/svmtest.cxx
+@@ -759,14 +759,13 @@ void SvmTest::checkBitmaps(const GDIMeta
+ xmlDocPtr pDoc = dumpMeta(rMetaFile);
+
+ #ifdef LINUX
+- assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "7932585a"}});
++ assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"},});
+ assertXPathAttrs(pDoc, "/metafile/bmpscale[1]", {
+- {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc", "08bfca1f"}
++ {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"},
+ });
+ assertXPathAttrs(pDoc, "/metafile/bmpscalepart[1]", {
+ {"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"},
+ {"srcx", "2"}, {"srcy", "1"}, {"srcwidth", "4"}, {"srcheight", "3"},
+- {"crc", "abd45514"}
+ });
+ #else
+ assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}});
+@@ -815,16 +814,16 @@ void SvmTest::checkBitmapExs(const GDIMe
+
+ #ifdef LINUX
+ assertXPathAttrs(pDoc, "/metafile/bmpex[1]", {
+- {"x", "1"}, {"y", "2"}, {"crc", "7932585a"}, {"transparenttype", "bitmap"}
++ {"x", "1"}, {"y", "2"}, {"transparenttype", "bitmap"}
+ });
+ assertXPathAttrs(pDoc, "/metafile/bmpexscale[1]", {
+ {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"},
+- {"crc", "08bfca1f"}, {"transparenttype", "bitmap"}
++ {"transparenttype", "bitmap"}
+ });
+ assertXPathAttrs(pDoc, "/metafile/bmpexscalepart[1]", {
+ {"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"},
+ {"srcx", "2"}, {"srcy", "1"}, {"srcwidth", "4"}, {"srcheight", "3"},
+- {"crc", "abd45514"}, {"transparenttype", "bitmap"}
++ {"transparenttype", "bitmap"}
+ });
+ #else
+ assertXPathAttrs(pDoc, "/metafile/bmpex[1]", {