build: Clean remnants of QTBUG-34748 fix #21382

pull hebasto wants to merge 2 commits into bitcoin:master from hebasto:210307-libxcb changing 1 files +3 −8

hebasto commented at 9:40 PM on March 7, 2021: member

Hope, this PR will make transit to Qt 5.12.10 neater.

A fix for QTBUG-34748 was introduced in #5915 (v0.11.0, Qt 5.2.1).

QTBUG-34748 was fixed in Qt 5.3.0.

The separated fix-xcb-include-order.patch, provided by #5915, was dropped in #12971 while bumping Qt to 5.9.4 (5.9.6). But libxcb.mk remained unchanged.

This PR reverts #5915 for libxcb.mk as well.

build: Clean remnants of QTBUG-34748 fix

A fix for QTBUG-34748 was introduced in #5915 (v0.11.0, Qt 5.2.1).
QTBUG-34748 was fixed in version 5.3.0.
The separated patch file, provided by #5915, was dropped in #12971 while
bumping Qt to 5.9.4 (5.9.6). But libxcb.mk remained unchanged.

This change reverts #5915 for libxcb.mk.

5129b36573

build: Small libxcb.mk improvements 173ef8980d
hebasto commented at 9:41 PM on March 7, 2021: member

cc @fanquake
hebasto added the label Build system on Mar 7, 2021
fanquake commented at 11:00 PM on March 7, 2021: member

This is already included in #21376?
hebasto commented at 11:31 PM on March 7, 2021: member

This is already included in #21376?

Yes. In #21376 the change in libxcb.mk looks like it is motivated by Qt version bumping to 5.12. But, actually, it is not related to Qt 5.12.

If this justification seems wrong, feel free to close this PR.
MarcoFalke added the label Needs Guix build on Mar 8, 2021
MarcoFalke added the label Needs gitian build on Mar 8, 2021
practicalswift commented at 5:47 PM on March 8, 2021: contributor

cr ACK 173ef8980d921c9c0e46257747ab1165965e3ced: patch looks correct
fanquake commented at 7:46 AM on March 9, 2021: member

ACK 173ef8980d921c9c0e46257747ab1165965e3ced

Yes. In #21376 the change in libxcb.mk looks like it is motivated by Qt version bumping to 5.12. But, actually, it is not related to Qt 5.12.

I'm not sure that matters too much. However given you've split this out, and some additional background information is useful, I'm just going to merge this, and then we can finish up in #21376.
fanquake merged this on Mar 9, 2021
fanquake closed this on Mar 9, 2021
MarcoFalke removed the label Needs Guix build on Mar 9, 2021
MarcoFalke removed the label Needs gitian build on Mar 9, 2021
sidhujag referenced this in commit dac2f3078e on Mar 9, 2021

DrahtBot commented at 2:01 PM on March 10, 2021: member

Guix builds

File	commit a8b0892b743bf5b0bd7192f801fbc6144320052b<br>(master)	commit 6205a4ec936ccd76b5f6248d6bfcc5bb8e2f1878<br>(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`d042ad72ffe3ed1b...`	`aa65e7171d9493a4...`
*-aarch64-linux-gnu.tar.gz	`d8a52eabebb94282...`	`a66a6851d216dc5f...`
*-arm-linux-gnueabihf-debug.tar.gz	`59c7ea20f11121f4...`	`81d21305639b48a3...`
*-arm-linux-gnueabihf.tar.gz	`284cacf916382492...`	`df6cf4ad40de4fa3...`
*-osx-unsigned.dmg	`10ace65b43be7bad...`	`6776770adcaf3a31...`
*-osx-unsigned.tar.gz	`cb901dfb26e992d8...`	`8f1f4fe157419d3f...`
*-osx64.tar.gz	`8dff7c6d76d400fb...`	`a85a9641ae6ba485...`
*-powerpc64-linux-gnu-debug.tar.gz	`bb1f82dd44a3a4a4...`	`0247814bd3253359...`
*-powerpc64-linux-gnu.tar.gz	`841d0bbf31eed26b...`	`38257a7182bc6a4c...`
*-powerpc64le-linux-gnu-debug.tar.gz	`00a128f71ebda19d...`	`b9a507639de4b7d3...`
*-powerpc64le-linux-gnu.tar.gz	`a06b5776a6af1dc3...`	`80c323e11f884431...`
*-riscv64-linux-gnu-debug.tar.gz	`e74c8ff655007ff9...`	`60dc045a216848ee...`
*-riscv64-linux-gnu.tar.gz	`1208435db74262f0...`	`9a29a29858c9be1b...`
*-win-unsigned.tar.gz	`7b130377d7c1f36c...`	`4503781e4e3bb11d...`
*-win64-debug.zip	`9d29091b7ff22edc...`	`ffbcd514ad82fde4...`
*-win64-setup-unsigned.exe	`fd309203d285e1fc...`	`45c3f43bfe0f8b88...`
*-win64.zip	`e482fd1b54e7eeae...`	`5f4cc7f9ccf42c13...`
*-x86_64-linux-gnu-debug.tar.gz	`cfc34dd53262d3e2...`	`a30e7e57b47cbd37...`
*-x86_64-linux-gnu.tar.gz	`3152414c79958481...`	`54e1242047bc8a53...`
*.tar.gz	`39d01316d4974a34...`	`1467834efa1cbf58...`
guix_build.log	`77536efe7776fffa...`	`5d47008053925530...`
guix_build.log.diff		`2dad2faa53a46848...`

barton2526 referenced this in commit 7a5b5d3168 on Jul 12, 2021
PastaPastaPasta referenced this in commit b4f486698a on Jun 19, 2022
PastaPastaPasta referenced this in commit 939b1e654c on Jun 19, 2022
DrahtBot locked this on Aug 16, 2022

Contributors

Labels

Linked (view graph)

#5915 fix a static qt5 crash when using certain versions of libxcb #12971 depends: Upgrade Qt to 5.9.6 #21376 depends: Qt 5.12.10