build, qt: bump Qt5 version to 5.15.3 #24668

prusnak · 2022-03-25T09:34:31Z

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

hebasto · 2022-03-25T09:45:27Z

Qt 5.15.3 does not add any new functionality but provides bug fixes and other improvements.

Are there explicit benefits for our project?

UPDATE: Could dont_use_avx_android_x86_64.patch and fix_limits_header.patch be dropped now?

hebasto · 2022-03-25T09:56:26Z

I've restarted CI: https://cirrus-ci.com/build/6411581146791936

prusnak · 2022-03-25T10:00:38Z

Are there explicit benefits for our project?
...
UPDATE: Could dont_use_avx_android_x86_64.patch and fix_limits_header.patch be dropped now?

Right, we can now drop the following (upstreamed) patches:

dont_use_avx_android_x86_64.patch
fix_limits_header.patch
fix_bigsur_style.patch

I force pushed c959d29 which drops these patches.

I went through the release notes and there are macOS rendering fixes included in the release. Some of them were backported in fix_bigsur_style.patch but maybe there are more ...

depends/packages/qt.mk

hebasto · 2022-03-25T10:24:38Z

Right, we can now drop the following (upstreamed) patches:
* `dont_use_avx_android_x86_64.patch`

* `fix_limits_header.patch`

* `fix_bigsur_style.patch`
I force pushed c959d29 which drops these patches.

I went through the release notes and there are macOS rendering fixes included in the release. Some of them were backported in fix_bigsur_style.patch but maybe there are more ...

I've verified that all changes in our fix_bigsur_style.patch are backported into 5.15.3:

I've verified that all changes in our dont_use_avx_android_x86_64.patch are backported into 5.15.3:

qt/qtbase@8b2cc0f

hebasto · 2022-03-25T10:26:58Z

Concept ACK.

hebasto · 2022-03-25T11:37:47Z

To adjust other Qt patches, suggesting the following changes:

diff --git a/depends/patches/qt/fix_android_jni_static.patch b/depends/patches/qt/fix_android_jni_static.patch
index bb6466176..22a4d5ab0 100644
--- a/depends/patches/qt/fix_android_jni_static.patch
+++ b/depends/patches/qt/fix_android_jni_static.patch
@@ -1,6 +1,6 @@
 --- old/qtbase/src/plugins/platforms/android/androidjnimain.cpp
 +++ new/qtbase/src/plugins/platforms/android/androidjnimain.cpp
-@@ -914,6 +914,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
+@@ -934,6 +934,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
          __android_log_print(ANDROID_LOG_FATAL, "Qt", "registerNatives failed");
          return -1;
      }
diff --git a/depends/patches/qt/use_android_ndk23.patch b/depends/patches/qt/use_android_ndk23.patch
index 85b869021..f22367d52 100644
--- a/depends/patches/qt/use_android_ndk23.patch
+++ b/depends/patches/qt/use_android_ndk23.patch
@@ -2,7 +2,7 @@ Use Android NDK r23 LTS
 
 --- old/qtbase/mkspecs/features/android/default_pre.prf
 +++ new/qtbase/mkspecs/features/android/default_pre.prf
-@@ -73,7 +73,7 @@ else: equals(QT_ARCH, x86_64): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/x86_64-linux-
+@@ -76,7 +76,7 @@ else: equals(QT_ARCH, x86_64): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/x86_64-linux-
  else: equals(QT_ARCH, arm64-v8a): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/aarch64-linux-android-
  else: CROSS_COMPILE = $$NDK_LLVM_PATH/bin/arm-linux-androideabi-

prusnak · 2022-03-25T12:15:35Z

To adjust other Qt patches, suggesting the following changes:

Done in d6042b5

hebasto

Approach ACK d6042b5.

hebasto · 2022-03-25T13:19:51Z

Some notes about depends/patches/qt/fix_limits_header.patch:

Apparently, patching of qtbase/src/tools/moc/generator.cpp was required only for Qt 5.12.11. It even is not required on the current master branch for Qt 5.15.2. Therefore, it seems safe to drop this diff from the patch, although the line https://github.com/qt/qtbase/blob/v5.15.3-lts-lgpl/src/tools/moc/generator.cpp#L1621 still exists:

        if (d == floor(d) && fabs(d) <= (Q_INT64_C(1) << std::numeric_limits<double>::digits))

Two remaining diffs have been took from different upstream fixes. Therefore, suggesting to comment them more explicitly:

$ cat depends/patches/qt/fix_limits_header.patch
Fix compiling with GCC 11

Upstream:
 - bug report: https://bugreports.qt.io/browse/QTBUG-89977
 - fix in Qt 6.1: 813a928c7c3cf98670b6043149880ed5c955efb9

--- old/qtbase/src/corelib/text/qbytearraymatcher.h
+++ new/qtbase/src/corelib/text/qbytearraymatcher.h
@@ -42,6 +42,8 @@
 
 #include <QtCore/qbytearray.h>
 
+#include <limits>
+
 QT_BEGIN_NAMESPACE
 
 

Upstream fix and backports:
 - Qt 6.1: 3eab20ad382569cb2c9e6ccec2322c3d08c0f716
 - Qt 6.2: 380294a5971da85010a708dc23b0edec192cbf27
 - Qt 6.3: 2b2b3155d9f6ba1e4f859741468fbc47db09292b

--- old/qtbase/src/corelib/tools/qoffsetstringarray_p.h
+++ new/qtbase/src/corelib/tools/qoffsetstringarray_p.h
@@ -55,6 +55,7 @@
 
 #include <tuple>
 #include <array>
+#include <limits>
 
 QT_BEGIN_NAMESPACE

I'd like to discuss whether we should backport the qt/qtbase@813a928 commit entirely, not just a diff for src/corelib/text/qbytearraymatcher.h. At least, should we add a diff for src/plugins/platforms/xcb/qxcbwindow.cpp? OTOH, I have not observed any build failures with the current implementation.

hebasto · 2022-03-25T13:31:52Z

Should we add CVE-2022-25643-5.15.diff to our patches?

See: https://nvd.nist.gov/vuln/detail/CVE-2022-25634

If "yes", then maybe in a separated commit?

prusnak · 2022-03-25T14:54:52Z

Should we add CVE-2022-25643-5.15.diff to our patches?

There are also (both have the same contents):

and we use QProcess here:

bitcoin/src/qt/guiutil.cpp

Line 447 in 7c08d81

    
           res = QProcess::startDetached("/usr/bin/open", QStringList{"-t", PathToQString(pathConfig)});

hebasto · 2022-03-25T17:39:03Z

There are also:
* [`qprocess5-15.diff`](https://download.qt.io/official_releases/qt/5.15/qprocess5-15.diff)

* [`CVE-2022-25255-qprocess5-15.diff`](https://download.qt.io/official_releases/qt/5.15/CVE-2022-25255-qprocess5-15.diff)
and we use QProcess here:

bitcoin/src/qt/guiutil.cpp

Line 447 in 7c08d81

res = QProcess::startDetached("/usr/bin/open", QStringList{"-t", PathToQString(pathConfig)});

I'd rather avoid using QProcess altogether.

DrahtBot · 2022-03-25T22:06:52Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#24586 (doc: add more info to dependencies.md by prusnak)
#22708 (build, qt: Add Wayland support for Linux builds with depends by hebasto)
#21778 (build: LLVM 14 & LLD based macOS toolchain by fanquake)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

promag

Concept ACK.

hebasto · 2022-03-26T11:42:26Z

Was thinking again about Qt security patches, and I believe it would be better to split the relevant discussion into separated issues / PRs.

Therefore, only (1) and (2) are remaining from my #24668 (comment).

prusnak · 2022-03-26T11:50:24Z

Was thinking again about Qt security patches, and I believe it would be better to split the relevant discussion into separated issues / PRs.

Agreed. Created PR #24688

Therefore, only (1) and (2) are remaining from my #24668 (comment).

Done in 7cbeee9

fanquake · 2022-04-03T13:59:15Z

Guix Build (on x86_64):

76f3d7997db56b6d90ee9e2e3fdc33c768a8f953be15bd5d486b4febd6f5e8d6  guix-build-7f6042849c97/output/aarch64-linux-gnu/SHA256SUMS.part
3bb69942c74703ef21ae8366741008fdedad37ea1c3d919e75947d4074990b08  guix-build-7f6042849c97/output/aarch64-linux-gnu/bitcoin-7f6042849c97-aarch64-linux-gnu-debug.tar.gz
b73ca45833a6642c339878269d2dabcd11431dbfdeb998c21462a43f7a39323d  guix-build-7f6042849c97/output/aarch64-linux-gnu/bitcoin-7f6042849c97-aarch64-linux-gnu.tar.gz
0d5fe415819f58837e6f117440e14998c332df312a7dcfcdd8afa2f5b8d67d32  guix-build-7f6042849c97/output/arm-linux-gnueabihf/SHA256SUMS.part
8c93c48f07d378cc63e2c2754ab99c0fc3fa30df84a1423505959ee3a5333960  guix-build-7f6042849c97/output/arm-linux-gnueabihf/bitcoin-7f6042849c97-arm-linux-gnueabihf-debug.tar.gz
947879079ffc48d1a325a0bcc4454ee2a0944572eab941d1697547464b1f123a  guix-build-7f6042849c97/output/arm-linux-gnueabihf/bitcoin-7f6042849c97-arm-linux-gnueabihf.tar.gz
6910d25cf6a64dbf8419f81142bca733c95c5eb86f80c59ad7f9a0b0f37c1e5c  guix-build-7f6042849c97/output/arm64-apple-darwin/SHA256SUMS.part
f3176844154966d975867ec7f057a9f474cfc7e7e41bd019537bc3df6488b985  guix-build-7f6042849c97/output/arm64-apple-darwin/bitcoin-7f6042849c97-arm64-apple-darwin-unsigned.dmg
9e81155dd2e63674abbce029d17c5fe124606ca253441bad0b9ff312f9393cf3  guix-build-7f6042849c97/output/arm64-apple-darwin/bitcoin-7f6042849c97-arm64-apple-darwin-unsigned.tar.gz
a2bb04a0250af36cc6ac78048ad1f8fc08591bea0d455a6e5269921d8ef39567  guix-build-7f6042849c97/output/arm64-apple-darwin/bitcoin-7f6042849c97-arm64-apple-darwin.tar.gz
6d3335243f9e831f4054447c2a7b541fae33b9b8816f227ad63e4755dcdaa8d2  guix-build-7f6042849c97/output/dist-archive/bitcoin-7f6042849c97.tar.gz
f99615b53c90d8dae44daccb8bf4ccfdcbba03350947ab64544d440fb23e3ed8  guix-build-7f6042849c97/output/powerpc64-linux-gnu/SHA256SUMS.part
b14b7e13af791654848722a3cf5b71b2ac565864ab28937c768490dd16061aa5  guix-build-7f6042849c97/output/powerpc64-linux-gnu/bitcoin-7f6042849c97-powerpc64-linux-gnu-debug.tar.gz
a2e0d119b63910369d8f1ed48bce616e3b9b3cb3e7a5404b988357019407f53c  guix-build-7f6042849c97/output/powerpc64-linux-gnu/bitcoin-7f6042849c97-powerpc64-linux-gnu.tar.gz
b62eb694039c3a2914a71d3b9c747876471c8cad0dd4747f295068393c0810f5  guix-build-7f6042849c97/output/powerpc64le-linux-gnu/SHA256SUMS.part
46a431b70e530e1be7b90f0277401348b6bd11ae462ce7803e3a3fa895b32e06  guix-build-7f6042849c97/output/powerpc64le-linux-gnu/bitcoin-7f6042849c97-powerpc64le-linux-gnu-debug.tar.gz
3b9bfecb7e057a0addedf26b00b57bda4804e847c9daf7f578623e1e46583641  guix-build-7f6042849c97/output/powerpc64le-linux-gnu/bitcoin-7f6042849c97-powerpc64le-linux-gnu.tar.gz
e31bbd499ffd2b1bf5044e31ec89d9b91e9e6a508829c8bc0e03e21a6e5af07c  guix-build-7f6042849c97/output/riscv64-linux-gnu/SHA256SUMS.part
11cff702cbab9d74b9192b8319d9e7269d89ffbe8bd774bc1411d9c6f8d57146  guix-build-7f6042849c97/output/riscv64-linux-gnu/bitcoin-7f6042849c97-riscv64-linux-gnu-debug.tar.gz
d2bd48c47415912ad8c96e03e3bc84f80ecae1fbf9a4ae483068dd6ce53529aa  guix-build-7f6042849c97/output/riscv64-linux-gnu/bitcoin-7f6042849c97-riscv64-linux-gnu.tar.gz
a8742730616abdf5c29b964ef0f5be4d12edc8c773a6c0d7ed1cd7065ef6e5d3  guix-build-7f6042849c97/output/x86_64-apple-darwin/SHA256SUMS.part
c29c67362d7add11a963713854e8de3636113b6934b9091d22d6ad7947ac2494  guix-build-7f6042849c97/output/x86_64-apple-darwin/bitcoin-7f6042849c97-x86_64-apple-darwin-unsigned.dmg
08d96c29904f04af666f1673189f4164a33eec3e63adf0adf39c35e30dad6521  guix-build-7f6042849c97/output/x86_64-apple-darwin/bitcoin-7f6042849c97-x86_64-apple-darwin-unsigned.tar.gz
2b3aa7b66a3d63255eadbb3f152163cdafff567e2ac26edca4642c5a5a11e30f  guix-build-7f6042849c97/output/x86_64-apple-darwin/bitcoin-7f6042849c97-x86_64-apple-darwin.tar.gz
e0a776f46aa032a7d24791b1752e874008d171a10b0e8e44eed5b1bbf2e45150  guix-build-7f6042849c97/output/x86_64-linux-gnu/SHA256SUMS.part
fa8f47ecb686c6aa66cdb18c1d0e22020df05157612e9486257b788720afe201  guix-build-7f6042849c97/output/x86_64-linux-gnu/bitcoin-7f6042849c97-x86_64-linux-gnu-debug.tar.gz
8561f2c4642f74064ae28a2a579f7a2b7b4cca3a6918dccc37998f98b972dfc7  guix-build-7f6042849c97/output/x86_64-linux-gnu/bitcoin-7f6042849c97-x86_64-linux-gnu.tar.gz
f14d08defc9e52a1057d9209e85d00ef3f6348a983f3389420fd39944ed72fad  guix-build-7f6042849c97/output/x86_64-w64-mingw32/SHA256SUMS.part
a71e546835eb4a889782be841fe2f6632df0581a6973d2f91833bcc2b78bfbe8  guix-build-7f6042849c97/output/x86_64-w64-mingw32/bitcoin-7f6042849c97-win64-debug.zip
ce67f2886f9f584244dcfc8d54df8b8ccb75b6bf4c3b65e8e06df83bbe1cdf66  guix-build-7f6042849c97/output/x86_64-w64-mingw32/bitcoin-7f6042849c97-win64-setup-unsigned.exe
d3945996e788545bbff9f95105451c308aa0fd2bda42674b4eacacca15c7e401  guix-build-7f6042849c97/output/x86_64-w64-mingw32/bitcoin-7f6042849c97-win64-unsigned.tar.gz
3a9b3eca1b7a92d4e426b551210beac09630c036354118f55b5d609a1a175b3b  guix-build-7f6042849c97/output/x86_64-w64-mingw32/bitcoin-7f6042849c97-win64.zip

fanquake

ACK 7f60428

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 <32963518+hebasto@users.noreply.github.com> Github-Pull: bitcoin#24668 Rebased-From: ef20add

hebasto · 2022-08-12T09:39:18Z

The first commit has been backported to the 23.x branch in #25828 to address:

31ca698 Disallow encryption of watchonly wallets (Andrew Chow) da9578d build, qt: bump Qt5 version to 5.15.3 (Pavol Rusnak) Pull request description: Backports: - ef20add from #24668 to address #24939 and bitcoin-core/gui#638 - bitcoin-core/gui#631 Guix builds on `x86_64`: ``` 773f3555a1c6179d35a7a0b3971ced8eaf5a5e4bef5c08313216509506fe618d guix-build-31ca698f2017/output/aarch64-linux-gnu/SHA256SUMS.part ef3977b92daabffc2d153e15963a5703839bc04250d2784bc00dc1104112e79e guix-build-31ca698f2017/output/aarch64-linux-gnu/bitcoin-31ca698f2017-aarch64-linux-gnu-debug.tar.gz 65b2351c61d226a8b10fda36cc963fda1f5fb89ea6b463d7351fdcd67bd57c3e guix-build-31ca698f2017/output/aarch64-linux-gnu/bitcoin-31ca698f2017-aarch64-linux-gnu.tar.gz 41c3489300f81f714033aa45ca3a807c5005be0625ebf58234fd89f3cdc65a1d guix-build-31ca698f2017/output/arm-linux-gnueabihf/SHA256SUMS.part 45e6e4c9e2e35430c41bca6df36d5ed2f9a857934da46bfd920a499e03bddb61 guix-build-31ca698f2017/output/arm-linux-gnueabihf/bitcoin-31ca698f2017-arm-linux-gnueabihf-debug.tar.gz cf08e2a62c5a9bfdeaeee6ce69263dde8b56033aab650bb9ffafe8e9b9241519 guix-build-31ca698f2017/output/arm-linux-gnueabihf/bitcoin-31ca698f2017-arm-linux-gnueabihf.tar.gz 7d1f3e185fbb6843a1b5c47f7ff2a4452aa4a1f533bd7171f7fc8a13e65fde53 guix-build-31ca698f2017/output/arm64-apple-darwin/SHA256SUMS.part 6395ee2e17fd5a8891fc70d97e7d75810d677293b6ad8581334b2e289024210d guix-build-31ca698f2017/output/arm64-apple-darwin/bitcoin-31ca698f2017-arm64-apple-darwin-unsigned.dmg 1658de08323b366f0f39e9ed02d68072ee3bef2db2252235e71d8fd206b4e609 guix-build-31ca698f2017/output/arm64-apple-darwin/bitcoin-31ca698f2017-arm64-apple-darwin-unsigned.tar.gz c4fdf8d5563bdfc0390dec7adce2a0608f8e5b8d0d82b648ef38aed8ab72d996 guix-build-31ca698f2017/output/arm64-apple-darwin/bitcoin-31ca698f2017-arm64-apple-darwin.tar.gz 709470d5d1a4a44022cd3e7b162c8cf6c492c6bb9996eb31f12a121351ad081f guix-build-31ca698f2017/output/dist-archive/bitcoin-31ca698f2017.tar.gz 6f809a8bdd10fc62143b5d265ea9c2eae37a1b18cf573d4a3743b2b026c0d038 guix-build-31ca698f2017/output/powerpc64-linux-gnu/SHA256SUMS.part ff2f87a29f7581d9ce1fccb8749f4473d03532de2194373de0fcdcd3bf0d380a guix-build-31ca698f2017/output/powerpc64-linux-gnu/bitcoin-31ca698f2017-powerpc64-linux-gnu-debug.tar.gz ab5ec4203ff59c0d4885f5df1c91191a03a3c104ed8ca0e98e19f531914cd2ad guix-build-31ca698f2017/output/powerpc64-linux-gnu/bitcoin-31ca698f2017-powerpc64-linux-gnu.tar.gz beb0ed7d9940718351301cb27dda1ae7891092c85664e2f9473e81c02479c951 guix-build-31ca698f2017/output/powerpc64le-linux-gnu/SHA256SUMS.part 286121e5698b726abbfc24d972c00d9f16f6d841fab245980a376a51e8dd85bc guix-build-31ca698f2017/output/powerpc64le-linux-gnu/bitcoin-31ca698f2017-powerpc64le-linux-gnu-debug.tar.gz 04a12dfe6a036477d212877f301ee425dcf063abf0fd892b8fbc0497ee5612fc guix-build-31ca698f2017/output/powerpc64le-linux-gnu/bitcoin-31ca698f2017-powerpc64le-linux-gnu.tar.gz d229041d43c40a49bbebcb5b0700c540456e058e0cb7be0d3ac414a80018e4f9 guix-build-31ca698f2017/output/riscv64-linux-gnu/SHA256SUMS.part 981268b93caaf1c450f1f3cec4d70efd2b4779e17917a4ab424447743628519e guix-build-31ca698f2017/output/riscv64-linux-gnu/bitcoin-31ca698f2017-riscv64-linux-gnu-debug.tar.gz acfef50476d9141ec29855216e60974d6307307a02784e7217942ee281d69c76 guix-build-31ca698f2017/output/riscv64-linux-gnu/bitcoin-31ca698f2017-riscv64-linux-gnu.tar.gz 5482b0c34069be1e40a96a173f984c67eb983860a4f5f4d9d927638caf72eed5 guix-build-31ca698f2017/output/x86_64-apple-darwin/SHA256SUMS.part fe4847edbc3ad1c747663a67f0daf2ed8b38818d1d1960617d85c851b0dded2f guix-build-31ca698f2017/output/x86_64-apple-darwin/bitcoin-31ca698f2017-x86_64-apple-darwin-unsigned.dmg 2b1899804035508f90eef57e1f068120509e7680877c8ae6cb5cb5beed84607c guix-build-31ca698f2017/output/x86_64-apple-darwin/bitcoin-31ca698f2017-x86_64-apple-darwin-unsigned.tar.gz 7a82ab62d1db4141b13ac566bc985eca5fa1da982be29427dd74f7098059932c guix-build-31ca698f2017/output/x86_64-apple-darwin/bitcoin-31ca698f2017-x86_64-apple-darwin.tar.gz 3e943a6e11930ac1dcd7339bcdfbcf310b09f03d1e2544fce314e656b3552b7a guix-build-31ca698f2017/output/x86_64-linux-gnu/SHA256SUMS.part 0e0155ce76ffe8af19a74ecb74b813ce7ca4817bf3535a2b5813ae9e229804dc guix-build-31ca698f2017/output/x86_64-linux-gnu/bitcoin-31ca698f2017-x86_64-linux-gnu-debug.tar.gz b66f9a25e963db98b3b8eed79e6d280d0ae7902d1f7e2cdee8481bacfc94ed96 guix-build-31ca698f2017/output/x86_64-linux-gnu/bitcoin-31ca698f2017-x86_64-linux-gnu.tar.gz bdc9cdd0ba739c3aba3d355f6e9ea88af99b09dd666cf40c7986212b355d2a09 guix-build-31ca698f2017/output/x86_64-w64-mingw32/SHA256SUMS.part 815d4b70b257932a3e32e14d8bb53960efd5e71500e7349ac53d13303f4b5335 guix-build-31ca698f2017/output/x86_64-w64-mingw32/bitcoin-31ca698f2017-win64-debug.zip 4b248df85b0b5de00631756839bc53e9e64c764b4da900afad34f871e2afe995 guix-build-31ca698f2017/output/x86_64-w64-mingw32/bitcoin-31ca698f2017-win64-setup-unsigned.exe b26008ed9fa0db1d32220087c2f0828788f0f9f784c981622f5e76c63c98fb9a guix-build-31ca698f2017/output/x86_64-w64-mingw32/bitcoin-31ca698f2017-win64-unsigned.tar.gz 4dd03a68ac2d742681d6b8c42b15e6f9d4ce46084ff18ebb0f1313109a867205 guix-build-31ca698f2017/output/x86_64-w64-mingw32/bitcoin-31ca698f2017-win64.zip ``` ACKs for top commit: jarolrod: ACK 31ca698 Tree-SHA512: 596c2979e070d3574c744ac89961ba157e9e01c2e1a3ce7d33cc369ad2cf1c2e16aa23209b382667dbd100545b5c17530771855b380eeb7345deebfa695a3be6

Summary: This is a minor Qt bump to drop a few patches. It also has some style changes. ---- [[bitcoin/bitcoin#24668 | core#24668]] > 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/fix_bigsur_style.patch > * adjusted patches: > - patches/qt/fix_limits_header.patch > > Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> > build, qt: drop fix_no_printer.patch > > The removed patch is not required since switching Qt version from > 5.12.11 to 5.15.2. > build, qt: use one patch per line in depends/packages/qt.mk ---- [[bitcoin/bitcoin#25719 | core#25719]] > build: Bump Qt to 5.15.5 in depends > qt: use patch over sed for guix CROSS_LIBRARY_PATH change ---- This is a backport of [[bitcoin/bitcoin#24668 | core#24668]] and [[bitcoin/bitcoin#25719 | core#25719]] Depends on D13918 Test Plan: gitian builds, guix build Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Subscribers: Fabien Differential Revision: https://reviews.bitcoinabc.org/D13926

backport: merge bitcoin#22402, bitcoin#23583, bitcoin#23618, bitcoin#17874, bitcoin#21286, bitcoin#23489, bitcoin#23675, bitcoin#24130, bitcoin#23556, bitcoin#23862, bitcoin#24722, bitcoin#24132, bitcoin#24668, bitcoin#25643, bitcoin#25719, partial bitcoin#22469, bitcoin#23677 (qt backports)

prusnak closed this Mar 25, 2022

hebasto mentioned this pull request Mar 25, 2022

build, qt: bump Qt5 version to 5.15.3 bitcoin-core/gui#570

Closed

prusnak reopened this Mar 25, 2022

prusnak mentioned this pull request Mar 25, 2022

RFC: Migrate from Qt5 to Qt6's Qt5 compat #20627

Closed

prusnak force-pushed the qt5-5.15.3 branch from 6e83307 to c959d29 Compare March 25, 2022 09:58

maflcko added the DrahtBot Guix build requested label Mar 25, 2022

hebasto reviewed Mar 25, 2022

View reviewed changes

depends/packages/qt.mk Outdated Show resolved Hide resolved

prusnak force-pushed the qt5-5.15.3 branch from c959d29 to 393acc4 Compare March 25, 2022 10:20

prusnak force-pushed the qt5-5.15.3 branch from 393acc4 to 9861633 Compare March 25, 2022 10:50

prusnak force-pushed the qt5-5.15.3 branch from 9861633 to d6042b5 Compare March 25, 2022 12:15

hebasto reviewed Mar 25, 2022

View reviewed changes

This was referenced Mar 26, 2022

doc: add more info to dependencies.md #24586

Merged

ci: Integrate ccache into MSVC build #24540

Merged

promag reviewed Mar 26, 2022

View reviewed changes

prusnak force-pushed the qt5-5.15.3 branch from d6042b5 to 7cbeee9 Compare March 26, 2022 11:50

hebasto mentioned this pull request Mar 26, 2022

build, qt: Drop fix_no_printer.patch #24684

Closed

fanquake approved these changes Apr 4, 2022

View reviewed changes

fanquake merged commit 52f0f7a into bitcoin:master Apr 4, 2022

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Apr 4, 2022

Merge bitcoin#24668: build, qt: bump Qt5 version to 5.15.3

75efc47

prusnak deleted the qt5-5.15.3 branch April 6, 2022 13:31

prusnak mentioned this pull request Apr 18, 2022

RFC: Replacing Boost Process #24907

Closed

hebasto mentioned this pull request Apr 21, 2022

Trivial: Update text spacing in modaloverlay.ui #24939

Closed

hebasto mentioned this pull request Aug 12, 2022

[23.x] GUI backports #25828

Merged

kwvg added a commit to kwvg/dash that referenced this pull request May 9, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

5929c67

kwvg added a commit to kwvg/dash that referenced this pull request May 9, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

e2e0609

kwvg added a commit to kwvg/dash that referenced this pull request May 31, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

a3affd8

kwvg added a commit to kwvg/dash that referenced this pull request Jun 8, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

0ea10d7

kwvg added a commit to kwvg/dash that referenced this pull request Jun 11, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

9510cc1

kwvg added a commit to kwvg/dash that referenced this pull request Jun 11, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

4d7ae54

kwvg added a commit to kwvg/dash that referenced this pull request Jun 19, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

1e7043f

kwvg added a commit to kwvg/dash that referenced this pull request Jun 20, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

7ce2c7c

kwvg added a commit to kwvg/dash that referenced this pull request Jun 29, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

15ef4b2

kwvg added a commit to kwvg/dash that referenced this pull request Jul 3, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

b03982d

kwvg added a commit to kwvg/dash that referenced this pull request Jul 3, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

423bd37

kwvg added a commit to kwvg/dash that referenced this pull request Jul 4, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

a3c8df0

kwvg added a commit to kwvg/dash that referenced this pull request Aug 2, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

f65fa48

kwvg added a commit to kwvg/dash that referenced this pull request Aug 2, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

1da4455

kwvg added a commit to kwvg/dash that referenced this pull request Aug 3, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

2b154c2

PastaPastaPasta pushed a commit to kwvg/dash that referenced this pull request Aug 8, 2023

merge bitcoin#24668: bump Qt5 version to 5.15.3

d121666

bitcoin locked and limited conversation to collaborators Aug 12, 2023

build, qt: bump Qt5 version to 5.15.3 #24668

build, qt: bump Qt5 version to 5.15.3 #24668

Uh oh!

Conversation

prusnak commented Mar 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto commented Mar 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto commented Mar 25, 2022

Uh oh!

prusnak commented Mar 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

hebasto commented Mar 25, 2022

Uh oh!

hebasto commented Mar 25, 2022

Uh oh!

hebasto commented Mar 25, 2022

Uh oh!

prusnak commented Mar 25, 2022

Uh oh!

hebasto left a comment

Choose a reason for hiding this comment

Uh oh!

hebasto commented Mar 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto commented Mar 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

prusnak commented Mar 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto commented Mar 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DrahtBot commented Mar 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Conflicts

Uh oh!

promag left a comment

Choose a reason for hiding this comment

Uh oh!

hebasto commented Mar 26, 2022

Uh oh!

prusnak commented Mar 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fanquake commented Apr 3, 2022

Uh oh!

fanquake left a comment

Choose a reason for hiding this comment

Uh oh!

hebasto commented Aug 12, 2022

Uh oh!

Uh oh!

prusnak commented Mar 25, 2022 •

edited

Loading

hebasto commented Mar 25, 2022 •

edited

Loading

prusnak commented Mar 25, 2022 •

edited

Loading

hebasto commented Mar 25, 2022 •

edited

Loading

hebasto commented Mar 25, 2022 •

edited

Loading

prusnak commented Mar 25, 2022 •

edited

Loading

hebasto commented Mar 25, 2022 •

edited

Loading

DrahtBot commented Mar 25, 2022 •

edited

Loading

prusnak commented Mar 26, 2022 •

edited

Loading