diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-15 20:00:39 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-15 20:00:39 +0000 |
| commit | 88d39bd86ba879437ef28ea2c936dc13617b8774 (patch) | |
| tree | e082629558e2f17be1d8d8e5489c0dab3c449e7a /user/libreoffice/disable-crc-test.patch | |
| parent | 6e61738144a4ddd8743afe561c789ccbc6634467 (diff) | |
| parent | e5e7f2a7e60e60c88d9f53b16b6bda81a2e4b6f9 (diff) | |
| download | packages-88d39bd86ba879437ef28ea2c936dc13617b8774.tar.gz packages-88d39bd86ba879437ef28ea2c936dc13617b8774.tar.bz2 packages-88d39bd86ba879437ef28ea2c936dc13617b8774.tar.xz packages-88d39bd86ba879437ef28ea2c936dc13617b8774.zip | |
Merge branch 'libreoffice-6.2' into 'master'
Upgrade LibreOffice to 6.2 and upgrade some of its dependencies
See merge request !197
Diffstat (limited to 'user/libreoffice/disable-crc-test.patch')
| -rw-r--r-- | user/libreoffice/disable-crc-test.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/user/libreoffice/disable-crc-test.patch b/user/libreoffice/disable-crc-test.patch index 35e6ce678..d2b9ab551 100644 --- a/user/libreoffice/disable-crc-test.patch +++ b/user/libreoffice/disable-crc-test.patch @@ -1,38 +1,38 @@ ---- 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 +--- libreoffice-6.2.1.2/vcl/qa/cppunit/svm/svmtest.cxx 2018-09-10 16:08:33.000000000 -0400 ++++ libreoffice-6.2.1.2/vcl/qa/cppunit/svm/svmtest.cxx 2018-09-18 15:25:41.030304773 -0400 +@@ -760,14 +760,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"}, {"crc", "b8dee5da"}}); + 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"}, {"crc", "281fc589"} + {"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"} +- {"crc", "5e01ddcc"} }); #else assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}}); -@@ -815,16 +814,16 @@ void SvmTest::checkBitmapExs(const GDIMe +@@ -816,16 +815,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"}, {"crc", "b8dee5da"}, {"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"} +- {"crc", "281fc589"}, {"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"} +- {"crc", "5e01ddcc"}, {"transparenttype", "bitmap"} + {"transparenttype", "bitmap"} }); #else |