Update to 6.3.1

1 files changed, 63 insertions, 0 deletions

diff --git a/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch b/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
new file mode 100644
index 000000000000..d58374081b0c
--- /dev/null
+++ b/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
@@ -0,0 +1,63 @@
+From 8ac6411a3410f571d784ec3ddeea4fe640938840 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 24 Apr 2022 23:00:27 +0200
+Subject: [PATCH 09/12] Find fontconfig via pkg-config for correct handling of
+ its dependencies
+
+CMake's own find module unforunately does not consider fontconfig's deps so
+static builds will break due to expat missing on the linker-line.
+
+Change-Id: I331cd6b1af4f2857279c90920d777977e80fdce5
+---
+ cmake/FindFontconfig.cmake | 11 +++++++++++
+ src/gui/CMakeLists.txt     |  2 +-
+ src/gui/configure.cmake    |  2 +-
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+ create mode 100644 cmake/FindFontconfig.cmake
+
+diff --git a/cmake/FindFontconfig.cmake b/cmake/FindFontconfig.cmake
+new file mode 100644
+index 0000000000..1a52327ae6
+--- /dev/null
++++ b/cmake/FindFontconfig.cmake
+@@ -0,0 +1,11 @@
++find_package(PkgConfig QUIET)
++
++if(NOT TARGET PkgConfig::Fontconfig)
++    pkg_check_modules(Fontconfig fontconfig IMPORTED_TARGET)
++
++    if (NOT TARGET PkgConfig::Fontconfig)
++        set(Fontconfig_FOUND 0)
++    endif()
++else()
++    set(Fontconfig_FOUND 1)
++endif()
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index b9f4e96671..768bb14cb0 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -737,7 +737,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre
+         text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h
+         text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h
+     LIBRARIES
+-        Fontconfig::Fontconfig
++        PkgConfig::Fontconfig
+ )
+ 
+ qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS
+diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
+index 42ab041f99..044c90a0d1 100644
+--- a/src/gui/configure.cmake
++++ b/src/gui/configure.cmake
+@@ -39,7 +39,7 @@ qt_find_package(WrapSystemFreetype 2.2.0 PROVIDED_TARGETS WrapSystemFreetype::Wr
+ if(QT_FEATURE_system_zlib)
+     qt_add_qmake_lib_dependency(freetype zlib)
+ endif()
+-qt_find_package(Fontconfig PROVIDED_TARGETS Fontconfig::Fontconfig MODULE_NAME gui QMAKE_LIB fontconfig)
++qt_find_package(Fontconfig PROVIDED_TARGETS PkgConfig::Fontconfig MODULE_NAME gui QMAKE_LIB fontconfig)
+ qt_add_qmake_lib_dependency(fontconfig freetype)
+ qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm)
+ qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz)
+-- 
+2.36.1
+