1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

editors/openoffice-4: fix crash in fontconfig

Ensure default substitutions on patterns

This is requested by the documentation of function FcFontMatch().

Addresses bug #128583.

[cherry-picked from upstream 96cc864ad79ef0ed2b9769f074673a55e4056b44]
[converted to FreeBSD ports patch by Don Lewis <truckman@FreeBSD.org]
[Skipping PORTREVSION bump, the next commit will be a version upgrade]

PR:		248161
MFH:		2024Q1
This commit is contained in:
Arrigo Marchiori 2024-02-15 13:37:13 -08:00 committed by Don Lewis
parent 1f9abae2aa
commit 53702f0d70

View File

@ -0,0 +1,10 @@
--- vcl/unx/generic/fontmanager/fontconfig.cxx.orig 2020-10-06 14:16:35 UTC
+++ vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -456,6 +456,7 @@ void FontCfgWrapper::addFontSet( FcSetName eSetName )
if( m_nFcVersion > 20400 ) // #i115204# avoid trouble with old FC versions
{
FcPattern* pTestPattern = FcPatternDuplicate( pOrigPattern );
+ FcDefaultSubstitute( pTestPattern );
FcPatternAddBool( pTestPattern, FC_OUTLINE, FcTrue );
// TODO: ignore all attributes that are not interesting for finding dupes
// e.g. by using pattern->ImplFontAttr->pattern conversion