From 927ab6941e5e64d6ca3eae00200868fc5752962c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 15 Jul 2025 20:32:05 -0700 Subject: [PATCH] python3Packages.ocrmypdf: 16.10.2 -> 16.10.4 Diff: https://github.com/ocrmypdf/OCRmyPDF/compare/v16.10.2...v16.10.4 Changelog: https://github.com/ocrmypdf/OCRmyPDF/blob/v16.10.4/docs/release_notes.md --- .../development/python-modules/ocrmypdf/default.nix | 6 ++---- .../python-modules/ocrmypdf/multiprocessing.patch | 13 ------------- .../python-modules/ocrmypdf/use-pillow-heif.patch | 8 ++++---- 3 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/python-modules/ocrmypdf/multiprocessing.patch diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index abca6b0f9772..30b05a04eead 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.10.2"; + version = "16.10.4"; pyproject = true; src = fetchFromGitHub { @@ -41,7 +41,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-kEPVufS8wpoGi/A4Eh1u9gLVIEdJmoPDmAiY38DYDv4="; + hash = "sha256-uHC1mIrWlvpL6SOFZQHWFlha7qSM3jhz2C/CH2cn2K0="; }; patches = [ @@ -53,8 +53,6 @@ buildPythonPackage rec { tesseract = lib.getExe tesseract; unpaper = lib.getExe unpaper; }) - # Fix crashing in tests on Python 3.13.4 - ./multiprocessing.patch ]; build-system = [ diff --git a/pkgs/development/python-modules/ocrmypdf/multiprocessing.patch b/pkgs/development/python-modules/ocrmypdf/multiprocessing.patch deleted file mode 100644 index 0ff85170082b..000000000000 --- a/pkgs/development/python-modules/ocrmypdf/multiprocessing.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ocrmypdf/__main__.py b/src/ocrmypdf/__main__.py -index cec02d13..f554ab73 100755 ---- a/src/ocrmypdf/__main__.py -+++ b/src/ocrmypdf/__main__.py -@@ -77,7 +77,7 @@ def run(args=None): - - - if __name__ == '__main__': -- multiprocessing.freeze_support() -+ # multiprocessing.freeze_support() - if os.name == 'posix': - multiprocessing.set_start_method('forkserver') - sys.exit(run()) diff --git a/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch b/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch index c30706fc6fc0..74701d580404 100644 --- a/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch +++ b/pkgs/development/python-modules/ocrmypdf/use-pillow-heif.patch @@ -1,14 +1,14 @@ diff --git a/pyproject.toml b/pyproject.toml -index 451d83d9..817b27ea 100644 +index 7d665b6a..55f2f210 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ dependencies = [ "img2pdf>=0.5", "packaging>=20", "pdfminer.six>=20220319", -- "pi-heif", # Heif image format - maintainers: if this is removed, it will NOT break -+ "pillow-heif", # Heif image format - maintainers: if this is removed, it will NOT break - "pikepdf>=8.10.1, != 9.8.0", +- "pi-heif", # Heif image format - maintainers: if this is removed, it will NOT break ++ "pillow-heif", # Heif image format - maintainers: if this is removed, it will NOT break + "pikepdf>=8.10.1,!=9.8.0", "Pillow>=10.0.1", "pluggy>=1", diff --git a/src/ocrmypdf/_pipeline.py b/src/ocrmypdf/_pipeline.py