From 952c1c3b757219289e9677b98211f65c315e6b46 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 23 Aug 2022 10:03:22 +0200 Subject: [PATCH] Update to 0.3.9 (rhbz#2120429) Upstream now incorporates the patch we carried for mupdf 1.20.0 already. --- .gitignore | 1 + 0001-adapt-to-mupdf-1.20.patch | 27 --------------------------- sources | 2 +- zathura-pdf-mupdf.spec | 10 ++++++---- 4 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 0001-adapt-to-mupdf-1.20.patch diff --git a/.gitignore b/.gitignore index f8e7c42..256828e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /zathura-pdf-mupdf-0.3.6.tar.xz /zathura-pdf-mupdf-0.3.7.tar.xz /zathura-pdf-mupdf-0.3.8.tar.xz +/zathura-pdf-mupdf-0.3.9.tar.xz diff --git a/0001-adapt-to-mupdf-1.20.patch b/0001-adapt-to-mupdf-1.20.patch deleted file mode 100644 index ccee108..0000000 --- a/0001-adapt-to-mupdf-1.20.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 89851522051ffdc171c6e63c82d07205b0683aea Mon Sep 17 00:00:00 2001 -Message-Id: <89851522051ffdc171c6e63c82d07205b0683aea.1652644338.git.mjg@fedoraproject.org> -From: Michael J Gruber -Date: Sun, 15 May 2022 21:52:07 +0200 -Subject: [PATCH] adapt to mupdf 1.20 - -Signed-off-by: Michael J Gruber ---- - zathura-pdf-mupdf/search.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/zathura-pdf-mupdf/search.c b/zathura-pdf-mupdf/search.c -index f84dea0..419e5f4 100644 ---- a/zathura-pdf-mupdf/search.c -+++ b/zathura-pdf-mupdf/search.c -@@ -41,7 +41,7 @@ pdf_page_search_text(zathura_page_t* page, void* data, const char* text, zathura - - fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, fz_quad); - int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text, -- text, hit_bbox, N_SEARCH_RESULTS); -+ text, NULL, hit_bbox, N_SEARCH_RESULTS); - - fz_rect r; - for (int i = 0; i < num_results; i++) { --- -2.36.1.165.g85e47b7606 - diff --git a/sources b/sources index 279dae4..22b3ccf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zathura-pdf-mupdf-0.3.8.tar.xz) = c2ec4a204446822eb3771673e99ddc42d6ffdfbbb9fc079e09442f0b5a6e2397190d2a8079a92f2d08d5824199760a90d192cb517c9f17676102f3ed69edd5a0 +SHA512 (zathura-pdf-mupdf-0.3.9.tar.xz) = 6a81e562965a0d6a2a25e301b0cc20ee70ada43ed7261f5d4ef6c132de1136f0222ebee0088d80cc2e0d1d60595e335cb1a1a914cb761aad36b487d7c16ac034 diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index 2c5c6a6..2e4e00c 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -5,14 +5,13 @@ Name: zathura-pdf-mupdf -Version: 0.3.8 -Release: 8%{?dist} +Version: 0.3.9 +Release: 1%{?dist} Summary: PDF support for zathura via mupdf License: zlib URL: https://pwmt.org/projects/%{name}/ Source0: %{url}/download/%{name}-%{version}.tar.xz Patch1: 0001-Revert-Rework-detection-of-mupdf.patch -Patch2: 0001-adapt-to-mupdf-1.20.patch BuildRequires: binutils BuildRequires: cairo-devel @@ -26,7 +25,7 @@ BuildRequires: glib2-devel BuildRequires: libappstream-glib BuildRequires: libjpeg-turbo-devel BuildRequires: meson >= 0.43 -BuildRequires: mupdf-static >= 1.17 +BuildRequires: mupdf-static >= 1.20 BuildRequires: openjpeg2-devel BuildRequires: zathura-devel >= 0.3.9 BuildRequires: gumbo-parser-devel @@ -69,6 +68,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Tue Aug 23 2022 Michael J Gruber - 0.3.9-1 +- Update to 0.3.9 (rhbz#2120429) + * Fri Aug 12 2022 Michael J Gruber - 0.3.8-8 - build against mupdf 1.20.3