From 2d8ecc664fa8f9efe4eea3d3b4856ae54b6bdaeb Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Mon, 20 Mar 2023 14:45:04 +0100
Subject: [PATCH] - Fix bz#2178389, Qt application render very thin fonts after
   switch to VF version of Noto CJK fonts

---
 qt5-qtbase.spec           | 11 ++++++++++-
 qtbase-QTBUG-111994.patch | 11 +++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 qtbase-QTBUG-111994.patch

diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 3d51816..42d8716 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -53,7 +53,7 @@
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
 Version: 5.15.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -141,6 +141,10 @@ Source100: kde-5.15-rollup-20230227.patch.gz
 
 Patch101: qtbase-5.15.8-fix-missing-qtsan-include.patch
 
+# Workaround for font rendering issue with cjk-vf-fonts
+# https://bugreports.qt.io/browse/QTBUG-111994
+Patch102: qtbase-QTBUG-111994.patch
+
 # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
 # Those themes are there for platform integration. If the required libraries are
 # not there, the platform to integrate with isn't either. Then Qt will just
@@ -416,6 +420,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 ## upstream patches
 %patch100 -p1
 %patch101 -p1
+%patch102 -p1
 
 # move some bundled libs to ensure they're not accidentally used
 pushd src/3rdparty
@@ -1095,6 +1100,10 @@ fi
 
 
 %changelog
+* Mon Mar 20 2023 Than Ngo <than@redhat.com> - 5.15.8-7
+- Fix bz#2178389, Qt application render very thin fonts after
+  switch to VF version of Noto CJK fonts
+
 * Mon Feb 27 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-6
 - refresh kde-5.15-rollup patch
 
diff --git a/qtbase-QTBUG-111994.patch b/qtbase-QTBUG-111994.patch
new file mode 100644
index 0000000..bc8e732
--- /dev/null
+++ b/qtbase-QTBUG-111994.patch
@@ -0,0 +1,11 @@
+diff -pruN qtbase-everywhere-src-5.15.8.orig/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp qtbase-everywhere-src-5.15.8/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+--- qtbase-everywhere-src-5.15.8.orig/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp	2023-03-16 16:21:48.574489839 +0900
++++ qtbase-everywhere-src-5.15.8/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp	2023-03-17 15:58:39.312498612 +0900
+@@ -564,6 +564,7 @@ void QFontconfigDatabase::populateFontDa
+             FcObjectSetAdd(os, *p);
+             ++p;
+         }
++        FcPatternAddBool(pattern, FC_VARIABLE, FcFalse);
+         fonts = FcFontList(nullptr, pattern, os);
+         FcObjectSetDestroy(os);
+         FcPatternDestroy(pattern);