[pkgsrc/trunk]: pkgsrc/print/zathura-pdf-mupdf zathura-pdf-mupdf: Backport a ...

[leot <leot%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a84e3fb1ac5
branches:  trunk
changeset: 431014:4a84e3fb1ac5
user:      leot <leot%pkgsrc.org@localhost>
date:      Thu May 07 20:45:28 2020 +0000

description:
zathura-pdf-mupdf: Backport a patch to fix build with mupdf-1.17.0

PKGREVISION++

diffstat:

 print/zathura-pdf-mupdf/Makefile                                |   4 +-
 print/zathura-pdf-mupdf/distinfo                                |   4 +-
 print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_index.c |  20 +++++++++
 print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_links.c |  21 ++++++++++
 4 files changed, 46 insertions(+), 3 deletions(-)

diffs (77 lines):

diff -r 31882fa84d61 -r 4a84e3fb1ac5 print/zathura-pdf-mupdf/Makefile
--- a/print/zathura-pdf-mupdf/Makefile  Thu May 07 20:43:20 2020 +0000
+++ b/print/zathura-pdf-mupdf/Makefile  Thu May 07 20:45:28 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2020/05/06 14:04:59 adam Exp $
+# $NetBSD: Makefile,v 1.42 2020/05/07 20:45:28 leot Exp $
 #
 
 DISTNAME=      zathura-pdf-mupdf-0.3.5
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    print
 MASTER_SITES=  https://pwmt.org/projects/zathura/plugins/download/
 EXTRACT_SUFX=  .tar.xz
diff -r 31882fa84d61 -r 4a84e3fb1ac5 print/zathura-pdf-mupdf/distinfo
--- a/print/zathura-pdf-mupdf/distinfo  Thu May 07 20:43:20 2020 +0000
+++ b/print/zathura-pdf-mupdf/distinfo  Thu May 07 20:45:28 2020 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.11 2019/08/14 10:37:19 leot Exp $
+$NetBSD: distinfo,v 1.12 2020/05/07 20:45:28 leot Exp $
 
 SHA1 (zathura-pdf-mupdf-0.3.5.tar.xz) = 7cdc7d07a9c9636f0627c3aa9b5f56812a60c36a
 RMD160 (zathura-pdf-mupdf-0.3.5.tar.xz) = e7299ad1bdf65b1455d6431aec5e4d664d23d4d0
 SHA512 (zathura-pdf-mupdf-0.3.5.tar.xz) = e57b002c9cd3895996609d3f16e9fc6e533a1607eeeb1240c00bf28a12e3c725c3f93e37d0b1315e0fc3ea59314ea8bf35c47baa308c6c4b144a66a1cd5c7a3d
 Size (zathura-pdf-mupdf-0.3.5.tar.xz) = 8088 bytes
 SHA1 (patch-document.c) = ad929680aa1de6f21b71cabc06da9ba54491687a
+SHA1 (patch-zathura-pdf-mupdf_index.c) = 6c4a1f4e8a77bc292a1aa1803f3320f6b353b2bb
+SHA1 (patch-zathura-pdf-mupdf_links.c) = 65296e0994db6895b8b7ef0a9896cce85f3d0751
diff -r 31882fa84d61 -r 4a84e3fb1ac5 print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_index.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_index.c   Thu May 07 20:45:28 2020 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-zathura-pdf-mupdf_index.c,v 1.1 2020/05/07 20:45:28 leot Exp $
+
+Backport upstream commit c7f341addb76d5e6fd8c24c666d8fe97c451a4cb to
+update to mupdf 1.17.
+
+--- zathura-pdf-mupdf/index.c.orig     2019-08-11 16:46:17.000000000 +0000
++++ zathura-pdf-mupdf/index.c
+@@ -65,9 +65,11 @@ build_index(fz_context* ctx, fz_document
+       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 -r 31882fa84d61 -r 4a84e3fb1ac5 print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_links.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_links.c   Thu May 07 20:45:28 2020 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-zathura-pdf-mupdf_links.c,v 1.1 2020/05/07 20:45:28 leot Exp $
+
+Backport upstream commit c7f341addb76d5e6fd8c24c666d8fe97c451a4cb to
+update to mupdf 1.17.
+
+--- zathura-pdf-mupdf/links.c.orig     2019-08-11 16:46:17.000000000 +0000
++++ zathura-pdf-mupdf/links.c
+@@ -54,10 +54,11 @@ pdf_page_links_get(zathura_page_t* page,
+       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;