build: Bump Qt to 5.15.5 in depends#25719
Conversation
There was a problem hiding this comment.
Though this might be an improvement and one that is also needed, I would like to mention one thing regarding it.
Following the instructions in https://github.com/bitcoin-core/gui/blob/master/doc/build-unix.md#linux-distribution-specific-instructions to download the dependencies, a user is able to download Qt version 5.15.3.
Bumping up the required version would make installing dependencies non-trivial.
Edit:
Using packages being built with our own depends system is irrelevant to using packages being managed by user's OS, no?
I misinterpreted the change, and I stand corrected. Thanks, @hebasto, for the correction. I shall post the updated review soon.
|
Using packages being built with our own depends system is irrelevant to using packages being managed by user's OS, no? |
|
GUIX hashes x86: arm64: |
|
Are there any bug fixes / anything else interesting for us about this update other than removing a single patch from depends? I can't seem to find an actual changelog, other than https://code.qt.io/cgit/qt/qtbase.git/log/?h=v5.15.5-lts-lgpl. |
No, there are not. |
|
Want to pull in fanquake@c789bd7 ? |
Thanks! I've reviewed your commit, and cherry-picked it. |
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
fanquake
left a comment
There was a problem hiding this comment.
ACK fd0e8df
Guix Build (x86_64):
6e403f6442f904a17e00f2c5d539c38a6d736963deaca080aaf7e45911f32cd4 guix-build-fd0e8df67cae/output/aarch64-linux-gnu/SHA256SUMS.part
9faf7c7eba364848ab59f78d68a7ef74fc96c1d4b64c9132c8cdeaa3e90dd11c guix-build-fd0e8df67cae/output/aarch64-linux-gnu/bitcoin-fd0e8df67cae-aarch64-linux-gnu-debug.tar.gz
5a6a63c1e81f088db952ddd5184f673583cbce122de8a5714ba313064ac4536d guix-build-fd0e8df67cae/output/aarch64-linux-gnu/bitcoin-fd0e8df67cae-aarch64-linux-gnu.tar.gz
d1f0d94a0996d268a498fce2080a456544ccd60c263eb25c6bb335570ee0e181 guix-build-fd0e8df67cae/output/arm-linux-gnueabihf/SHA256SUMS.part
ec89d624ec30f0117e435ff31fe3431c15eb0ef2c31fc33f7a1c6b71d8af1166 guix-build-fd0e8df67cae/output/arm-linux-gnueabihf/bitcoin-fd0e8df67cae-arm-linux-gnueabihf-debug.tar.gz
71521ee2e382bb3b1e85db0e702cb3d91a6c713f290cb3835f6e6a6ff65de22b guix-build-fd0e8df67cae/output/arm-linux-gnueabihf/bitcoin-fd0e8df67cae-arm-linux-gnueabihf.tar.gz
e757341c8000cdc74b266217bd1bc3ec2fa4d0a53270cef4fe18182010dde213 guix-build-fd0e8df67cae/output/arm64-apple-darwin/SHA256SUMS.part
a361215f99ef2e10decc2c97ad5aea62e268554101cd34a75a28a0f8cc25bc4d guix-build-fd0e8df67cae/output/arm64-apple-darwin/bitcoin-fd0e8df67cae-arm64-apple-darwin-unsigned.dmg
81b91ab355544d247c2781bf2e323a70c27780665c3098d8ef01a59d291725f6 guix-build-fd0e8df67cae/output/arm64-apple-darwin/bitcoin-fd0e8df67cae-arm64-apple-darwin-unsigned.tar.gz
0b4e6ae2c66ecf49b2223d8d7fabd00765942ffeb4972fd699e4a9d13f176b6b guix-build-fd0e8df67cae/output/arm64-apple-darwin/bitcoin-fd0e8df67cae-arm64-apple-darwin.tar.gz
94f4a4a319a896c1ce37980fdac0c6bf9b62e2a8ca46476a10895a4fd8d0403f guix-build-fd0e8df67cae/output/dist-archive/bitcoin-fd0e8df67cae.tar.gz
cf963b63fabc7e832b9469c9c048b08dcee344cb2044e7930bca53dfdc18c3dd guix-build-fd0e8df67cae/output/powerpc64-linux-gnu/SHA256SUMS.part
50ac40337bed023900ecf1bd3f557276dba8d97cd613f9342e0f7a72e4c7e6f1 guix-build-fd0e8df67cae/output/powerpc64-linux-gnu/bitcoin-fd0e8df67cae-powerpc64-linux-gnu-debug.tar.gz
6884eba5928b831434ae9a1e5c2945185d1e6f013537aac0a05ae9775ab1df7d guix-build-fd0e8df67cae/output/powerpc64-linux-gnu/bitcoin-fd0e8df67cae-powerpc64-linux-gnu.tar.gz
ad502cdbf072a3875f4cbf653e9b5593c5f5324edc0e38100234a9778a73cc09 guix-build-fd0e8df67cae/output/powerpc64le-linux-gnu/SHA256SUMS.part
e426a8f45095bc6019612a58f60267f6b084e3c273ec70509a0a8759e90e68d2 guix-build-fd0e8df67cae/output/powerpc64le-linux-gnu/bitcoin-fd0e8df67cae-powerpc64le-linux-gnu-debug.tar.gz
a68ec3ba7e63382dc44f99806badc62e660dd3ae2d9d74d48e7e8378fd5c03f4 guix-build-fd0e8df67cae/output/powerpc64le-linux-gnu/bitcoin-fd0e8df67cae-powerpc64le-linux-gnu.tar.gz
67d0bf587538fb151aa867363ab7724543607adda2b8be7dffbc263959e02f67 guix-build-fd0e8df67cae/output/riscv64-linux-gnu/SHA256SUMS.part
093c874104e8f8c7bd73c362be471aba6d0c25828c22b2a8324056d516849242 guix-build-fd0e8df67cae/output/riscv64-linux-gnu/bitcoin-fd0e8df67cae-riscv64-linux-gnu-debug.tar.gz
82b03ba2283a8667ea3c3fa86a5f64be7c7a4c0423b92bd8f3dfe71a78c3b210 guix-build-fd0e8df67cae/output/riscv64-linux-gnu/bitcoin-fd0e8df67cae-riscv64-linux-gnu.tar.gz
5a30433c33322b9deabe4d6fc655f6dd9e6e73f2ae09b01502ce1a9377e1ce16 guix-build-fd0e8df67cae/output/x86_64-apple-darwin/SHA256SUMS.part
473a3df8d63a112ca3e76620a56f6a5781b74c594451c86c26ccfef63cc2b023 guix-build-fd0e8df67cae/output/x86_64-apple-darwin/bitcoin-fd0e8df67cae-x86_64-apple-darwin-unsigned.dmg
fa0eb43787745d6973ceb880003acf9f5be6e14c5c310bcc359a05cb52dd20a8 guix-build-fd0e8df67cae/output/x86_64-apple-darwin/bitcoin-fd0e8df67cae-x86_64-apple-darwin-unsigned.tar.gz
90ccac950577f15e5dc729e9f94bff39fa0a9f0a96a27eee249df15a604eec44 guix-build-fd0e8df67cae/output/x86_64-apple-darwin/bitcoin-fd0e8df67cae-x86_64-apple-darwin.tar.gz
fffda44e37d74908fcb5974a7c290d4e36d457605824f5d3f79b15e4eae5c1e7 guix-build-fd0e8df67cae/output/x86_64-linux-gnu/SHA256SUMS.part
7d807b88d20a759236013fec99d8b16240dc064a0a5a6eb5d51ba02af467d959 guix-build-fd0e8df67cae/output/x86_64-linux-gnu/bitcoin-fd0e8df67cae-x86_64-linux-gnu-debug.tar.gz
8141de0e3aa4174dea1e1cc3ee6344e857650fdd3180e7a4e8359f84733933fe guix-build-fd0e8df67cae/output/x86_64-linux-gnu/bitcoin-fd0e8df67cae-x86_64-linux-gnu.tar.gz
653b6c61d4ab5c5dcb8f36aefb518dc14d7fcf9f7d684a521c7705cbda9ff2fe guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/SHA256SUMS.part
999dc6af5a7262c579be1c9904c1ac2deff0617a48d89d60902de5ba9e3684e6 guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/bitcoin-fd0e8df67cae-win64-debug.zip
03a90e2d6191b6ab84ffb38f845e0565ecf34b5d3b34b7fc36edc99e1feef347 guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/bitcoin-fd0e8df67cae-win64-setup-unsigned.exe
6866e0ba9bd4da9487b679f3216cde3d6d455ca074f22de05552b6faf6a6cfca guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/bitcoin-fd0e8df67cae-win64-unsigned.tar.gz
208d38d00b4a96fb34b558e221f05d08efa078a0d143a2bb2f63fa201c64f29d guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/bitcoin-fd0e8df67cae-win64.zipGuix Build (arm64):
d1f0d94a0996d268a498fce2080a456544ccd60c263eb25c6bb335570ee0e181 guix-build-fd0e8df67cae/output/arm-linux-gnueabihf/SHA256SUMS.part
ec89d624ec30f0117e435ff31fe3431c15eb0ef2c31fc33f7a1c6b71d8af1166 guix-build-fd0e8df67cae/output/arm-linux-gnueabihf/bitcoin-fd0e8df67cae-arm-linux-gnueabihf-debug.tar.gz
71521ee2e382bb3b1e85db0e702cb3d91a6c713f290cb3835f6e6a6ff65de22b guix-build-fd0e8df67cae/output/arm-linux-gnueabihf/bitcoin-fd0e8df67cae-arm-linux-gnueabihf.tar.gz
2f5ffcca848a85322c600f007b1b7729bf87f0025a2e39e8fb1f05e0670f66f8 guix-build-fd0e8df67cae/output/arm64-apple-darwin/SHA256SUMS.part
034998a6f4f0d7c2321bf70c63ef7b3c5d7f7442612b70f715b686d7bb0c9da0 guix-build-fd0e8df67cae/output/arm64-apple-darwin/bitcoin-fd0e8df67cae-arm64-apple-darwin-unsigned.dmg
ef3bf5d938e9c9556c910a313436d28b0476de69da7f4a9e0ca17d1d85ddeff2 guix-build-fd0e8df67cae/output/arm64-apple-darwin/bitcoin-fd0e8df67cae-arm64-apple-darwin-unsigned.tar.gz
64512719b4708d5fcd359062e78ef4962dcaab70c4f66066e00631c96d25dd32 guix-build-fd0e8df67cae/output/arm64-apple-darwin/bitcoin-fd0e8df67cae-arm64-apple-darwin.tar.gz
94f4a4a319a896c1ce37980fdac0c6bf9b62e2a8ca46476a10895a4fd8d0403f guix-build-fd0e8df67cae/output/dist-archive/bitcoin-fd0e8df67cae.tar.gz
cf963b63fabc7e832b9469c9c048b08dcee344cb2044e7930bca53dfdc18c3dd guix-build-fd0e8df67cae/output/powerpc64-linux-gnu/SHA256SUMS.part
50ac40337bed023900ecf1bd3f557276dba8d97cd613f9342e0f7a72e4c7e6f1 guix-build-fd0e8df67cae/output/powerpc64-linux-gnu/bitcoin-fd0e8df67cae-powerpc64-linux-gnu-debug.tar.gz
6884eba5928b831434ae9a1e5c2945185d1e6f013537aac0a05ae9775ab1df7d guix-build-fd0e8df67cae/output/powerpc64-linux-gnu/bitcoin-fd0e8df67cae-powerpc64-linux-gnu.tar.gz
ad502cdbf072a3875f4cbf653e9b5593c5f5324edc0e38100234a9778a73cc09 guix-build-fd0e8df67cae/output/powerpc64le-linux-gnu/SHA256SUMS.part
e426a8f45095bc6019612a58f60267f6b084e3c273ec70509a0a8759e90e68d2 guix-build-fd0e8df67cae/output/powerpc64le-linux-gnu/bitcoin-fd0e8df67cae-powerpc64le-linux-gnu-debug.tar.gz
a68ec3ba7e63382dc44f99806badc62e660dd3ae2d9d74d48e7e8378fd5c03f4 guix-build-fd0e8df67cae/output/powerpc64le-linux-gnu/bitcoin-fd0e8df67cae-powerpc64le-linux-gnu.tar.gz
67d0bf587538fb151aa867363ab7724543607adda2b8be7dffbc263959e02f67 guix-build-fd0e8df67cae/output/riscv64-linux-gnu/SHA256SUMS.part
093c874104e8f8c7bd73c362be471aba6d0c25828c22b2a8324056d516849242 guix-build-fd0e8df67cae/output/riscv64-linux-gnu/bitcoin-fd0e8df67cae-riscv64-linux-gnu-debug.tar.gz
82b03ba2283a8667ea3c3fa86a5f64be7c7a4c0423b92bd8f3dfe71a78c3b210 guix-build-fd0e8df67cae/output/riscv64-linux-gnu/bitcoin-fd0e8df67cae-riscv64-linux-gnu.tar.gz
5a30433c33322b9deabe4d6fc655f6dd9e6e73f2ae09b01502ce1a9377e1ce16 guix-build-fd0e8df67cae/output/x86_64-apple-darwin/SHA256SUMS.part
473a3df8d63a112ca3e76620a56f6a5781b74c594451c86c26ccfef63cc2b023 guix-build-fd0e8df67cae/output/x86_64-apple-darwin/bitcoin-fd0e8df67cae-x86_64-apple-darwin-unsigned.dmg
fa0eb43787745d6973ceb880003acf9f5be6e14c5c310bcc359a05cb52dd20a8 guix-build-fd0e8df67cae/output/x86_64-apple-darwin/bitcoin-fd0e8df67cae-x86_64-apple-darwin-unsigned.tar.gz
90ccac950577f15e5dc729e9f94bff39fa0a9f0a96a27eee249df15a604eec44 guix-build-fd0e8df67cae/output/x86_64-apple-darwin/bitcoin-fd0e8df67cae-x86_64-apple-darwin.tar.gz
fffda44e37d74908fcb5974a7c290d4e36d457605824f5d3f79b15e4eae5c1e7 guix-build-fd0e8df67cae/output/x86_64-linux-gnu/SHA256SUMS.part
7d807b88d20a759236013fec99d8b16240dc064a0a5a6eb5d51ba02af467d959 guix-build-fd0e8df67cae/output/x86_64-linux-gnu/bitcoin-fd0e8df67cae-x86_64-linux-gnu-debug.tar.gz
8141de0e3aa4174dea1e1cc3ee6344e857650fdd3180e7a4e8359f84733933fe guix-build-fd0e8df67cae/output/x86_64-linux-gnu/bitcoin-fd0e8df67cae-x86_64-linux-gnu.tar.gz
653b6c61d4ab5c5dcb8f36aefb518dc14d7fcf9f7d684a521c7705cbda9ff2fe guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/SHA256SUMS.part
999dc6af5a7262c579be1c9904c1ac2deff0617a48d89d60902de5ba9e3684e6 guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/bitcoin-fd0e8df67cae-win64-debug.zip
03a90e2d6191b6ab84ffb38f845e0565ecf34b5d3b34b7fc36edc99e1feef347 guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/bitcoin-fd0e8df67cae-win64-setup-unsigned.exe
6866e0ba9bd4da9487b679f3216cde3d6d455ca074f22de05552b6faf6a6cfca guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/bitcoin-fd0e8df67cae-win64-unsigned.tar.gz
208d38d00b4a96fb34b558e221f05d08efa078a0d143a2bb2f63fa201c64f29d guix-build-fd0e8df67cae/output/x86_64-w64-mingw32/bitcoin-fd0e8df67cae-win64.zipSummary: 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 <[email protected]> > 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
Bumping Qt patch version allows to drop the
fix_limits_header.patch.Guix builds on
x86_64: