diff options
| author | Arrigo Marchiori <ardovm@yahoo.it> | 2024-02-15 21:37:13 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2024-02-16 19:02:51 +0000 |
| commit | 53702f0d70ca6a495f7e8158656bd1aa125d898a (patch) | |
| tree | 53c82c37f56dac9e95f25a051d06ca6720cc1d9a | |
| parent | 1f9abae2aa93628b517c876d0c752f4fd51c20da (diff) | |
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
| -rw-r--r-- | editors/openoffice-4/files/patch-vcl_unx_generic_fontmanager_fontconfig.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/editors/openoffice-4/files/patch-vcl_unx_generic_fontmanager_fontconfig.cxx b/editors/openoffice-4/files/patch-vcl_unx_generic_fontmanager_fontconfig.cxx new file mode 100644 index 000000000000..8806abdb1e3b --- /dev/null +++ b/editors/openoffice-4/files/patch-vcl_unx_generic_fontmanager_fontconfig.cxx @@ -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 |