rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

need linux-libertine-fonts for tests

Browse Source
This commit is contained in:
Caolán McNamara 2022-08-11 16:08:31 +01:00
parent aa79723844
commit bd5bebbd04
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-don-t-worry-about-Linux-Libertine-O-vs-Linux-Liberti.patch Normal file
View File

@ -0,0 +1,26 @@
From 9c17267569e5f5c0e2bcf3d3da81871242c355f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
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

6
libreoffice.spec
View File

@ -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