adjust debugging patch

0001-debug-missing-font.patch

@@ -1,4 +1,4 @@
-From 83fcf65c2c6abf0b35693c13fc9907ee4f4eb442 Mon Sep 17 00:00:00 2001
+From 92a78184978122a66a8a42baf8b44b6e97bbec8f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
 Date: Wed, 10 Aug 2022 19:41:40 +0100
 Subject: [PATCH] debug missing font
@@ -9,17 +9,17 @@ Change-Id: I4ebdd577d68fb12a01c3e2efb8b7d7cea8f998cf
  1 file changed, 1 insertion(+)
 
 diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
-index f259277304d0..d0d1f12868ce 100644
+index 1daf54b..fda7ba7 100644
 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx
 +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
-@@ -1185,6 +1185,7 @@ void PrintFontManager::Substitute(vcl::font::FontSelectPattern &rPattern, OUStri
+@@ -1189,6 +1189,7 @@ void PrintFontManager::Substitute(vcl::font::FontSelectPattern &rPattern, OUStri
-             // ImplFontMetricData::ImplInitTextLineSize
              return;
-         }
-+        fprintf(stderr, "missing %s\n", rPattern.maTargetName.toUtf8().getStr());
          SAL_WARN("vcl.fonts", "PrintFontManager::Substitute: missing font: '" << rPattern.maTargetName <<
                                "' try: " << rPattern.maSearchName << " instead");
++        fprintf(stderr, "missing %s\n", rPattern.maTargetName.toUtf8().getStr());
          std::abort();
+     }
+ }
 -- 
-2.37.1
+2.35.3
 

libreoffice.spec

@@ -261,9 +261,9 @@ Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
 Patch4: 0001-Fix-CppunitTest_vcl_svm_test-for-big-endian.patch
 Patch5: 0001-Fix-endian-dependent-test-for-good.patch
 Patch6: 0001-some-disable-pdfium-fixes.patch
-Patch7: 0001-debug-missing-font.patch
+Patch7: 0001-turn-off-font-combobox-preview-if-SAL_ABORT_ON_NON_A.patch
-Patch8: 0001-turn-off-font-combobox-preview-if-SAL_ABORT_ON_NON_A.patch
+Patch8: 0001-don-t-worry-about-Linux-Libertine-O-vs-Linux-Liberti.patch
-Patch9: 0001-don-t-worry-about-Linux-Libertine-O-vs-Linux-Liberti.patch
+Patch9: 0001-debug-missing-font.patch
 # not upstreamed
 Patch500: 0001-disable-libe-book-support.patch