From 2c151a964b371f99916c5081adb7a229256d8dab Mon Sep 17 00:00:00 2001 From: Dakoda Greaves Date: Wed, 12 Oct 2022 21:03:41 -0700 Subject: [PATCH] depends: adds QT 5.7.1 'QFixed' context error patch -After updating clang+llvm, QT 5.7.1's qfontengine_coretext.mm file's variable QFixed errors out as it's a constructor rather than a type in this context. This patch fixes that error. --- depends/packages/qt.mk | 3 ++- depends/patches/qt/fix_qfontengine_coretext.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 depends/patches/qt/fix_qfontengine_coretext.patch diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index de558da58..9fd88619d 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -8,7 +8,7 @@ $(package)_dependencies=openssl zlib $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext libxkbcommon $(package)_build_subdir=qtbase $(package)_qt_libs=corelib network widgets gui plugins testlib printsupport -$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch +$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qfontengine_coretext.patch fix_qt_pkgconfig.patch $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) $(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d @@ -137,6 +137,7 @@ define $(package)_preprocess_cmds patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \ patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \ patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \ + patch -p1 < $($(package)_patch_dir)/fix_qfontengine_coretext.patch && \ patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \ echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ diff --git a/depends/patches/qt/fix_qfontengine_coretext.patch b/depends/patches/qt/fix_qfontengine_coretext.patch new file mode 100644 index 000000000..f46e6d76f --- /dev/null +++ b/depends/patches/qt/fix_qfontengine_coretext.patch @@ -0,0 +1,11 @@ +--- old/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm ++++ new/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +@@ -824,7 +824,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl + + QFixed QCoreTextFontEngine::emSquareSize() const + { +- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); ++ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); + } + + QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const