From bd5bebbd04458e79b3595fa9fac9734deeb977f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 11 Aug 2022 16:08:31 +0100 Subject: [PATCH] need linux-libertine-fonts for tests --- ...t-Linux-Libertine-O-vs-Linux-Liberti.patch | 26 +++++++++++++++++++ libreoffice.spec | 6 +++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 0001-don-t-worry-about-Linux-Libertine-O-vs-Linux-Liberti.patch diff --git a/0001-don-t-worry-about-Linux-Libertine-O-vs-Linux-Liberti.patch b/0001-don-t-worry-about-Linux-Libertine-O-vs-Linux-Liberti.patch new file mode 100644 index 0000000..6363625 --- /dev/null +++ b/0001-don-t-worry-about-Linux-Libertine-O-vs-Linux-Liberti.patch @@ -0,0 +1,26 @@ +From 9c17267569e5f5c0e2bcf3d3da81871242c355f9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 11 Aug 2022 16:05:55 +0100 +Subject: [PATCH] don't worry about Linux Libertine O vs Linux Libertine G + +Change-Id: I3f7418380e655b6c25e675493d859444e343d646 +--- + vcl/unx/generic/fontmanager/fontconfig.cxx | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx +index 24ff67b4b893..0be8062cbadf 100644 +--- a/vcl/unx/generic/fontmanager/fontconfig.cxx ++++ b/vcl/unx/generic/fontmanager/fontconfig.cxx +@@ -1185,6 +1185,8 @@ void PrintFontManager::Substitute(vcl::font::FontSelectPattern &rPattern, OUStri + // ImplFontMetricData::ImplInitTextLineSize + return; + } ++ if (rPattern.maTargetName == "Linux Libertine G" && rPattern.maSearchName == "Linux Libertine O") ++ return; + SAL_WARN("vcl.fonts", "PrintFontManager::Substitute: missing font: '" << rPattern.maTargetName << + "' try: " << rPattern.maSearchName << " instead"); + std::abort(); +-- +2.37.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 152c48f..a9943e4 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -233,11 +233,12 @@ BuildRequires: pentaho-reporting-flow-engine # fonts needed for tests BuildRequires: dejavu-sans-fonts BuildRequires: google-carlito-fonts +# KacstBook used in vcl/qa/cppunit tests +BuildRequires: kacst-book-fonts BuildRequires: liberation-mono-fonts BuildRequires: liberation-sans-fonts BuildRequires: liberation-serif-fonts -# KacstBook used in vcl/qa/cppunit tests -BuildRequires: kacst-book-fonts +BuildRequires: linux-libertine-fonts Requires: %{name}-writer%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-calc%{?_isa} = %{epoch}:%{version}-%{release} @@ -261,6 +262,7 @@ Patch5: 0001-Fix-endian-dependent-test-for-good.patch Patch6: 0001-some-disable-pdfium-fixes.patch Patch7: 0001-debug-missing-font.patch Patch8: 0001-turn-off-font-combobox-preview-if-SAL_ABORT_ON_NON_A.patch +Patch9: 0001-don-t-worry-about-Linux-Libertine-O-vs-Linux-Liberti.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch