From daa971cecbc93f447a8776b563814b8ac1c747d6 Mon Sep 17 00:00:00 2001 From: tigro Date: Fri, 8 Sep 2023 15:51:53 +0300 Subject: [PATCH] 0.3.8 --- .gitignore | 2 +- .zathura-pdf-mupdf.metadata | 2 +- SOURCES/0001-adapt-to-mupdf-1.20.patch | 27 ++++++++++++++ SPECS/zathura-pdf-mupdf.spec | 49 ++++---------------------- 4 files changed, 36 insertions(+), 44 deletions(-) create mode 100644 SOURCES/0001-adapt-to-mupdf-1.20.patch diff --git a/.gitignore b/.gitignore index 9734cbc..1d43602 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/zathura-pdf-mupdf-0.4.0.tar.xz +SOURCES/zathura-pdf-mupdf-0.3.8.tar.xz diff --git a/.zathura-pdf-mupdf.metadata b/.zathura-pdf-mupdf.metadata index 4806a70..53ec7a4 100644 --- a/.zathura-pdf-mupdf.metadata +++ b/.zathura-pdf-mupdf.metadata @@ -1 +1 @@ -8ad67999272ba481327ec6d9031fb873a9d99f63 SOURCES/zathura-pdf-mupdf-0.4.0.tar.xz +6b4cb4390ee2e9a79615f94b12cc421f4664d97f SOURCES/zathura-pdf-mupdf-0.3.8.tar.xz diff --git a/SOURCES/0001-adapt-to-mupdf-1.20.patch b/SOURCES/0001-adapt-to-mupdf-1.20.patch new file mode 100644 index 0000000..ccee108 --- /dev/null +++ b/SOURCES/0001-adapt-to-mupdf-1.20.patch @@ -0,0 +1,27 @@ +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/SPECS/zathura-pdf-mupdf.spec b/SPECS/zathura-pdf-mupdf.spec index a49e0f4..e701bda 100644 --- a/SPECS/zathura-pdf-mupdf.spec +++ b/SPECS/zathura-pdf-mupdf.spec @@ -5,13 +5,14 @@ Name: zathura-pdf-mupdf -Version: 0.4.0 -Release: 8%{?dist} +Version: 0.3.8 +Release: 5%{?dist} Summary: PDF support for zathura via mupdf -License: Zlib +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 @@ -25,7 +26,7 @@ BuildRequires: glib2-devel BuildRequires: libappstream-glib BuildRequires: libjpeg-turbo-devel BuildRequires: meson >= 0.43 -BuildRequires: mupdf-static >= 1.20 +BuildRequires: mupdf-static >= 1.17 BuildRequires: openjpeg2-devel BuildRequires: zathura-devel >= 0.3.9 BuildRequires: gumbo-parser-devel @@ -68,44 +69,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog -* Thu May 11 2023 Michael J Gruber - 0.4.0-8 -- build against mupdf 1.22.1 - -* Sat Apr 15 2023 Michael J Gruber - 0.4.0-7 -- build against mupdf 1.22.0 - -* Thu Apr 06 2023 Sandro Mani - 0.4.0-6 -- Rebuild (tesseract) - -* Sat Jan 21 2023 Fedora Release Engineering - 0.4.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Dec 24 2022 Michael J Gruber - 0.4.0-4 -- SPDX migration - -* Fri Dec 23 2022 Sandro Mani - 0.4.0-3 -- Rebuild (tesseract) - -* Wed Dec 21 2022 Sandro Mani - 0.4.0-2 -- Rebuild (leptonica) - -* Mon Nov 28 2022 Michael J Gruber - 0.4.0-1 -- Update to 0.4.0 (rhbz#2148751) - -* Mon Nov 28 2022 Michael J Gruber - 0.3.9-2 -- build against mupdf 1.21.0 - -* 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 - -* Sat Jul 23 2022 Fedora Release Engineering - 0.3.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Sandro Mani - 0.3.8-6 -- Rebuild (tesseract) +* Fri Sep 8 2023 Arkady L. Shane - 0.3.8-5 +- Rebuilt MSVSphere 9.2 * Wed Jun 15 2022 Michael J Gruber - 0.3.8-5 - build against mupdf 1.20.0