depends: Drop workaround for a fixed bug in Qt build system #20650

pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:201214-xcb changing 1 files +1 −4

hebasto commented at 12:22 pm on December 14, 2020: member
This PR drops workaround that was introduced for Qt 5.2.1 for a bug in Qt build system that has been fixed in Qt 5.3.0.

The bug reports:
- https://bugreports.qt.io/browse/QTBUG-35444
- https://bugreports.qt.io/browse/QTBUG-32519
I’ve noted this change is a part of the #19716, but I think that a separate commit with the documented reason will benefit it.

depends: Drop workaround for a fixed bug in Qt build system

The bug reports:
 - https://bugreports.qt.io/browse/QTBUG-35444
 - https://bugreports.qt.io/browse/QTBUG-32519
Fixed in Qt 5.3.0 (the workaround was introduced for Qt 5.2.1).

267f259c0d

fanquake added the label Build system on Dec 14, 2020
MarcoFalke added the label Needs gitian build on Dec 14, 2020
MarcoFalke added the label Needs Guix build on Dec 14, 2020
laanwj commented at 3:46 pm on December 14, 2020: member

Code review ACK 267f259c0dfbd348340d49e9a89b8684b994e22a
DrahtBot commented at 8:09 pm on December 14, 2020: member
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:
- #20600 (Depends : Qt Use Top-Level Structure by BlockMechanic)
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.

DrahtBot commented at 8:05 am on December 16, 2020: member

Guix builds

File	commit 94a9cd25fd17e10b5720b5f72908b08c0f1ed16d(master)	commit 1f0bf437eaa4c9aeffc96ae4623c07369a184ab5(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`89c17295d910bb25...`	`88d5750f70230ed0...`
*-aarch64-linux-gnu.tar.gz	`202378cbb2168a07...`	`9bc95e2add9d1684...`
*-arm-linux-gnueabihf-debug.tar.gz	`932db3c2a709d18b...`	`7331930025713dfd...`
*-arm-linux-gnueabihf.tar.gz	`87aacb27f87b0246...`	`e1220e8fec7c1f40...`
*-riscv64-linux-gnu-debug.tar.gz	`cfeca8627533c71e...`	`4132df6549e1c842...`
*-riscv64-linux-gnu.tar.gz	`a6ef0f5832513fa4...`	`21583e79c2e08c1f...`
*-win-unsigned.tar.gz	`06be849fe083e0a7...`	`aa9c706885f1afeb...`
*-win64-debug.zip	`6e46a09f985f933f...`	`b0a9f652f79b2596...`
*-win64-setup-unsigned.exe	`2166b27b624a3da6...`	`ec5495dbd5e8c0fa...`
*-win64.zip	`ed85e4c939760385...`	`f93ae39bef4f5f5c...`
*-x86_64-linux-gnu-debug.tar.gz	`e0520dcb8d2aadda...`	`82eb2a85915dbfd8...`
*-x86_64-linux-gnu.tar.gz	`bb73333d3a4265d5...`	`67b01faa3d5ec808...`
*.tar.gz	`9871799aa8fb889a...`	`03c4fb9a9f247c93...`
guix_build.log	`5c16e3c9fcc8c375...`	`4f9f826bb746ab6d...`
guix_build.log.diff		`37eef82fa4a84e94...`

DrahtBot removed the label Needs Guix build on Dec 16, 2020
jonasschnelli commented at 9:09 am on December 16, 2020: contributor

Alway nice to get rid of unused old code. code Review ACK 267f259c0dfbd348340d49e9a89b8684b994e22a
practicalswift commented at 11:42 am on December 16, 2020: contributor

cr ACK 267f259c0dfbd348340d49e9a89b8684b994e22a: patch looks correct
jonasschnelli merged this on Dec 16, 2020
jonasschnelli closed this on Dec 16, 2020
MarcoFalke removed the label Needs gitian build on Dec 16, 2020
hebasto deleted the branch on Dec 16, 2020

DrahtBot commented at 4:57 am on December 17, 2020: member

Gitian builds

File	commit dff0f6f753eafd932d7d65fbfa33585f620e8e54(master)	commit 0daf9de207fae14ff26a6c5f114d6c5bd43c748c(master and this pull)
bitcoin-core-linux-22-res.yml	`1ec2e8fe7fc2ae69...`	`3b6b13c6b4d876d7...`
bitcoin-core-osx-22-res.yml	`99357ca676a285c0...`	`cf5edc90609f7ec1...`
bitcoin-core-win-22-res.yml	`70a40e1a4984083b...`	`b2d312c02575a535...`
*-aarch64-linux-gnu-debug.tar.gz	`f15fe54443ba33fe...`	`aad08fe1c5dafd9b...`
*-aarch64-linux-gnu.tar.gz	`45d5c20a29d94226...`	`769dd85b4525b98e...`
*-arm-linux-gnueabihf-debug.tar.gz	`ed092971fb17838d...`	`5b622a4f56977f2d...`
*-arm-linux-gnueabihf.tar.gz	`98ae8f5373ec7d30...`	`def9efd69712e1c5...`
*-osx-unsigned.dmg	`b7b6fe7c0cba4a31...`	`01152bf1288f7f6d...`
*-osx64.tar.gz	`98f8e76fab8d721e...`	`763c460b4d1d41fd...`
*-riscv64-linux-gnu-debug.tar.gz	`a85a4e546bebc6db...`	`c813cf399d8d3eee...`
*-riscv64-linux-gnu.tar.gz	`095363569a63fa7b...`	`008a460f757ff526...`
*-win64-debug.zip	`b91f903bd9421573...`	`8ac4a06c3686dcbe...`
*-win64-setup-unsigned.exe	`87cd91afed32a73b...`	`a6305fbe0769f547...`
*-win64.zip	`f8fdca57e303afc2...`	`39a4af9d15006b14...`
*-x86_64-linux-gnu-debug.tar.gz	`3d969cf6944b71fd...`	`6686e288379cd86f...`
*-x86_64-linux-gnu.tar.gz	`bd52623e2e5ccf9d...`	`c0335d5a015ace67...`
*.tar.gz	`0194a864927344fc...`	`9df40a7695cd9ba8...`
linux-build.log	`924062ab590235d6...`	`33caee27f1843266...`
osx-build.log	`ff649e6bf3875008...`	`2101e2cd53c0ed1b...`
win-build.log	`be3973fbe2b63dfc...`	`7c391184ce287bae...`
bitcoin-core-linux-22-res.yml.diff		`ce78e0d8bbb93138...`
bitcoin-core-osx-22-res.yml.diff		`e89683f24036f5f3...`
bitcoin-core-win-22-res.yml.diff		`60de572bd64b06be...`
linux-build.log.diff		`16cd84786390640c...`
osx-build.log.diff		`ad9c7e1eb2e4265b...`
win-build.log.diff		`64f5bade31f18dbc...`

sidhujag referenced this in commit 84a25b80a1 on Dec 17, 2020
PastaPastaPasta referenced this in commit ead70ab6bc on Jun 27, 2021
PastaPastaPasta referenced this in commit 315944200a on Jun 28, 2021
PastaPastaPasta referenced this in commit f926ca7a02 on Jun 29, 2021
PastaPastaPasta referenced this in commit 060c575fee on Jul 1, 2021
PastaPastaPasta referenced this in commit 9403294d90 on Jul 1, 2021
PastaPastaPasta referenced this in commit 6b23c26640 on Jul 15, 2021
PastaPastaPasta referenced this in commit 0fba9a3ecd on Jul 16, 2021
DrahtBot locked this on Feb 15, 2022

Contributors
hebasto laanwj DrahtBot jonasschnelli practicalswift

Labels
Build system

depends: Drop workaround for a fixed bug in Qt build system #20650

Conflicts

Guix builds

Gitian builds