qtbase: updated fontconfig/freetype patch

1 files changed, 64 insertions, 28 deletions

diff --git a/src/qtbase-1-fixes.patch b/src/qtbase-1-fixes.patch
index a873011..80ece60 100644
--- a/src/qtbase-1-fixes.patch
+++ b/src/qtbase-1-fixes.patch
@@ -6,7 +6,7 @@ Contains ad hoc patches for cross building.
 From 9e13228f4af09b93f6cd123635784e4988694ac2 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 6 Aug 2015 23:35:08 +0200
-Subject: [PATCH 1/7] fix qwindows plugin linking with system-freetype (MXE
+Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE
  specific)
 
 Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4
@@ -28,7 +28,7 @@ index 39280de..e152b0d 100644
 From 2d7638835de6b5f16cf64e6cf4eede1f8a9ccedb Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sat, 21 Jun 2014 13:12:49 +0200
-Subject: [PATCH 2/7] use pkg-config for harfbuzz (MXE specific)
+Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific)
 
 Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
 
@@ -61,7 +61,7 @@ index 7443368..c24e684 100644
 From 172b7bf1f113b1ea443a64ad4f9a2ecda6ee06e2 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 8 Dec 2014 14:15:12 +0100
-Subject: [PATCH 3/7] fix oci config test on windows
+Subject: [PATCH 3/8] fix oci config test on windows
 
 Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922
 
@@ -81,7 +81,7 @@ index 3ffda1d..39b6f3759 100644
 From 7756e4e14ae5b33fea04416bd4f238ca1dfe4d30 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 6 Aug 2015 13:24:56 +0200
-Subject: [PATCH 4/7] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
+Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
 
 Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa
 
@@ -105,7 +105,7 @@ index 43b55f0..de2c3ec 100755
 From e40fdb058ec440d14e3037c530f8181561622f50 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 6 Oct 2015 09:53:20 +0200
-Subject: [PATCH 5/7] fix building mysql driver under mingw
+Subject: [PATCH 5/8] fix building mysql driver under mingw
 
 Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9
 
@@ -129,7 +129,7 @@ index 3cfb614..8b7063f 100644
 From 236aecbd657f06d0b18bc25b93d5390ac644daaf Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 26 Aug 2015 12:45:43 +0100
-Subject: [PATCH 6/7] cmake: Rearrange STATIC vs INTERFACE targets
+Subject: [PATCH 6/8] cmake: Rearrange STATIC vs INTERFACE targets
 
 Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED)
 for header-only modules when building Qt5 statically.
@@ -162,29 +162,65 @@ index d2358ca..6b1dc95 100644
 2.7.4
 
 
-From b9823e1159af3c8b43fdedfae3106af8dec30e1d Mon Sep 17 00:00:00 2001
+From 0d1b11391894345be8a1fe084afb3799fc828488 Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Wed, 18 May 2016 14:40:20 -0700
+Subject: [PATCH 7/8] Fix linking of the minimal platform plugin on OS X
+
+platformsupport/fontdatabases/fontdatabases.pri disables all font
+databases except CoreText on OS X, so this is required for
+linking. Otherwise, we get undefined reference linker errors:
+
+Undefined symbols for architecture x86_64:
+  "vtable for QBasicFontDatabase", referenced from:
+      QMinimalIntegration::fontDatabase() const in
+  qminimalintegration.o
+
+Change-Id: I31298e973803b4d6eedbf61607056114d1556584
+Reviewed-by: Jake Petroules <jake.petroules@qt.io>
+(cherry picked from commit 16864c42d6bc0ee6b3e3fa03123ef5884557ceea)
+
+diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
+index 0d31d66..bd6f2d8 100644
+--- a/src/plugins/platforms/minimal/minimal.pro
++++ b/src/plugins/platforms/minimal/minimal.pro
+@@ -11,6 +11,7 @@ HEADERS =   qminimalintegration.h \
+ OTHER_FILES += minimal.json
+ 
+ CONFIG += qpa/genericunixfontdatabase
++darwin: DEFINES += QT_NO_FONTCONFIG
+ 
+ PLUGIN_TYPE = platforms
+ PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin
+-- 
+2.7.4
+
+
+From f504f5805be3cc27e19632e15b29eaaaac0e92e8 Mon Sep 17 00:00:00 2001
 From: Boris Pek <tehnick-8@yandex.ru>
-Date: Sun, 19 Jun 2016 02:10:42 +0300
-Subject: [PATCH 7/7] fix build with -fontconfig and -system-freetype for MS
- Windows
-
-
-diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
-index 7224f41..617a449 100644
---- a/src/plugins/platforms/minimal/qminimalintegration.cpp
-+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
-@@ -120,7 +120,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const
-     if (m_options & EnableFonts) {
- #ifndef QT_NO_FONTCONFIG
-         if (!m_fontDatabase)
-+#ifdef Q_OS_WIN
-+            m_fontDatabase = new QBasicFontDatabase;
-+#else // !Q_OS_WIN
-             m_fontDatabase = new QGenericUnixFontDatabase;
-+#endif
- #else
-         return QPlatformIntegration::fontDatabase();
- #endif
+Date: Sun, 19 Jun 2016 03:15:43 +0300
+Subject: [PATCH 8/8] Fix build of the minimal platform plugin for MS Windows
+
+when qtbase is configured with -fontconfig and -system-freetype.
+
+This fix is necessary after 060e0f6628fd185994911307c59f5355acaaf18f.
+Used the same approach as in 16864c42d6bc0ee6b3e3fa03123ef5884557ceea.
+
+Change-Id: Idece0dc11d89e38266c95de1769be751c06324ef
+(cherry picked from commit 02d2969fafe5088bb1c80eb58b2736df447326cd)
+
+diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
+index bd6f2d8..4b63461 100644
+--- a/src/plugins/platforms/minimal/minimal.pro
++++ b/src/plugins/platforms/minimal/minimal.pro
+@@ -12,6 +12,7 @@ OTHER_FILES += minimal.json
+ 
+ CONFIG += qpa/genericunixfontdatabase
+ darwin: DEFINES += QT_NO_FONTCONFIG
++win32: DEFINES += QT_NO_FONTCONFIG
+ 
+ PLUGIN_TYPE = platforms
+ PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin
 -- 
 2.7.4