-
Notifications
You must be signed in to change notification settings - Fork 37.7k
depends: Bump Qt version to 5.12.11 #22054
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
In what scenarios does this currently affect bitcoin-qt on macOS? |
Building with depends: bitcoin-core/gui#249 |
Ok. So nothings currently broken, because we're patching it. Besides dropping a patch, is there any other benefit to updating to 5.12.11? The way the PR description is written I assumed they were two separate things. |
The PR description updated. |
More benefits added to the PR description. |
Approach ACK |
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. |
The bug in Android APK build is fixed #22063. Asking to review it first. |
Ok. Concept ACK if this is actually fixing something. Even if that something is just tab rendering in the GUI, for a single platform; which is probably about as low priority as it gets. Before, I didn't see the point in updating Qt just to skip applying a single patch. At least this PR had the side effect of turning up some issues in the CI. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Concept ACK.
…n as the compiled binaries cb7eba2 build: Use Qt archive of the same version as the compiled binaries (Hennadii Stepanov) Pull request description: This PR fixes broken Android APK build when the `depends/sources` directory contains Qt source archives of different versions (e.g., Qt version update [pull request](bitcoin/bitcoin#22054) in CI with the cached `depends/sources` directory). This is an alternative to #22058. ACKs for top commit: MarcoFalke: review ACK cb7eba2 laanwj: Code review ACK cb7eba2 Tree-SHA512: cf63a9809fba5cb13719d7e7bb5afc718a2cff5233b0670d30d30a0018d91278fcfc2a1b9ae8b84e8e3a52c95157bc465603cc754bb8a9d1a3d62415f01ad70f
Rebased 987625c -> fa416ce (pr22054.01 -> pr22054.02) due to the merging of #22063. |
No opinion on this specific one, but qt depends bumps are getting a bit frequent to my taste. I don't think we need to track every minor version. Maybe it's better to schedule a Qt update at some fixed time in the release cycle only unless there is a serious issue that makes it impossible to move forward otherwise. |
Agree with you in general. This minor update have visual bug fixes that touches macOS only. OTOH, the next Qt update will be 5.15.x or 6.x. |
Guix builds:
|
… compiled binaries cb7eba2 build: Use Qt archive of the same version as the compiled binaries (Hennadii Stepanov) Pull request description: This PR fixes broken Android APK build when the `depends/sources` directory contains Qt source archives of different versions (e.g., Qt version update [pull request](bitcoin#22054) in CI with the cached `depends/sources` directory). This is an alternative to bitcoin#22058. ACKs for top commit: MarcoFalke: review ACK cb7eba2 laanwj: Code review ACK cb7eba2 Tree-SHA512: cf63a9809fba5cb13719d7e7bb5afc718a2cff5233b0670d30d30a0018d91278fcfc2a1b9ae8b84e8e3a52c95157bc465603cc754bb8a9d1a3d62415f01ad70f
ACK fa416ce Tested on macOs BigSur 11.2.3
I agree with @hebasto comment, next major version bumb will probably take few more months, so it seems reasonable to include this version patch that fixes few UI glitches for macos users. |
Guix builds
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK fa416ce - merging this now to move it out of the way of other Qt related changes.
Guix Builds:
3b59d9a42f2e5645865b28fd3d5417a39cc80012b54d2b733646f93f01dcaa31 guix-build-fa416cea84d8/output/aarch64-linux-gnu/bitcoin-fa416cea84d8-aarch64-linux-gnu-debug.tar.gz
7808b42eb14718c52717ebb548b60e4c1a2fd98cffeae33aefde6b1224909e72 guix-build-fa416cea84d8/output/aarch64-linux-gnu/bitcoin-fa416cea84d8-aarch64-linux-gnu.tar.gz
b936ee58999b34c9420567e0a12d90b17860e8cc6168eab73a2eaeff21054be6 guix-build-fa416cea84d8/output/aarch64-linux-gnu/inputs.SHA256SUMS
77c90acb1aeb8f44a83f4a089b73fe53fb1130377a146d5451bed4a3e988be95 guix-build-fa416cea84d8/output/arm-linux-gnueabihf/bitcoin-fa416cea84d8-arm-linux-gnueabihf-debug.tar.gz
e84e24a1d50da81e67ff666442256ec1bc0acea1044667c96142d3beb0055674 guix-build-fa416cea84d8/output/arm-linux-gnueabihf/bitcoin-fa416cea84d8-arm-linux-gnueabihf.tar.gz
b936ee58999b34c9420567e0a12d90b17860e8cc6168eab73a2eaeff21054be6 guix-build-fa416cea84d8/output/arm-linux-gnueabihf/inputs.SHA256SUMS
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 guix-build-fa416cea84d8/output/dist-archive/SKIPATTEST.TAG
6703361a420b6a9f5598bf8ab3fa0240544a790091fd28bd5c6425749a739c87 guix-build-fa416cea84d8/output/dist-archive/bitcoin-fa416cea84d8.tar.gz
e8432275271d4b5313b572156b53961a39e2d448d55594092176e24b7b2ebd3a guix-build-fa416cea84d8/output/powerpc64-linux-gnu/bitcoin-fa416cea84d8-powerpc64-linux-gnu-debug.tar.gz
12cb420dab9ff62e391b3da40ba337b05d17d2a41e61221052697b5ee3d6907c guix-build-fa416cea84d8/output/powerpc64-linux-gnu/bitcoin-fa416cea84d8-powerpc64-linux-gnu.tar.gz
b936ee58999b34c9420567e0a12d90b17860e8cc6168eab73a2eaeff21054be6 guix-build-fa416cea84d8/output/powerpc64-linux-gnu/inputs.SHA256SUMS
cbd2b492735021697e23a0b6612176ea9b1d24ad21a84443882d5dace93d909e guix-build-fa416cea84d8/output/powerpc64le-linux-gnu/bitcoin-fa416cea84d8-powerpc64le-linux-gnu-debug.tar.gz
97a49bb3955baa61dd88b9dfea24018404a73aeba9bca48e4b6a539fc3e5c733 guix-build-fa416cea84d8/output/powerpc64le-linux-gnu/bitcoin-fa416cea84d8-powerpc64le-linux-gnu.tar.gz
b936ee58999b34c9420567e0a12d90b17860e8cc6168eab73a2eaeff21054be6 guix-build-fa416cea84d8/output/powerpc64le-linux-gnu/inputs.SHA256SUMS
7c73fc7dc28e0bc59e9908929c1e32ec41c44b80cf46d8eb3675a2057644f7c6 guix-build-fa416cea84d8/output/riscv64-linux-gnu/bitcoin-fa416cea84d8-riscv64-linux-gnu-debug.tar.gz
fc5cdc1ae5bcf657c6a98beeca0d0871d9b86dddb34a803c59f8c2cf45b3b44e guix-build-fa416cea84d8/output/riscv64-linux-gnu/bitcoin-fa416cea84d8-riscv64-linux-gnu.tar.gz
b936ee58999b34c9420567e0a12d90b17860e8cc6168eab73a2eaeff21054be6 guix-build-fa416cea84d8/output/riscv64-linux-gnu/inputs.SHA256SUMS
64dcedc5f1dbb22acf956ac4b248c7a72e66a15fecaa9f8dbab335ccb7f401ae guix-build-fa416cea84d8/output/x86_64-apple-darwin18/bitcoin-fa416cea84d8-osx-unsigned.dmg
f476e17c63be2cec30e86be9b37f6925570c82e1cb05092470b4174b8ca33a7a guix-build-fa416cea84d8/output/x86_64-apple-darwin18/bitcoin-fa416cea84d8-osx-unsigned.tar.gz
7e20c135840d033ad15426532a23244a6ac09b9625d47b43338624698db6b179 guix-build-fa416cea84d8/output/x86_64-apple-darwin18/bitcoin-fa416cea84d8-osx64.tar.gz
b936ee58999b34c9420567e0a12d90b17860e8cc6168eab73a2eaeff21054be6 guix-build-fa416cea84d8/output/x86_64-apple-darwin18/inputs.SHA256SUMS
c6508f46c99decf5152551d8cc605e1351b967e669edfebfa46b45b2796a7415 guix-build-fa416cea84d8/output/x86_64-linux-gnu/bitcoin-fa416cea84d8-x86_64-linux-gnu-debug.tar.gz
e58e6314a713f4c3c5c4546925a8e42db2211fff2d96ed31184290bed8b9f9a0 guix-build-fa416cea84d8/output/x86_64-linux-gnu/bitcoin-fa416cea84d8-x86_64-linux-gnu.tar.gz
b936ee58999b34c9420567e0a12d90b17860e8cc6168eab73a2eaeff21054be6 guix-build-fa416cea84d8/output/x86_64-linux-gnu/inputs.SHA256SUMS
c02e2fbc94b66178834de6efb9976adb5dd52c7cf9e19fedbe81fdc54e5c7396 guix-build-fa416cea84d8/output/x86_64-w64-mingw32/bitcoin-fa416cea84d8-win-unsigned.tar.gz
c756127af1ed03e40c642a283a80b9f3ce569a8ec1250cda0b5b023ae4276558 guix-build-fa416cea84d8/output/x86_64-w64-mingw32/bitcoin-fa416cea84d8-win64-debug.zip
1d99330da26f1521588ef27a1a7b7a627158f4a85bf137410084468771df8256 guix-build-fa416cea84d8/output/x86_64-w64-mingw32/bitcoin-fa416cea84d8-win64-setup-unsigned.exe
a0cc5f2f731f97b2e2fb27c8e739e8ebb5cea52b659b96d19eaf04c7b6fa6485 guix-build-fa416cea84d8/output/x86_64-w64-mingw32/bitcoin-fa416cea84d8-win64.zip
b936ee58999b34c9420567e0a12d90b17860e8cc6168eab73a2eaeff21054be6 guix-build-fa416cea84d8/output/x86_64-w64-mingw32/inputs.SHA256SUMS
Fixes a lot of bugs, including ones affecting upstream Bitcoin Bigsur drawing patch no longer needed Ref: bitcoin/bitcoin#22054
Is it worth to update https://github.com/sipsorcery/qt_win_binary release and our CI stuff? |
I'll get on it. Can take a little while though so I wouldn't hold up this PR or anything else for it. |
Gitian builds
|
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)   - this PR (5.12.11)  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
e25ea54 Update msvc and appveyor builds to use Qt5.12.11 binaries. (Aaron Clauson) Pull request description: Synchronises the Qt version used in the msvc and Appveyor builds with #22054. I needed to use switch to the `Visual Studio 2019 Preview` Appveyor image because the compiler version on the non-preview image is too far behind and I had difficulty building a compatible Qt version for it. Once the main Appveyor `Visual Studio 2019` image reaches version `16.10.1` it can be used. ACKs for top commit: hebasto: ACK e25ea54 Tree-SHA512: c5e8dcafa342df7cd8ff7c349a8186bee4cdf7fd748c5d94039e30698775058bae8099dd75a50a5079f3cbb5251e695be187bae615159e3cd45054a972c4e6bd
… binaries e25ea54 Update msvc and appveyor builds to use Qt5.12.11 binaries. (Aaron Clauson) Pull request description: Synchronises the Qt version used in the msvc and Appveyor builds with bitcoin#22054. I needed to use switch to the `Visual Studio 2019 Preview` Appveyor image because the compiler version on the non-preview image is too far behind and I had difficulty building a compatible Qt version for it. Once the main Appveyor `Visual Studio 2019` image reaches version `16.10.1` it can be used. ACKs for top commit: hebasto: ACK e25ea54 Tree-SHA512: c5e8dcafa342df7cd8ff7c349a8186bee4cdf7fd748c5d94039e30698775058bae8099dd75a50a5079f3cbb5251e695be187bae615159e3cd45054a972c4e6bd
Qt 5.12.11:
fix_bigsur_drawing.patch
(which is our workaround for QTBUG-87014) could be droppedCloses bitcoin-core/gui#136.