Skip to content

Commit

Permalink
editors/openoffice-4: fix crash in fontconfig
Browse files Browse the repository at this point in the history
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
  • Loading branch information
ardovm authored and DonLewisFreeBSD committed Feb 16, 2024
1 parent 1f9abae commit 53702f0
Showing 1 changed file with 10 additions and 0 deletions.
@@ -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

0 comments on commit 53702f0

Please sign in to comment.