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

Vendor PyMuPDF #940

Merged
merged 7 commits into from
Oct 15, 2024
Merged

Vendor PyMuPDF #940

merged 7 commits into from
Oct 15, 2024

Conversation

apyrgio
Copy link
Contributor

@apyrgio apyrgio commented Oct 7, 2024

This PR allows our build scripts to:

Refs #625

@apyrgio apyrgio force-pushed the 2024-09-vendor-pymupdf branch from 5f0d4ca to 7a5ce3d Compare October 7, 2024 14:46
dangerzone/__init__.py Outdated Show resolved Hide resolved
install/linux/vendor-pymupdf.py Outdated Show resolved Hide resolved
dangerzone/__init__.py Outdated Show resolved Hide resolved
debian/rules Outdated Show resolved Hide resolved
install/linux/vendor-pymupdf.py Outdated Show resolved Hide resolved
install/linux/vendor-pymupdf.py Outdated Show resolved Hide resolved
@apyrgio apyrgio force-pushed the 2024-09-vendor-pymupdf branch from 09f00d9 to 6fd0f92 Compare October 8, 2024 10:34
The PyMuPDF wheels for version 1.24.11 have changed the way they are
being built, which means we have to adapt our Dockerfile in order to
install them properly.
Install pip in dev environments, so that we can use it to vendor
PyMuPDf in subsequent commits.
Add a script that installs PyMuPDF under ./dangerzone/vendor. This will
be useful in subsequent commits, for vendoring PyMuPDF when building
Debian packages.
@apyrgio apyrgio force-pushed the 2024-09-vendor-pymupdf branch from 68c516f to f4073ff Compare October 15, 2024 10:25
@apyrgio
Copy link
Contributor Author

apyrgio commented Oct 15, 2024

I have rebased on top of the latest main branch and squashed all reviewed fixup commits. I've added one more fixup commit where we switch from a print to log statement, which is awaiting for your review Alexis. Other than that, it's good to go.

Copy link
Contributor

@almet almet left a comment

Choose a reason for hiding this comment

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

Thanks, let's merge!

Prefer importing packages from ./dangerzone/vendor, if there is one
there, instead of using the system ones.
Install PyMuPDF under ./dangerzone/vendor, right before we build the
.deb package. We vendor PyMuPDF just for Debian, since the provided
versions don't have OCR support enabled.

Currently, we don't use PyMuPDf on the host, but this will change once
we fully implement the on-host conversion feature.

Refs #625
@apyrgio apyrgio force-pushed the 2024-09-vendor-pymupdf branch from f4073ff to 1eff145 Compare October 15, 2024 11:58
@apyrgio apyrgio merged commit 1eff145 into main Oct 15, 2024
23 of 25 checks passed
@apyrgio apyrgio deleted the 2024-09-vendor-pymupdf branch October 15, 2024 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants