From 1798329339b559009f1a1a6d7e07d224b5610fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 7 Feb 2022 10:42:49 +0000
Subject: [PATCH] test failed with harfbuzz 3.3.1 but is ok again with 3.3.2

---
 ...yet-another-naieve-font-reliant-test.patch | 51 -------------------
 libreoffice.spec                              |  6 +--
 2 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 0001-yet-another-naieve-font-reliant-test.patch

diff --git a/0001-yet-another-naieve-font-reliant-test.patch b/0001-yet-another-naieve-font-reliant-test.patch
deleted file mode 100644
index 6921477..0000000
--- a/0001-yet-another-naieve-font-reliant-test.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1e6d43dc5862a43c0a9cdd7fa69693ffbc8d96e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Thu, 3 Feb 2022 23:28:52 +0000
-Subject: [PATCH] yet another naieve font reliant test
-
-Change-Id: I9283d993abf20e887b78468468496529a22dc0ed
----
- sd/qa/unit/layout-tests.cxx | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/sd/qa/unit/layout-tests.cxx b/sd/qa/unit/layout-tests.cxx
-index e4dfe0e3d47c..07f213a5237c 100644
---- a/sd/qa/unit/layout-tests.cxx
-+++ b/sd/qa/unit/layout-tests.cxx
-@@ -13,7 +13,7 @@ class SdLayoutTest : public SdModelTestBaseXML
- public:
-     void testTdf104722();
-     void testTdf136949();
--    void testTdf128212();
-+    //    void testTdf128212();
-     void testColumnsLayout();
-     void tdf143258_testTbRlLayout();
- 
-@@ -21,7 +21,7 @@ public:
- 
-     CPPUNIT_TEST(testTdf104722);
-     CPPUNIT_TEST(testTdf136949);
--    CPPUNIT_TEST(testTdf128212);
-+    //    CPPUNIT_TEST(testTdf128212);
-     CPPUNIT_TEST(testColumnsLayout);
-     CPPUNIT_TEST(tdf143258_testTbRlLayout);
- 
-@@ -69,6 +69,7 @@ void SdLayoutTest::testTdf136949()
-     xDocShRef->DoClose();
- }
- 
-+#if 0
- void SdLayoutTest::testTdf128212()
- {
-     sd::DrawDocShellRef xDocShRef
-@@ -88,6 +89,7 @@ void SdLayoutTest::testTdf128212()
- 
-     xDocShRef->DoClose();
- }
-+#endif
- 
- void SdLayoutTest::testColumnsLayout()
- {
--- 
-2.33.1
-
diff --git a/libreoffice.spec b/libreoffice.spec
index e22d515..b48bbec 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -221,7 +221,7 @@ BuildRequires: pentaho-reporting-flow-engine
 
 # fonts needed for tests
 BuildRequires: dejavu-sans-fonts
-BuildRequires: google-crosextra-carlito-fonts
+BuildRequires: google-carlito-fonts
 BuildRequires: liberation-mono-fonts
 BuildRequires: liberation-sans-fonts
 BuildRequires: liberation-serif-fonts
@@ -249,10 +249,8 @@ Patch4: 0001-the-real-font-used-for-Roman-is-arbitrary.patch
 Patch5: 0001-fix-direct-leaks-in-vcl-cppunit-tests.patch
 Patch6: 0001-this-test-assumes-KacstBook-has-no-Latin-glyphs.patch
 Patch7: 0001-Avoid-calling-AVX-code-in-library-static-initializat.patch
-# disable another poor test
-Patch8: 0001-yet-another-naieve-font-reliant-test.patch
 # see if ICE still happens
-Patch9: 0001-disable-ICEing-function-under-x86.patch
+Patch8: 0001-disable-ICEing-function-under-x86.patch
 # not upstreamed
 Patch500: 0001-disable-libe-book-support.patch