Skip to content

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented May 25, 2021

Qt 5.12.11:

  • fixes macOS related QTBUG-87014, and the fix_bigsur_drawing.patch (which is our workaround for QTBUG-87014) could be dropped
  • upgrades supported macOS SDK to 11.0, and removes related warnings
  • fixes tab widget rendering on macOS Big Sur (here and here):
    • master (5.12.10)
      DeepinScreenshot_select-area_20210525122725
      DeepinScreenshot_select-area_20210525123634
    • this PR (5.12.11)
      Screenshot from 2021-05-25 12-28-02

Closes bitcoin-core/gui#136.

@fanquake
Copy link
Member

has a fix for QTBUG-87014,

In what scenarios does this currently affect bitcoin-qt on macOS?

@hebasto
Copy link
Member Author

hebasto commented May 25, 2021

has a fix for QTBUG-87014,

In what scenarios does this currently affect bitcoin-qt on macOS?

Building with depends: bitcoin-core/gui#249

@fanquake
Copy link
Member

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.

@hebasto
Copy link
Member Author

hebasto commented May 25, 2021

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?

Dropping the patch is the only benefit. See #22054 (comment)

The way the PR description is written I assumed they were two separate things.

The PR description updated.

@hebasto
Copy link
Member Author

hebasto commented May 25, 2021

@fanquake

Besides dropping a patch, is there any other benefit to updating to 5.12.11?

More benefits added to the PR description.

@maflcko
Copy link
Member

maflcko commented May 25, 2021

Approach ACK

@DrahtBot
Copy link
Contributor

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

Conflicts

Reviewers, 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.

@hebasto
Copy link
Member Author

hebasto commented May 25, 2021

The bug in Android APK build is fixed #22063. Asking to review it first.

@fanquake
Copy link
Member

More benefits added to the PR description.

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.

Copy link
Contributor

@promag promag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK.

@DrahtBot
Copy link
Contributor

Gitian builds

File commit 3ad1b88
(master)
commit 1c401b0
(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz dcb3b951b80d3491... 1bdcba7c735a680f...
*-aarch64-linux-gnu.tar.gz e12761940fec40c9... 98f18b75d5baccb2...
*-arm-linux-gnueabihf-debug.tar.gz 4e71a66857857428... d36e7a66547b8387...
*-arm-linux-gnueabihf.tar.gz 5677dfa8ef8f2492... d288166b11547403...
*-osx-unsigned.dmg 52976497dbb78f7d... 5b0606c43c15195e...
*-osx64.tar.gz b1e9e36caf1b0ee9... 1410809a302d1074...
*-powerpc64-linux-gnu-debug.tar.gz 45daa055a823ffc0... f35bb6a4b9dd6f63...
*-powerpc64-linux-gnu.tar.gz 069abc80d1cd61b6... 65ca10a3cdecc93d...
*-powerpc64le-linux-gnu-debug.tar.gz 9364ff415c9d8bcc... 8523a0f9c70f4cd7...
*-powerpc64le-linux-gnu.tar.gz 8f451bd44cfd6185... 684c793dc5a9f4a0...
*-riscv64-linux-gnu-debug.tar.gz 2c4121c70d754cde... e6921c02bed351c8...
*-riscv64-linux-gnu.tar.gz ec3e66fc64b1b9d8... 2eb55328d6821ed9...
*-win64-debug.zip a29c022a5296c797... 382b45054068fc3b...
*-win64-setup-unsigned.exe f8024884a4cb6b8f... 254e119a5e5c33a5...
*-win64.zip a76f162d4e07ea4e... 109b22400f0c3ffa...
*-x86_64-linux-gnu-debug.tar.gz 1e7596a20e2ff933... cdc68dee0ab2e018...
*-x86_64-linux-gnu.tar.gz 7e34fd887663ae15... b17b31e9575a89dc...
*.tar.gz 7dd1468e0170748e... a3f114bc44f9368a...
bitcoin-core-linux-22-res.yml 31a04f3a89e3c588... 6fad94dfdf16b2a6...
bitcoin-core-osx-22-res.yml 551c2e1867e0dc75... 89f2d6b799871749...
bitcoin-core-win-22-res.yml 83396b90fe120baa... 47377c1c029f43ad...
linux-build.log e4eb643afff9d7cf... 5777ffd8e09e06ae...
osx-build.log 58ac8241588eb867... 04461e84d2139257...
win-build.log 2a35da12ab295fbe... 0730e3f7ab3ef676...
bitcoin-core-linux-22-res.yml.diff fbc3f6d4dfb23a3e...
bitcoin-core-osx-22-res.yml.diff 4bd8c4114fd6f092...
bitcoin-core-win-22-res.yml.diff a1f05a9a8f2db05b...
linux-build.log.diff 5cb879d06d6f4862...
osx-build.log.diff e09934c6d2afed08...
win-build.log.diff ce5614f947c95da0...

laanwj added a commit to bitcoin-core/gui that referenced this pull request May 27, 2021
…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
@hebasto
Copy link
Member Author

hebasto commented May 27, 2021

Rebased 987625c -> fa416ce (pr22054.01 -> pr22054.02) due to the merging of #22063.

@laanwj
Copy link
Member

laanwj commented May 27, 2021

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.

@hebasto
Copy link
Member Author

hebasto commented May 27, 2021

@laanwj

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.
Visual bugs could just upset macOS users of Bitcoin Core v22.0 for some months.

@hebasto
Copy link
Member Author

hebasto commented May 27, 2021

Guix builds:

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
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

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request May 27, 2021
… 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
@goums
Copy link
Contributor

goums commented May 27, 2021

ACK fa416ce
Tabs looks much more cleaner thanks to the patch on macOS dark mode.

Tested on macOs BigSur 11.2.3

Before this PR:
image

After this PR:
image

This minor update have visual bug fixes that touches macOS only. OTOH, the next Qt update will be 5.15.x or 6.x.
Visual bugs could just upset macOS users of Bitcoin Core v22.0 for some months.

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.

@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 1, 2021

Guix builds

File commit d7a6bba
(master)
commit d43a661
(master and this pull)
SKIPATTEST.TAG e3b0c44298fc1c14... e3b0c44298fc1c14...
*-aarch64-linux-gnu-debug.tar.gz 0fe208d25567bb28... 369d955d05a81ef1...
*-aarch64-linux-gnu.tar.gz 8c31f36f6a925dfa... 77a937530fe169e2...
*-arm-linux-gnueabihf-debug.tar.gz 8481ebe7acd4c323... 7e2e3cf6d05c428b...
*-arm-linux-gnueabihf.tar.gz 1f10a6bfea4b93e1... 0698ffb0af6acafc...
*-osx-unsigned.dmg b3e1e23200df5451... c108e9bb876712cc...
*-osx-unsigned.tar.gz 15f68bfa379122d5... cd5249f6b17984ea...
*-osx64.tar.gz 6e4f1e62d76f0df9... 0064f18d599a3b6d...
*-powerpc64-linux-gnu-debug.tar.gz b34dc960263cff87... 1c9a950f6014b7ca...
*-powerpc64-linux-gnu.tar.gz 41eb916829ea8d2d... e1f0b2de1fc0fd4c...
*-powerpc64le-linux-gnu-debug.tar.gz cf2a27e05f72b1e1... 73e10ba2d37d4c66...
*-powerpc64le-linux-gnu.tar.gz fcf47b6c039fb0bc... b30cf3ae7488966d...
*-riscv64-linux-gnu-debug.tar.gz d4322fdaaaa62aaa... 2fd47beea90dbb2c...
*-riscv64-linux-gnu.tar.gz 5fef77399fd1487b... 12745393e582a80b...
*-win-unsigned.tar.gz a41ffd4480d8a509... bacf79effe0c5089...
*-win64-debug.zip 14c8f586f6e815a6... 736e611121564c00...
*-win64-setup-unsigned.exe 61287ac076c5a160... a11212b6f8002a55...
*-win64.zip e07abffc678c5413... 580c770280af3d91...
*-x86_64-linux-gnu-debug.tar.gz fdc05eb84f7650b1... 8e81959aaf1a34bf...
*-x86_64-linux-gnu.tar.gz 240d116d48b32bd5... 6ff089a1ffab5c49...
*.tar.gz e3bc54e332c4fb09... 3bde02a43b5aa285...
guix_build.log 99badf98140d1b37... 1e9af33df3912dc5...
inputs.SHA256SUMS 1e3cd4d0dc62188c... dc6a9b0e3122231f...
guix_build.log.diff 6ae57e8ce7195bfc...

Copy link
Member

@fanquake fanquake left a 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

@fanquake fanquake merged commit a83bbf0 into bitcoin:master Jun 2, 2021
@hebasto hebasto deleted the 210525-bump branch June 2, 2021 08:08
barton2526 added a commit to barton2526/Gridcoin-Research that referenced this pull request Jun 2, 2021
Fixes a lot of bugs, including ones affecting upstream Bitcoin

Bigsur drawing patch no longer needed

Ref: bitcoin/bitcoin#22054
@hebasto
Copy link
Member Author

hebasto commented Jun 2, 2021

@sipsorcery

Is it worth to update https://github.com/sipsorcery/qt_win_binary release and our CI stuff?

@sipsorcery
Copy link
Contributor

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.

@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 3, 2021

Gitian builds

File commit 7e83e74
(master)
commit 00e2d8c
(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz 3657abadb1a2ab5c... ffda634d16a0e57e...
*-aarch64-linux-gnu.tar.gz 7fd67104fe882648... 91654bd9aa0dd423...
*-arm-linux-gnueabihf-debug.tar.gz e864f6fcb3711448... 80507b7b277c0811...
*-arm-linux-gnueabihf.tar.gz d54334cc945b689f... 38eb5de6d0b6aaf7...
*-osx-unsigned.dmg 4be7f425ad28df9d... c907cb18b412120e...
*-osx64.tar.gz a19c21a64d040323... c91e7af5eafb0773...
*-powerpc64-linux-gnu-debug.tar.gz 522f9e97292bd700... 4cbaf7925ce9deda...
*-powerpc64-linux-gnu.tar.gz b55c2053ec4adbd7... a01d1d6b53331445...
*-powerpc64le-linux-gnu-debug.tar.gz 247fbf4c9dd24a8a... 8f07735ef8c33585...
*-powerpc64le-linux-gnu.tar.gz f32e55973c5de857... 8a4bca9eaca7af00...
*-riscv64-linux-gnu-debug.tar.gz 3b86b27a2c23349a... ed96fdcb1317ce16...
*-riscv64-linux-gnu.tar.gz 9fa601963f7c4411... 005564fa663d2d7c...
*-win64-debug.zip eb8c5d461b0eeaee... 7d4ce9db58aa5888...
*-win64-setup-unsigned.exe 95a0057c8a431946... 78a2d8b2e72a7e6f...
*-win64.zip 94c351a21c99c7b0... 24a3c673d8041d34...
*-x86_64-linux-gnu-debug.tar.gz c268d72417c37b51... 4db8008046ea5874...
*-x86_64-linux-gnu.tar.gz fa102d164ebdb62b... 70cf2f363e19547f...
*.tar.gz 64b0afb9f6181440... c048d524de893f6c...
bitcoin-core-linux-22-res.yml 0d8bb6a1b6d3ce1c... 4510823b8b041cb4...
bitcoin-core-osx-22-res.yml c8069c3eb3032cc5... 09ca5437a91c418f...
bitcoin-core-win-22-res.yml 4c2fa3dd147e7647... 4eac580365fc887b...
linux-build.log 9359c8c34c2224dd... d8e45b4a8afdfe39...
osx-build.log 81ca2fbb8b66f3c0... 8069470ccc5f5ff8...
win-build.log eccf6426ec0a6d33... 4b1d3533652f400c...
bitcoin-core-linux-22-res.yml.diff a7463290fff8bc49...
bitcoin-core-osx-22-res.yml.diff b21fcae08ca08865...
bitcoin-core-win-22-res.yml.diff 0cddd56daafa2117...
linux-build.log.diff 07058261ffcbcc07...
osx-build.log.diff 0a10f69b332416b2...
win-build.log.diff 1e004af86353e7f8...

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jun 3, 2021
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
fanquake added a commit that referenced this pull request Jun 14, 2021
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
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jun 14, 2021
… 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
kwvg pushed a commit to kwvg/dash that referenced this pull request Apr 25, 2022
kwvg pushed a commit to kwvg/dash that referenced this pull request Apr 25, 2022
kwvg pushed a commit to kwvg/dash that referenced this pull request Apr 26, 2022
kwvg pushed a commit to kwvg/dash that referenced this pull request Apr 26, 2022
gwillen pushed a commit to ElementsProject/elements that referenced this pull request Jun 1, 2022
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

macOS 11 (Big Sur) visual bugs
8 participants