Merge branch 'master' into zfs

1 files changed, 47 insertions, 24 deletions

diff --git a/user/libreoffice/disable-crc-test.patch b/user/libreoffice/disable-crc-test.patch
index d2b9ab551..474408514 100644
--- a/user/libreoffice/disable-crc-test.patch
+++ b/user/libreoffice/disable-crc-test.patch
@@ -1,39 +1,62 @@
---- 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);
+--- libreoffice-6.3.1.2/vcl/qa/cppunit/svm/svmtest.cxx	2019-08-29 16:51:57.000000000 -0500
++++ libreoffice-6.3.1.2/vcl/qa/cppunit/svm/svmtest.cxx	2019-09-12 20:46:12.114022513 -0500
+@@ -896,14 +896,13 @@ void SvmTest::checkBitmaps(const GDIMeta
+     }
+ #endif
  
- #ifdef LINUX
--    assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}});
-+    assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"},});
+-    assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", crc1}});
++    assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}});
      assertXPathAttrs(pDoc, "/metafile/bmpscale[1]", {
--        {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc", "281fc589"}
-+        {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"},
+-        {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc", crc2}
++        {"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", "5e01ddcc"}
+-        {"srcx", "2"},  {"srcy", "1"},  {"srcwidth", "4"},  {"srcheight", "3"},
+-        {"crc", crc3}
++        {"srcx", "2"},  {"srcy", "1"},  {"srcwidth", "4"},  {"srcheight", "3"}
      });
- #else
-     assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}});
-@@ -816,16 +815,16 @@ void SvmTest::checkBitmapExs(const GDIMe
+ }
+ 
+@@ -973,33 +972,33 @@ void SvmTest::checkBitmapExs(const GDIMe
+     }
  
- #ifdef LINUX
      assertXPathAttrs(pDoc, "/metafile/bmpex[1]", {
--        {"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}, {"transparenttype", "bitmap"}
-+        {"x", "1"}, {"y", "2"}, {"transparenttype", "bitmap"}
+-        {"x", "1"}, {"y", "1"}, {"crc", aExpectedCRC[0]}, {"transparenttype", "bitmap"}
++        {"x", "1"}, {"y", "1"}, {"transparenttype", "bitmap"}
      });
      assertXPathAttrs(pDoc, "/metafile/bmpexscale[1]", {
-         {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"},
--        {"crc", "281fc589"}, {"transparenttype", "bitmap"}
+         {"x", "5"}, {"y", "0"}, {"width", "2"}, {"height", "3"},
+-        {"crc", aExpectedCRC[1]}, {"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", "5e01ddcc"}, {"transparenttype", "bitmap"}
+         {"destx", "7"}, {"desty", "1"}, {"destwidth", "2"}, {"destheight", "2"},
+         {"srcx", "0"},  {"srcy", "0"},  {"srcwidth", "3"},  {"srcheight", "4"},
+-        {"crc", aExpectedCRC[2]}, {"transparenttype", "bitmap"}
 +        {"transparenttype", "bitmap"}
      });
- #else
-     assertXPathAttrs(pDoc, "/metafile/bmpex[1]", {
+ 
+ #ifndef MACOSX
+     assertXPathAttrs(pDoc, "/metafile/bmpex[2]", {
+-        {"x", "6"}, {"y", "6"}, {"crc", aExpectedCRC[3]}, {"transparenttype", "bitmap"}
++        {"x", "6"}, {"y", "6"}, {"transparenttype", "bitmap"}
+     });
+     assertXPathAttrs(pDoc, "/metafile/bmpex[3]", {
+-        {"x", "0"}, {"y", "6"}, {"crc", aExpectedCRC[4]}, {"transparenttype", "bitmap"}
++        {"x", "0"}, {"y", "6"}, {"transparenttype", "bitmap"}
+     });
+     assertXPathAttrs(pDoc, "/metafile/bmpex[4]", {
+-        {"x", "2"}, {"y", "6"}, {"crc", aExpectedCRC[5]}, {"transparenttype", "bitmap"}
++        {"x", "2"}, {"y", "6"}, {"transparenttype", "bitmap"}
+     });
+     assertXPathAttrs(pDoc, "/metafile/bmpex[5]", {
+-        {"x", "0"}, {"y", "8"}, {"crc", aExpectedCRC[6]}, {"transparenttype", "bitmap"}
++        {"x", "0"}, {"y", "8"}, {"transparenttype", "bitmap"}
+     });
+     assertXPathAttrs(pDoc, "/metafile/bmpex[6]", {
+-        {"x", "2"}, {"y", "8"}, {"crc", aExpectedCRC[7]}, {"transparenttype", "bitmap"}
++        {"x", "2"}, {"y", "8"}, {"transparenttype", "bitmap"}
+     });
+ #endif
+ }