From a7c51323b7343f82b5aea6098f5d5e31a8bad0e9 Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Thu, 29 Dec 2016 22:15:01 +0200
Subject: Drop check for ancient FontConfig releases

FontConfig 2.4.1 that fixes this bug was released 10 years ago.

Change-Id: Ib0970d3916909fe14eb4e3ed1425f925a13160ad
---
 vcl/unx/generic/fontmanager/fontconfig.cxx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'vcl/unx/generic/fontmanager')

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 4d9fae12e68d..9a58e91037a4 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -221,8 +221,7 @@ FcFontSet* FontCfgWrapper::getFontSet()
     {
         m_pOutlineSet = FcFontSetCreate();
         addFontSet( FcSetSystem );
-        if( FcGetVersion() > 20400 ) // #i85462# prevent crashes
-            addFontSet( FcSetApplication );
+        addFontSet( FcSetApplication );
 
         ::std::sort(m_pOutlineSet->fonts,m_pOutlineSet->fonts+m_pOutlineSet->nfont,SortFont());
     }
@@ -659,11 +658,6 @@ void PrintFontManager::deinitFontconfig()
 
 void PrintFontManager::addFontconfigDir( const OString& rDirName )
 {
-    // workaround for a stability problems in older FC versions
-    // when handling application specific fonts
-    const int nVersion = FcGetVersion();
-    if( nVersion <= 20400 )
-        return;
     const char* pDirName = rDirName.getStr();
     bool bDirOk = (FcConfigAppFontAddDir(FcConfigGetCurrent(), reinterpret_cast<FcChar8 const *>(pDirName) ) == FcTrue);
 
-- 
cgit