From 709c2f4f3cb0d04eac1b9aeff65082f6b1384af1 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Mon, 7 Sep 2020 20:56:10 +0100 Subject: [PATCH] Update to 0.3.6 --- .gitignore | 1 + 0001-Update-to-mupdf-1.17.patch | 50 --------------------------------- sources | 2 +- zathura-pdf-mupdf.spec | 11 ++++---- 4 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 0001-Update-to-mupdf-1.17.patch diff --git a/.gitignore b/.gitignore index 3bd05b0..55f4469 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /zathura-pdf-mupdf-0.3.3.tar.xz /zathura-pdf-mupdf-0.3.4.tar.xz /zathura-pdf-mupdf-0.3.5.tar.xz +/zathura-pdf-mupdf-0.3.6.tar.xz diff --git a/0001-Update-to-mupdf-1.17.patch b/0001-Update-to-mupdf-1.17.patch deleted file mode 100644 index ead98d9..0000000 --- a/0001-Update-to-mupdf-1.17.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c7f341addb76d5e6fd8c24c666d8fe97c451a4cb Mon Sep 17 00:00:00 2001 -Message-Id: -From: Moritz Lipp -Date: Thu, 7 May 2020 20:42:01 +0200 -Subject: [PATCH] Update to mupdf 1.17 - -Signed-off-by: Michael J Gruber ---- - zathura-pdf-mupdf/index.c | 4 +++- - zathura-pdf-mupdf/links.c | 5 +++-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/zathura-pdf-mupdf/index.c b/zathura-pdf-mupdf/index.c -index c421f5c..cbbe978 100644 ---- a/zathura-pdf-mupdf/index.c -+++ b/zathura-pdf-mupdf/index.c -@@ -65,9 +65,11 @@ build_index(fz_context* ctx, fz_document* document, fz_outline* outline, girara_ - float x = 0; - float y = 0; - -+ fz_location location = fz_resolve_link(ctx, document, outline->uri, &x, &y); -+ - type = ZATHURA_LINK_GOTO_DEST; - target.destination_type = ZATHURA_LINK_DESTINATION_XYZ; -- target.page_number = fz_resolve_link(ctx, document, outline->uri, &x, &y); -+ target.page_number = location.page; - target.left = x; - target.top = y; - target.zoom = 0.0; -diff --git a/zathura-pdf-mupdf/links.c b/zathura-pdf-mupdf/links.c -index 99c5715..157f039 100644 ---- a/zathura-pdf-mupdf/links.c -+++ b/zathura-pdf-mupdf/links.c -@@ -54,10 +54,11 @@ pdf_page_links_get(zathura_page_t* page, void* data, zathura_error_t* error) - float x = 0; - float y = 0; - -+ fz_location location = fz_resolve_link(mupdf_document->ctx, mupdf_document->document, link->uri, &x, &y); -+ - type = ZATHURA_LINK_GOTO_DEST; - target.destination_type = ZATHURA_LINK_DESTINATION_XYZ; -- target.page_number = fz_resolve_link(mupdf_document->ctx, -- mupdf_document->document, link->uri, &x, &y); -+ target.page_number = location.page; - target.left = x; - target.top = y; - target.zoom = 0.0; --- -2.26.2.764.g8d8fb31f15 - diff --git a/sources b/sources index 1508d57..ff2a284 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zathura-pdf-mupdf-0.3.5.tar.xz) = e57b002c9cd3895996609d3f16e9fc6e533a1607eeeb1240c00bf28a12e3c725c3f93e37d0b1315e0fc3ea59314ea8bf35c47baa308c6c4b144a66a1cd5c7a3d +SHA512 (zathura-pdf-mupdf-0.3.6.tar.xz) = 417bc5c1fc141ece82c0617ca311a45354180dd786d48df577e5d68b0eb61198e9867e099216bafb6adae24e743366b4fcf128fdbb4d414db66040224fac27f5 diff --git a/zathura-pdf-mupdf.spec b/zathura-pdf-mupdf.spec index e2f186b..3b5e15b 100644 --- a/zathura-pdf-mupdf.spec +++ b/zathura-pdf-mupdf.spec @@ -5,13 +5,12 @@ Name: zathura-pdf-mupdf -Version: 0.3.5 -Release: 4%{?dist} +Version: 0.3.6 +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-Update-to-mupdf-1.17.patch BuildRequires: binutils BuildRequires: cairo-devel # Needed to validate the desktop file @@ -40,8 +39,7 @@ Conflicts: zathura-pdf-poppler < 0.2.9 This plugin adds PDF support to zathura using the mupdf rendering engine. %prep -%setup -q -%patch1 -p1 +%autosetup %build %meson -Dlink-external=true @@ -64,6 +62,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf %{_datadir}/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml %changelog +* Mon Sep 07 2020 Ankur Sinha - 0.3.6-1 +- Update to new release + * Tue Jul 28 2020 Ankur Sinha - 0.3.5-4 - Rebuild to require exact jgib2dec version - #1860987