From e39fd0da4b565dfb0a25b6d548f9371e4781c6f5 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Feb 16 2024 21:33:20 +0000 Subject: Update to new upstream release 1.23.22 (rhbz#2256708) - minor fixes - interoperability with mupdf 1.23.x --- diff --git a/.gitignore b/.gitignore index 8fe3b07..fba2121 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ /PyMuPDF-1.23.7.tar.gz /PyMuPDF-1.23.8.tar.gz /PyMuPDF-1.23.21.tar.gz +/PyMuPDF-1.23.22.tar.gz diff --git a/0001-src-__init__.py-JM_image_reporter-work-with-change-t.patch b/0001-src-__init__.py-JM_image_reporter-work-with-change-t.patch deleted file mode 100644 index 6cb84b7..0000000 --- a/0001-src-__init__.py-JM_image_reporter-work-with-change-t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c07c8683d18c52ecd80dc6d85d9b90f28453f1d6 Mon Sep 17 00:00:00 2001 -Message-ID: -From: Julian Smith -Date: Thu, 1 Feb 2024 15:30:57 +0000 -Subject: [PATCH] src/__init__.py: JM_image_reporter(): work with change to - mupdf master. - -New mupdf has extra `fz_rect scissor` arg in -pdf_sanitize_filter_options::image_filter(). ---- - src/__init__.py | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/__init__.py b/src/__init__.py -index ef6b1d9c..321b2059 100644 ---- a/src/__init__.py -+++ b/src/__init__.py -@@ -16042,8 +16042,12 @@ def JM_image_reporter(page): - def __init__(self): - super().__init__() - self.use_virtual_image_filter() -- def image_filter(self, ctx, ctm, name, image): -- JM_image_filter(None, mupdf.FzMatrix(ctm), name, image) -+ if mupdf_version_tuple >= (1, 24): -+ def image_filter(self, ctx, ctm, name, image, scissor): -+ JM_image_filter(None, mupdf.FzMatrix(ctm), name, image) -+ else: -+ def image_filter(self, ctx, ctm, name, image): -+ JM_image_filter(None, mupdf.FzMatrix(ctm), name, image) - - sanitize_filter_options = SanitizeFilterOptions() - --- -2.43.0.710.g31023adb55 - diff --git a/python-PyMuPDF.spec b/python-PyMuPDF.spec index eb86f5f..a9ed9f8 100644 --- a/python-PyMuPDF.spec +++ b/python-PyMuPDF.spec @@ -2,7 +2,7 @@ %global module_name fitz Name: python-%{pypi_name} -Version: 1.23.21 +Version: 1.23.22 Release: %autorelease Summary: Python binding for MuPDF - a lightweight PDF and XPS viewer @@ -13,7 +13,6 @@ Patch0: 0001-fix-test_-font.patch Patch1: 0001-test_pixmap-adjust-to-turbojpeg.patch Patch2: 0001-adjust-tesseract-tessdata-path-to-Fedora-default.patch Patch3: 0001-fix-type-error-with-GCC-14.patch -Patch4: 0001-src-__init__.py-JM_image_reporter-work-with-change-t.patch BuildRequires: python3-devel BuildRequires: python3-fonttools diff --git a/sources b/sources index 2204d51..7bc2959 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyMuPDF-1.23.21.tar.gz) = eaae1adc10bc1ad31d4137b390fdb0b8d94d6d420feeb63ab544a740178031e04c71bc0d63f2d4b3bc2b016a2f57286961d28a2b7c0d0f74fd343b7cadd276a9 +SHA512 (PyMuPDF-1.23.22.tar.gz) = 2ddb5f8ea063a9e59db7b90021707d99d8e713e287a53d3079cf492bc2a6401f0db219390f00461d130386ad43bf96c7e85822801e2a21fb56406021d96a407c