diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index e7beaf945fb7..667e3748cc7c 100644 --- a/configure.ac +++ b/configure.ac @@ -6091,7 +6091,7 @@ fi AC_SUBST(ENABLE_CUPS) -libo_CHECK_SYSTEM_MODULE([fontconfig],[FONTCONFIG],[fontconfig >= 2.4.1],,system,TRUE) +libo_CHECK_SYSTEM_MODULE([fontconfig],[FONTCONFIG],[fontconfig >= 2.12.0],,system,TRUE) dnl whether to find & fetch external tarballs? dnl =================================================================== diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index ad9bf6c268ab..7ceb42226d55 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -859,11 +859,12 @@ static void addtopattern(FcPattern *pPattern, namespace { - //Someday fontconfig will hopefully use bcp47, see fdo#19869 - //In the meantime try something that will fit to workaround fdo#35118 + //Someday fontconfig will hopefully use bcp47, see: + //https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/50 + //In the meantime try something that will fit to workaround, see: + //https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/30 OString mapToFontConfigLangTag(const LanguageTag &rLangTag) { -#if defined(FC_VERSION) && (FC_VERSION >= 20492) std::shared_ptr<FcStrSet> xLangSet(FcGetLangs(), FcStrSetDestroy); OString sLangAttrib; @@ -897,12 +898,6 @@ namespace } return OString(); -#else - OString sLangAttrib = OUStringToOString(rLangTag.getLanguageAndScript(), RTL_TEXTENCODING_UTF8).toAsciiLowerCase(); - if (sLangAttrib.equalsIgnoreAsciiCase("pa-in")) - sLangAttrib = "pa"; - return sLangAttrib; -#endif } bool isEmoji(sal_uInt32 nCurrentChar) |