Skip to content
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.

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

[poppler] Update to 22.09.0. #2

Merged
merged 1 commit into from Sep 7, 2022
Merged

Conversation

attah
Copy link
Contributor

@attah attah commented Aug 26, 2022

WIP: depends on jpeg_mem_src, and i have yet to figure out how to update in the sdk.
Minor freshening up of the Qt compat patch.

@attah attah marked this pull request as draft August 26, 2022 19:02
@vigejolla
Copy link
Member

WIP: depends on jpeg_mem_src, and i have yet to figure out how to update in the sdk.
Minor freshening up of the Qt compat patch.

Yeah, you should first get the jpeg_mem_src change in. And then I think you should change the BuildRequire to libjpeg-turbo-devel >= 2.1.0+git2, as this change depends on a change introduced there. It's unfortunate that pkgconfig versioning only goes to the "2.1.0" level. The "update in the sdk" part is easy, you just need to use shared output directory for both projects.

@pvuorela
Copy link
Contributor

pvuorela commented Sep 2, 2022

The patch seems to have accumulated some offset with the upstream. Would be nice if you recreated that. Apply to git and then export back to file. git format-patch with --no-numbered --zero-commit

@Thaodan
Copy link

Thaodan commented Sep 2, 2022 via email

@attah attah marked this pull request as ready for review September 2, 2022 17:09
@attah
Copy link
Contributor Author

attah commented Sep 2, 2022

Re-exported patch, added another to not build demos since they now use qt 5.7 stuff, and updated the version in spec.
Should there be a Requires for libjpeg-turbo too?
Installed and seems to work fine on my phone, but have not done any formal testing.

@Thaodan
Copy link

Thaodan commented Sep 2, 2022

Re-exported patch, added another to not build demos since they now use qt 5.7 stuff, and updated the version in spec. Should there be a Requires for libjpeg-turbo too? Installed and seems to work fine on my phone, but have not done any formal testing.

No never unless the dependency generator for your language isn't packaged. RPM will resolve any dependency.

rpm/poppler.spec Outdated Show resolved Hide resolved
@attah
Copy link
Contributor Author

attah commented Sep 5, 2022

And of course there has been a new release, with a fix for a pretty nasty CVE (FORCEDENTRY-related).
Would it be ok if i updated this PR to 22.09 even if that means mismatching the branch name? (Which i guess doesn't actually show, just influence what the suggested merge message is)
Or do you want a replacement PR, another PR on top, or just handle it from your end?

@pvuorela
Copy link
Contributor

pvuorela commented Sep 5, 2022

Just update this one, fine as long as the commit message matches the content.

@attah attah changed the title [poppler] Update to 22.08.0. [poppler] Update to 22.09.0. Sep 5, 2022
Copy link
Contributor

@pvuorela pvuorela left a comment

Choose a reason for hiding this comment

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

Looking good.

@pvuorela pvuorela merged commit 7f50cb4 into sailfishos:master Sep 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants