- update patches

diff --git a/disable-failing-test.patch b/disable-failing-test.patch
index 3bfe16e8c9bd3f3ec265c8e3cc2884675a5d6e97..04052bfd724f586c28f9b4769796edf2ce53f1c2 100644 (file)
--- a/disable-failing-test.patch
+++ b/disable-failing-test.patch
@@ -5,9 +5,9 @@
      CPPUNIT_TEST_SUITE(SdImportTest);
  
 -    CPPUNIT_TEST(testDocumentLayout);
+     CPPUNIT_TEST(testTdf142645);
+     CPPUNIT_TEST(testTdf142915);
      CPPUNIT_TEST(testTdf142913);
-     CPPUNIT_TEST(testTdf142590);
-     CPPUNIT_TEST(testCustomSlideShow);
 --- libreoffice-6.3.0.4/dbaccess/Module_dbaccess.mk~   2019-08-06 19:26:35.000000000 +0200
 +++ libreoffice-6.3.0.4/dbaccess/Module_dbaccess.mk    2019-08-09 09:06:37.432422956 +0200
 @@ -33,18 +33,6 @@

diff --git a/pld-skia-patches.patch b/pld-skia-patches.patch
index 09d3b55b1438e61f130b9641b7a92ecac8975aa7..4c9f9230847458aee7a8e89e337fbfdf8ed0cbaa 100644 (file)
--- a/pld-skia-patches.patch
+++ b/pld-skia-patches.patch
@@ -1,9 +1,9 @@
 --- libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk.orig     2021-08-10 19:27:48.000000000 +0200
 +++ libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk  2021-08-12 18:09:22.813517161 +0200
 @@ -39,6 +39,7 @@
-     fast-png-write.patch.1 \
-     skia_sk_cpu_sse_level_0_by_default.patch.1 \
      fix-warnings.patch.1 \
+     disable-freetype-colrv1.1 \
+     windows-libraries-system32.patch.1 \
 +    skia-freetype2.11.patch \
  
  $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))