build, qt: Drop fix_no_printer.patch #24684

pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:220326-qtprint changing 2 files +1 −21

hebasto commented at 2:39 PM on March 26, 2022: member
The removed patch is not required since switching Qt version from 5.12.11 to 5.15.2.

Upstream bug reports and fixes:
- QTBUG-62675 fixed in https://github.com/qt/qtbase/commit/b1db1dd655788fb685949959c99c901515bfd8ab since Qt 5.12.5
- QTBUG-76941 fixed in https://github.com/qt/qtbase/commit/de8bd9ec6b21e3b43b08c4c2588b5116a7ca8ece since Qt 5.12.5
Although the bugs have been fixed since Qt 5.12.5, we did need the patch due to the https://github.com/qt/qtbase/commit/1e5566c2e98098b0f7d7628f62425eec569f3a34 reversal commit which has been introduced in Qt 5.12.7.

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.

a9a509b1da

hebasto commented at 2:43 PM on March 26, 2022: member

Due to adjacent modified lines of code, this PR conflicts with #24668. Would it better to combine the former into the latter?

cc @fanquake @prusnak
DrahtBot added the label Build system on Mar 26, 2022
prusnak commented at 5:31 PM on March 26, 2022: contributor

Would it better to combine the former into the latter?

I think it's better to rebase this PR on top of #24668 and keep the PRs separate. No strong preference, though.
prusnak cross-referenced this on Mar 27, 2022 from issue build, qt: drop fix_no_printer patch, add CVE fixes by prusnak
prusnak commented at 10:22 AM on March 27, 2022: contributor

I created a new PR #24688 which contains the commit from this PR + adds CVE fixes mentioned in #24668 (comment) @hebasto If you agree we can close this PR and focus on reviewing #24688 once #24668 is merged in.
fanquake commented at 10:34 AM on March 27, 2022: member

Due to adjacent modified lines of code, this PR conflicts with #24668. Would it better to combine the former into the latter?

Yes. There's no need for this to be a separate PR. If we're going to bump Qt again, then all these changes should be combined.
prusnak cross-referenced this on Mar 27, 2022 from issue build, qt: bump Qt5 version to 5.15.3 by prusnak
prusnak commented at 10:50 AM on March 27, 2022: contributor

Yes. There's no need for this to be a separate PR. If we're going to bump Qt again, then all these changes should be combined.

Okay. Cherry-picked the commit from this PR into #24668

This PR can be closed now.
fanquake closed this on Mar 27, 2022
hebasto deleted the branch on Apr 6, 2022
bitcoin locked this on Apr 6, 2023

Contributors

Labels

Linked (view graph)

#23489 build: Qt 5.15.2 #24668 build, qt: bump Qt5 version to 5.15.3 #24688 build, qt: drop fix_no_printer patch, add CVE fixes