From 313fad2ce5e3fc3c1333a0a27f0a7fe17064eb1a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 04 2019 15:41:49 +0000
Subject: import qt-4.8.7-3.el7_6


---

diff --git a/SOURCES/qt-everywhere-opensource-src-4.8.7-revert-font-cache-fix.patch b/SOURCES/qt-everywhere-opensource-src-4.8.7-revert-font-cache-fix.patch
new file mode 100644
index 0000000..ff93cf7
--- /dev/null
+++ b/SOURCES/qt-everywhere-opensource-src-4.8.7-revert-font-cache-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
+index d937f38d..2b996440 100644
+--- a/src/gui/text/qfontengine_ft.cpp
++++ b/src/gui/text/qfontengine_ft.cpp
+@@ -1603,9 +1603,7 @@ void QFontEngineFT::recalcAdvances(QGlyphLayout *glyphs, QTextEngine::ShaperFlag
+                    (flags & HB_ShaperFlag_UseDesignMetrics)) && FT_IS_SCALABLE(freetype->face);
+     for (int i = 0; i < glyphs->numGlyphs; i++) {
+         Glyph *g = defaultGlyphSet.getGlyph(glyphs->glyphs[i]);
+-        // Since we are passing Format_None to loadGlyph, use same default format logic as loadGlyph
+-        GlyphFormat acceptableFormat = (defaultFormat != Format_None) ? defaultFormat : Format_Mono;
+-        if (g && g->format == acceptableFormat) {
++        if (g) {
+             glyphs->advances_x[i] = design ? QFixed::fromFixed(g->linearAdvance) : QFixed(g->advance);
+         } else {
+             if (!face)
diff --git a/SPECS/qt.spec b/SPECS/qt.spec
index 30b42e7..efe26a5 100644
--- a/SPECS/qt.spec
+++ b/SPECS/qt.spec
@@ -26,7 +26,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -172,6 +172,8 @@ Patch96: qt-everywhere-opensource-src-4.8.7-mips64.patch
 Patch97: qt-everywhere-opensource-src-4.8.7-gcc6.patch
 # support alsa-1.1.x
 Patch98: qt-everywhere-opensource-src-4.8.7-alsa-1.1.patch
+# Revert https://github.com/qt/qt/commit/80e3108f5cd1e1850ec81a21100d79a0946addd7
+Patch99: qt-everywhere-opensource-src-4.8.7-revert-font-cache-fix.patch
 
 # upstream patches
 # http://codereview.qt-project.org/#change,22006
@@ -596,6 +598,7 @@ rm -rf src/3rdparty/clucene
 %patch96 -p1 -b .mips64
 %patch97 -p1 -b .gcc6
 %patch98 -p1 -b .alsa1.1
+%patch99 -p1 -b .revert-font-cache-fix
 
 # upstream patches
 %patch100 -p1 -b .QTgaHandler
@@ -1325,6 +1328,10 @@ fi
 
 
 %changelog
+* Thu Mar 21 2019 Jan Grulich <jgrulich@redhat.com> - 1:4.8.7-3
+- Revert fix for font cache check in QFontEngineFT::recalcAdvances()
+  Resolves: bz#1701744
+
 * Thu Sep 14 2017 Jan Grulich <jgrulich@redhat.com> - 1:4.8.7-2
 - Update aarch64 patch
   Resolves: bz#1484361