merge bitcoin#22054: Bump Qt version to 5.12.11

This commit is contained in:
UdjinM6 2021-06-02 12:12:07 +08:00 committed by Kittywhiskers Van Gogh
parent e3dbd51296
commit dfa16fc05d
3 changed files with 5 additions and 38 deletions

View File

@ -1,9 +1,9 @@
PACKAGE=qt
$(package)_version=5.12.10
$(package)_version=5.12.11
$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
$(package)_sha256_hash=8088f174e6d28e779516c083b6087b6a9e3c8322b4bc161fd1b54195e3c86940
$(package)_sha256_hash=1c1b4e33137ca77881074c140d54c3c9747e845a31338cfe8680f171f0bc3a39
$(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon
$(package)_qt_libs=corelib network widgets gui plugins testlib
$(package)_linguist_tools = lrelease lupdate lconvert
@ -12,16 +12,15 @@ $(package)_patches += fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch
$(package)_patches+= fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
$(package)_patches+= no_sdk_version_check.patch
$(package)_patches+= fix_qpainter_non_determinism.patch fix_lib_paths.patch fix_android_pch.patch
$(package)_patches+= fix_bigsur_drawing.patch
$(package)_patches+= fix_limits_header.patch
$(package)_patches+= fix_montery_include.patch
# Update OSX_QT_TRANSLATIONS when this is updated
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
$(package)_qttranslations_sha256_hash=e1de58ed108b7e0a138815ea60fd46a2c4e1fc31396a707e5630e92de79c53de
$(package)_qttranslations_sha256_hash=577b0668a777eb2b451c61e8d026d79285371597ce9df06b6dee6c814164b7c3
$(package)_qttools_file_name=qttools-$($(package)_suffix)
$(package)_qttools_sha256_hash=b0cfa6e7aac41b7c61fc59acc04843d7a98f9e1840370611751bcfc1834a636c
$(package)_qttools_sha256_hash=98b2aaca230458f65996f3534fd471d2ffd038dd58ac997c0589c06dc2385b4f
$(package)_extra_sources = $($(package)_qttranslations_file_name)
$(package)_extra_sources += $($(package)_qttools_file_name)
@ -223,7 +222,6 @@ define $(package)_preprocess_cmds
patch -p1 -i $($(package)_patch_dir)/fix_qpainter_non_determinism.patch &&\
patch -p1 -i $($(package)_patch_dir)/no_sdk_version_check.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_lib_paths.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_bigsur_drawing.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_montery_include.patch && \
mkdir -p qtbase/mkspecs/macx-clang-linux &&\

View File

@ -1,6 +1,6 @@
--- old/qtbase/src/plugins/platforms/android/androidjnimain.cpp
+++ new/qtbase/src/plugins/platforms/android/androidjnimain.cpp
@@ -897,6 +897,14 @@
@@ -898,6 +898,14 @@
__android_log_print(ANDROID_LOG_FATAL, "Qt", "registerNatives failed");
return -1;
}

View File

@ -1,31 +0,0 @@
Fix GUI stuck on Big Sur
See:
- https://github.com/bitcoin-core/gui/issues/249
- https://github.com/bitcoin/bitcoin/pull/21495
- https://bugreports.qt.io/browse/QTBUG-87014
We should be able to drop this once we are using one of the following versions:
- Qt 5.12.11 or later, see upstream commit: c5d904639dbd690a36306e2b455610029704d821
- Qt 5.15.3 or later, see upstream commit: 2cae34354bd41ae286258c7a6b3653b746e786ae
--- a/qtbase/src/plugins/platforms/cocoa/qnsview_drawing.mm
+++ b/qtbase/src/plugins/platforms/cocoa/qnsview_drawing.mm
@@ -95,8 +95,15 @@
// by AppKit at a point where we've already set up other parts of the platform plugin
// based on the presence of layers or not. Once we've rewritten these parts to support
// dynamically picking up layer enablement we can let AppKit do its thing.
- return QMacVersion::buildSDK() >= QOperatingSystemVersion::MacOSMojave
- && QMacVersion::currentRuntime() >= QOperatingSystemVersion::MacOSMojave;
+
+ if (QMacVersion::currentRuntime() >= QOperatingSystemVersion::MacOSBigSur)
+ return true; // Big Sur always enables layer-backing, regardless of SDK
+
+ if (QMacVersion::currentRuntime() >= QOperatingSystemVersion::MacOSMojave
+ && QMacVersion::buildSDK() >= QOperatingSystemVersion::MacOSMojave)
+ return true; // Mojave and Catalina enable layers based on the app's SDK
+
+ return false; // Prior versions needed explicitly enabled layer backing
}
- (BOOL)layerExplicitlyRequested