From ac447d51c784c9406c7590e39543b149b96f878e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 8 Mar 2011 16:54:04 +0000 Subject: [PATCH] fix patch to apply --- ...2716-pa-IN-isn-t-handled-by-fontconf.patch | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/0001-Resolves-rhbz-682716-pa-IN-isn-t-handled-by-fontconf.patch b/0001-Resolves-rhbz-682716-pa-IN-isn-t-handled-by-fontconf.patch index 16eec50..4cff762 100644 --- a/0001-Resolves-rhbz-682716-pa-IN-isn-t-handled-by-fontconf.patch +++ b/0001-Resolves-rhbz-682716-pa-IN-isn-t-handled-by-fontconf.patch @@ -17,23 +17,13 @@ diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmana index d7a888d..7a40084 100644 --- a/vcl/unx/source/fontmanager/fontconfig.cxx +++ b/vcl/unx/source/fontmanager/fontconfig.cxx -@@ -993,9 +993,15 @@ rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName, - const FcChar8* pTargetNameUtf8 = (FcChar8*)aTargetName.getStr(); - rWrapper.FcPatternAddString( pPattern, FC_FAMILY, pTargetNameUtf8 ); +@@ -1102,6 +1102,9 @@ -- const FcChar8* pLangAttribUtf8 = (FcChar8*)rLangAttrib.getStr(); - if( rLangAttrib.getLength() ) -+ { -+ const FcChar8* pLangAttribUtf8; -+ if (rLangAttrib.equalsIgnoreAsciiCase(OString(RTL_CONSTASCII_STRINGPARAM("pa-in")))) -+ pLangAttribUtf8 = (FcChar8*)"pa"; -+ else -+ pLangAttribUtf8 = (FcChar8*)rLangAttrib.getStr(); - rWrapper.FcPatternAddString( pPattern, FC_LANG, pLangAttribUtf8 ); -+ } + const FcChar8* pLangAttribUtf8 = (FcChar8*)rLangAttrib.getStr(); ++ if (rLangAttrib.equalsIgnoreAsciiCase(OString(RTL_CONSTASCII_STRINGPARAM("pa-in")))) ++ pLangAttribUtf8 = (FcChar8*)"pa"; ++ // Add required Unicode characters, if any if ( rMissingCodes.getLength() ) --- -1.7.4.1 - + {