Skip to content

build, qt: Drop fix_no_printer.patch #24684

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.

Sign up for GitHub

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

Jump to bottom
Closed
hebasto wants to merge 1 commit into from
Closed

build, qt: Drop fix_no_printer.patch #24684

hebasto wants to merge 1 commit into from

Conversation

@hebasto
Copy link
Member

@hebasto hebasto commented Mar 26, 2022

The removed patch is not required since switching Qt version from 5.12.11 to 5.15.2.

Upstream bug reports and fixes:

Although the bugs have been fixed since Qt 5.12.5, we did need the patch due to the qt/qtbase@1e5566c reversal commit which has been introduced in Qt 5.12.7.

@hebasto
build, qt: Drop fix_no_printer.patch
a9a509b 
The removed patch is not required since switching Qt version from
5.12.11 to 5.15.2.
@hebasto
Copy link
Member Author

hebasto commented Mar 26, 2022

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

@prusnak
Copy link
Contributor

prusnak commented Mar 26, 2022

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 prusnak mentioned this pull request Mar 27, 2022
Closed
@prusnak
Copy link
Contributor

prusnak commented Mar 27, 2022 •
edited
Loading

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
Copy link
Member

fanquake commented Mar 27, 2022

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 prusnak mentioned this pull request Mar 27, 2022
Merged
@prusnak
Copy link
Contributor

prusnak commented Mar 27, 2022 •
edited
Loading

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 fanquake closed this Mar 27, 2022
@hebasto hebasto deleted the 220326-qtprint branch April 6, 2022 07:35
@bitcoin bitcoin locked and limited conversation to collaborators Apr 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

Build system

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@hebasto @prusnak @fanquake @DrahtBot