From 6ecc6a6567c438bf1e9e444cb13fd50c9f81636d Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Tue, 14 May 2019 17:04:19 +0000
Subject: [PATCH] require fontconfig atleast v2.4.2

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 CMakeLists.txt                   |  3 +--
 src/gui/text/qfontdatabase_x11.h | 25 +------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a6270c7f..45be2b73e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,7 +224,6 @@ if(KATIE_COMPILER MATCHES "(gcc|clang)")
     set(QT_VISIBILITY_AVAILABLE TRUE)
 endif()
 
-
 configure_file(
     ${CMAKE_SOURCE_DIR}/src/core/global/qconfig.h.cmake
     ${CMAKE_BINARY_DIR}/include/QtCore/qconfig.h
@@ -377,7 +376,7 @@ set_package_properties(Cups PROPERTIES
     TYPE RECOMMENDED
 )
 
-find_package(Fontconfig)
+find_package(Fontconfig 2.4.2)
 set_package_properties(Fontconfig PROPERTIES
     PURPOSE "Required for fonts configuration support"
     DESCRIPTION "Library for configuring and customizing font access"
diff --git a/src/gui/text/qfontdatabase_x11.h b/src/gui/text/qfontdatabase_x11.h
index 3bb4322db..c360473c8 100644
--- a/src/gui/text/qfontdatabase_x11.h
+++ b/src/gui/text/qfontdatabase_x11.h
@@ -63,10 +63,8 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#if FC_VERSION >= 20402
 #include <fontconfig/fcfreetype.h>
 #endif
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -495,9 +493,7 @@ static void loadFontConfig()
             FC_SPACING, FC_FILE, FC_INDEX,
             FC_LANG, FC_CHARSET, FC_FOUNDRY, FC_SCALABLE, FC_PIXEL_SIZE, FC_WEIGHT,
             FC_WIDTH,
-#if FC_VERSION >= 20297
             FC_CAPABILITY,
-#endif
             (const char *)0
         };
         const char **p = properties;
@@ -579,7 +575,6 @@ static void loadFontConfig()
             }
         }
 
-#if FC_VERSION >= 20297
         for (int j = 1; j < LanguageCount; ++j) {
             if (family->writingSystems[j] == QtFontFamily::Supported && requiresOpenType(j) && openType[j]) {
                 FcChar8 *cap;
@@ -588,7 +583,6 @@ static void loadFontConfig()
                     family->writingSystems[j] = QtFontFamily::UnsupportedFT;
             }
         }
-#endif
 
         QByteArray file((const char *)file_value);
         family->fontFilename = file;
@@ -1154,10 +1148,6 @@ static QFontEngine *loadFc(const QFontPrivate *fp, int script, const QFontDef &r
 
 static FcPattern *queryFont(const FcChar8 *file, const QByteArray &data, int id, FcBlanks *blanks, int *count)
 {
-#if FC_VERSION < 20402
-    Q_UNUSED(data)
-    return FcFreeTypeQuery(file, id, blanks, count);
-#else
     if (data.isEmpty())
         return FcFreeTypeQuery(file, id, blanks, count);
 
@@ -1176,7 +1166,6 @@ static FcPattern *queryFont(const FcChar8 *file, const QByteArray &data, int id,
     }
 
     return pattern;
-#endif
 }
 #endif // QT_NO_FONTCONFIG
 
@@ -1277,18 +1266,6 @@ static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt)
     }
 
     QString fileNameForQuery = fnt->fileName;
-#if FC_VERSION < 20402
-    QTemporaryFile tmp;
-
-    if (!fnt->data.isEmpty()) {
-        if (!tmp.open())
-            return;
-        tmp.write(fnt->data);
-        tmp.flush();
-        fileNameForQuery = tmp.fileName();
-    }
-#endif
-
     int id = 0;
     FcBlanks *blanks = FcConfigGetBlanks(0);
     int count = 0;
@@ -1296,7 +1273,7 @@ static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt)
     QStringList families;
     QFontDatabasePrivate *db = privateDb();
 
-    FcPattern *pattern = 0;
+    FcPattern *pattern = Q_NULLPTR;
     do {
         pattern = queryFont((const FcChar8 *)QFile::encodeName(fileNameForQuery).constData(),
                             fnt->data, id, blanks, &count);