Skip to content

Commit da9578d

Browse files
prusnakhebasto
authored andcommitted
build, qt: bump Qt5 version to 5.15.3
Qt 5.15.3 release is a patch release made on the top of Qt 5.15.2. As a patch release, Qt 5.15.3 does not add any new functionality but provides bug fixes and other improvements. https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.3/release-note.md * dropped patches: - patches/qt/dont_use_avx_android_x86_64.patch - patches/qt/fix_bigsur_style.patch * adjusted patches: - patches/qt/fix_android_jni_static.patch - patches/qt/fix_limits_header.patch - patches/qt/use_android_ndk23.patch Co-authored-by: Hennadii Stepanov <[email protected]> Github-Pull: bitcoin/bitcoin#24668 Rebased-From: ef20add
1 parent 313ea18 commit da9578d

File tree

9 files changed

+24
-179
lines changed

9 files changed

+24
-179
lines changed

.cirrus.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ task:
8585
CI_VCPKG_TAG: '2021.05.12'
8686
VCPKG_DOWNLOADS: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\downloads'
8787
VCPKG_DEFAULT_BINARY_CACHE: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\archives'
88-
QT_DOWNLOAD_URL: 'https://download.qt.io/official_releases/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.zip'
89-
QT_LOCAL_PATH: 'C:\qt-everywhere-src-5.15.2.zip'
90-
QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.15.2'
88+
QT_DOWNLOAD_URL: 'https://download.qt.io/official_releases/qt/5.15/5.15.3/single/qt-everywhere-opensource-src-5.15.3.zip'
89+
QT_LOCAL_PATH: 'C:\qt-everywhere-opensource-src-5.15.3.zip'
90+
QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.15.3'
9191
QTBASEDIR: 'C:\Qt_static'
9292
x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"'
9393
IgnoreWarnIntDirInTempDetected: 'true'

build_msvc/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Qt
2828
---------------------
2929
To build Bitcoin Core with the GUI, a static build of Qt is required.
3030

31-
1. Download a single ZIP archive of Qt source code from https://download.qt.io/official_releases/qt/ (e.g., [`qt-everywhere-src-5.15.2.zip`](https://download.qt.io/official_releases/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.zip)), and expand it into a dedicated folder. The following instructions assume that this folder is `C:\dev\qt-source`.
31+
1. Download a single ZIP archive of Qt source code from https://download.qt.io/official_releases/qt/ (e.g., [`qt-everywhere-opensource-src-5.15.3.zip`](https://download.qt.io/official_releases/qt/5.15/5.15.3/single/qt-everywhere-opensource-src-5.15.3.zip)), and expand it into a dedicated folder. The following instructions assume that this folder is `C:\dev\qt-source`.
3232

3333
2. Open "x64 Native Tools Command Prompt for VS 2019", and input the following commands:
3434
```cmd
@@ -83,4 +83,4 @@ If is it enabled then in the output `Dynamic base` will be listed in the `DLL ch
8383
Terminal Server Aware
8484
```
8585

86-
This may not disable all stack randomization as versions of windows employ additional stack randomization protections. These protections must be turned off in the OS configuration.
86+
This may not disable all stack randomization as versions of windows employ additional stack randomization protections. These protections must be turned off in the OS configuration.

depends/packages/qt.mk

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
package=qt
2-
$(package)_version=5.15.2
2+
$(package)_version=5.15.3
33
$(package)_download_path=https://download.qt.io/official_releases/qt/5.15/$($(package)_version)/submodules
4-
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
4+
$(package)_suffix=everywhere-opensource-src-$($(package)_version).tar.xz
55
$(package)_file_name=qtbase-$($(package)_suffix)
6-
$(package)_sha256_hash=909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8
6+
$(package)_sha256_hash=26394ec9375d52c1592bd7b689b1619c6b8dbe9b6f91fdd5c355589787f3a0b6
77
$(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
88
$(package)_qt_libs=corelib network widgets gui plugins testlib
99
$(package)_linguist_tools = lrelease lupdate lconvert
1010
$(package)_patches = qt.pro qttools_src.pro
1111
$(package)_patches += fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no-xlib.patch
12-
$(package)_patches += dont_use_avx_android_x86_64.patch dont_hardcode_x86_64.patch fix_montery_include.patch
12+
$(package)_patches += dont_hardcode_x86_64.patch fix_montery_include.patch
1313
$(package)_patches += fix_android_jni_static.patch dont_hardcode_pwd.patch
1414
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch
15-
$(package)_patches += fix_bigsur_style.patch use_android_ndk23.patch
15+
$(package)_patches += use_android_ndk23.patch
1616
$(package)_patches += rcc_hardcode_timestamp.patch
1717

1818
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
19-
$(package)_qttranslations_sha256_hash=d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8
19+
$(package)_qttranslations_sha256_hash=5d7869f670a135ad0986e266813b9dd5bbae2b09577338f9cdf8904d4af52db0
2020

2121
$(package)_qttools_file_name=qttools-$($(package)_suffix)
22-
$(package)_qttools_sha256_hash=c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc
22+
$(package)_qttools_sha256_hash=463b2fe71a085e7ab4e39333ae360ab0ec857b966d7a08f752c427e5df55f90d
2323

2424
$(package)_extra_sources = $($(package)_qttranslations_file_name)
2525
$(package)_extra_sources += $($(package)_qttools_file_name)
@@ -235,12 +235,10 @@ define $(package)_preprocess_cmds
235235
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch && \
236236
patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch && \
237237
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
238-
patch -p1 -i $($(package)_patch_dir)/dont_use_avx_android_x86_64.patch && \
239238
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_x86_64.patch && \
240239
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
241240
patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \
242241
patch -p1 -i $($(package)_patch_dir)/fix_montery_include.patch && \
243-
patch -p1 -i $($(package)_patch_dir)/fix_bigsur_style.patch && \
244242
patch -p1 -i $($(package)_patch_dir)/use_android_ndk23.patch && \
245243
patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
246244
mkdir -p qtbase/mkspecs/macx-clang-linux &&\

depends/patches/qt/dont_use_avx_android_x86_64.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

depends/patches/qt/fix_android_jni_static.patch

Lines changed: 1 addition & 1 deletion
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-
@@ -914,6 +914,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
3+
@@ -934,6 +934,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
44
__android_log_print(ANDROID_LOG_FATAL, "Qt", "registerNatives failed");
55
return -1;
66
}

depends/patches/qt/fix_bigsur_style.patch

Lines changed: 0 additions & 90 deletions
This file was deleted.

depends/patches/qt/fix_limits_header.patch

Lines changed: 9 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,9 @@
11
Fix compiling with GCC 11
22

3-
See: https://bugreports.qt.io/browse/QTBUG-90395.
3+
Upstream:
4+
- bug report: https://bugreports.qt.io/browse/QTBUG-89977
5+
- fix in Qt 6.1: 813a928c7c3cf98670b6043149880ed5c955efb9
46

5-
Upstream commits:
6-
- Qt 5.15 -- unavailable as open source
7-
- Qt 6.0: b2af6332ea37e45ab230a7a5d2d278f86d961b83
8-
- Qt 6.1: 9c56d4da2ff631a8c1c30475bd792f6c86bda53c
9-
10-
--- old/qtbase/src/corelib/global/qendian.h
11-
+++ new/qtbase/src/corelib/global/qendian.h
12-
@@ -44,6 +44,8 @@
13-
#include <QtCore/qfloat16.h>
14-
#include <QtCore/qglobal.h>
15-
16-
+#include <limits>
17-
+
18-
// include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
19-
#include <stdlib.h>
20-
#include <string.h>
21-
22-
--- old/qtbase/src/corelib/global/qfloat16.h
23-
+++ new/qtbase/src/corelib/global/qfloat16.h
24-
@@ -43,6 +43,7 @@
25-
26-
#include <QtCore/qglobal.h>
27-
#include <QtCore/qmetatype.h>
28-
+#include <limits>
29-
#include <string.h>
30-
31-
#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
32-
33-
--- old/qtbase/src/tools/moc/generator.cpp
34-
+++ new/qtbase/src/tools/moc/generator.cpp
35-
@@ -40,6 +40,8 @@
36-
#include <QtCore/qplugin.h>
37-
#include <QtCore/qstringview.h>
38-
39-
+#include <limits>
40-
+
41-
#include <math.h>
42-
#include <stdio.h>
43-
447
--- old/qtbase/src/corelib/text/qbytearraymatcher.h
458
+++ new/qtbase/src/corelib/text/qbytearraymatcher.h
469
@@ -42,6 +42,8 @@
@@ -52,6 +15,12 @@ Upstream commits:
5215
QT_BEGIN_NAMESPACE
5316

5417

18+
19+
Upstream fix and backports:
20+
- Qt 6.1: 3eab20ad382569cb2c9e6ccec2322c3d08c0f716
21+
- Qt 6.2: 380294a5971da85010a708dc23b0edec192cbf27
22+
- Qt 6.3: 2b2b3155d9f6ba1e4f859741468fbc47db09292b
23+
5524
--- old/qtbase/src/corelib/tools/qoffsetstringarray_p.h
5625
+++ new/qtbase/src/corelib/tools/qoffsetstringarray_p.h
5726
@@ -55,6 +55,7 @@

depends/patches/qt/use_android_ndk23.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Use Android NDK r23 LTS
22

33
--- old/qtbase/mkspecs/features/android/default_pre.prf
44
+++ new/qtbase/mkspecs/features/android/default_pre.prf
5-
@@ -73,7 +73,7 @@ else: equals(QT_ARCH, x86_64): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/x86_64-linux-
5+
@@ -76,7 +76,7 @@ else: equals(QT_ARCH, x86_64): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/x86_64-linux-
66
else: equals(QT_ARCH, arm64-v8a): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/aarch64-linux-android-
77
else: CROSS_COMPILE = $$NDK_LLVM_PATH/bin/arm-linux-androideabi-
88

doc/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
2020
| PCRE | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) |
2121
| Python (tests) | | [3.6](https://www.python.org/downloads) | | | |
2222
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | |
23-
| Qt | [5.15.2](https://download.qt.io/official_releases/qt/) | [5.9.5](https://github.com/bitcoin/bitcoin/issues/20104) | No | | |
23+
| Qt | [5.15.3](https://download.qt.io/official_releases/qt/) | [5.9.5](https://github.com/bitcoin/bitcoin/issues/20104) | No | | |
2424
| SQLite | [3.32.1](https://sqlite.org/download.html) | [3.7.17](https://github.com/bitcoin/bitcoin/pull/19077) | | | |
2525
| XCB | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) (Linux only) |
2626
| systemtap ([tracing](tracing.md))| [4.5](https://sourceware.org/systemtap/ftp/releases/) | | | | |

0 commit comments

Comments
 (0)