Skip to content

Commit a83bbf0

Browse files
committed
Merge bitcoin#22054: depends: Bump Qt version to 5.12.11
fa416ce depends: Bump Qt version to 5.12.11 (Hennadii Stepanov) Pull request description: Qt 5.12.11: - [fixes](qt/qtbase@c5d9046) macOS related [QTBUG-87014](https://bugreports.qt.io/browse/QTBUG-87014), and the `fix_bigsur_drawing.patch` (which is our workaround for QTBUG-87014) could be dropped - [upgrades](qt/qtbase@00326c9) supported macOS SDK to 11.0, and removes related warnings - fixes tab widget rendering on macOS Big Sur ([here](qt/qtbase@4d6832d) and [here](qt/qtbase@28b0153)): - master (5.12.10) ![DeepinScreenshot_select-area_20210525122725](https://user-images.githubusercontent.com/32963518/119474470-dd24a180-bd54-11eb-82e6-ca4d39b0b177.png) ![DeepinScreenshot_select-area_20210525123634](https://user-images.githubusercontent.com/32963518/119475548-ebbf8880-bd55-11eb-9c13-477016f8c23b.png) - this PR (5.12.11) ![Screenshot from 2021-05-25 12-28-02](https://user-images.githubusercontent.com/32963518/119474537-ed3c8100-bd54-11eb-8efe-7fe5ccae8a98.png) Closes bitcoin-core/gui#136. ACKs for top commit: goums: ACK fa416ce fanquake: ACK fa416ce - merging this now to move it out of the way of other Qt related changes. Tree-SHA512: 4e621b214f05d12a060757fadf2fa103c09b594d7b1c2ad9200f550e55c1e1fdf66f2f830550e724b9277448e5480be256cb0003f4597902944400e16c4a68b8
2 parents 0a3b8ea + fa416ce commit a83bbf0

File tree

4 files changed

+7
-39
lines changed

4 files changed

+7
-39
lines changed

depends/packages/qt.mk

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
PACKAGE=qt
2-
$(package)_version=5.12.10
2+
$(package)_version=5.12.11
33
$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules
44
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
55
$(package)_file_name=qtbase-$($(package)_suffix)
6-
$(package)_sha256_hash=8088f174e6d28e779516c083b6087b6a9e3c8322b4bc161fd1b54195e3c86940
6+
$(package)_sha256_hash=1c1b4e33137ca77881074c140d54c3c9747e845a31338cfe8680f171f0bc3a39
77
$(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon
88
$(package)_qt_libs=corelib network widgets gui plugins testlib
99
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no-xlib.patch
1010
$(package)_patches+= fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
1111
$(package)_patches+= drop_lrelease_dependency.patch no_sdk_version_check.patch
1212
$(package)_patches+= fix_lib_paths.patch fix_android_pch.patch
13-
$(package)_patches+= fix_bigsur_drawing.patch qtbase-moc-ignore-gcc-macro.patch
13+
$(package)_patches+= qtbase-moc-ignore-gcc-macro.patch
1414

1515
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
16-
$(package)_qttranslations_sha256_hash=e1de58ed108b7e0a138815ea60fd46a2c4e1fc31396a707e5630e92de79c53de
16+
$(package)_qttranslations_sha256_hash=577b0668a777eb2b451c61e8d026d79285371597ce9df06b6dee6c814164b7c3
1717

1818
$(package)_qttools_file_name=qttools-$($(package)_suffix)
19-
$(package)_qttools_sha256_hash=b0cfa6e7aac41b7c61fc59acc04843d7a98f9e1840370611751bcfc1834a636c
19+
$(package)_qttools_sha256_hash=98b2aaca230458f65996f3534fd471d2ffd038dd58ac997c0589c06dc2385b4f
2020

2121
$(package)_extra_sources = $($(package)_qttranslations_file_name)
2222
$(package)_extra_sources += $($(package)_qttools_file_name)
@@ -232,7 +232,6 @@ define $(package)_preprocess_cmds
232232
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
233233
patch -p1 -i $($(package)_patch_dir)/no_sdk_version_check.patch && \
234234
patch -p1 -i $($(package)_patch_dir)/fix_lib_paths.patch && \
235-
patch -p1 -i $($(package)_patch_dir)/fix_bigsur_drawing.patch && \
236235
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
237236
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
238237
mkdir -p qtbase/mkspecs/macx-clang-linux &&\

depends/patches/qt/fix_android_jni_static.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- old/qtbase/src/plugins/platforms/android/androidjnimain.cpp
22
+++ new/qtbase/src/plugins/platforms/android/androidjnimain.cpp
3-
@@ -897,6 +897,14 @@
3+
@@ -898,6 +898,14 @@
44
__android_log_print(ANDROID_LOG_FATAL, "Qt", "registerNatives failed");
55
return -1;
66
}

depends/patches/qt/fix_bigsur_drawing.patch

-31
This file was deleted.

doc/dependencies.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
2121
| PCRE | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) |
2222
| Python (tests) | | [3.6](https://www.python.org/downloads) | | | |
2323
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | |
24-
| Qt | [5.12.10](https://download.qt.io/official_releases/qt/) | [5.9.5](https://github.com/bitcoin/bitcoin/issues/20104) | No | | |
24+
| Qt | [5.12.11](https://download.qt.io/official_releases/qt/) | [5.9.5](https://github.com/bitcoin/bitcoin/issues/20104) | No | | |
2525
| SQLite | [3.32.1](https://sqlite.org/download.html) | [3.7.17](https://github.com/bitcoin/bitcoin/pull/19077) | | | |
2626
| XCB | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) (Linux only) |
2727
| xkbcommon | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) (Linux only) |

0 commit comments

Comments
 (0)