CVS commit: pkgsrc/print/zathura-pdf-mupdf

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Thu May  7 20:45:28 UTC 2020

Modified Files:
        pkgsrc/print/zathura-pdf-mupdf: Makefile distinfo
Added Files:
        pkgsrc/print/zathura-pdf-mupdf/patches: patch-zathura-pdf-mupdf_index.c
            patch-zathura-pdf-mupdf_links.c

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

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/print/zathura-pdf-mupdf/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/zathura-pdf-mupdf/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_index.c \
    pkgsrc/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_links.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/zathura-pdf-mupdf/Makefile
diff -u pkgsrc/print/zathura-pdf-mupdf/Makefile:1.41 pkgsrc/print/zathura-pdf-mupdf/Makefile:1.42
--- pkgsrc/print/zathura-pdf-mupdf/Makefile:1.41        Wed May  6 14:04:59 2020
+++ pkgsrc/print/zathura-pdf-mupdf/Makefile     Thu May  7 20:45:28 2020
@@ -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

Index: pkgsrc/print/zathura-pdf-mupdf/distinfo
diff -u pkgsrc/print/zathura-pdf-mupdf/distinfo:1.11 pkgsrc/print/zathura-pdf-mupdf/distinfo:1.12
--- pkgsrc/print/zathura-pdf-mupdf/distinfo:1.11        Wed Aug 14 10:37:19 2019
+++ pkgsrc/print/zathura-pdf-mupdf/distinfo     Thu May  7 20:45:28 2020
@@ -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

Added files:

Index: pkgsrc/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_index.c
diff -u /dev/null pkgsrc/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_index.c:1.1
--- /dev/null   Thu May  7 20:45:28 2020
+++ pkgsrc/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_index.c      Thu May  7 20:45:28 2020
@@ -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;
Index: pkgsrc/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_links.c
diff -u /dev/null pkgsrc/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_links.c:1.1
--- /dev/null   Thu May  7 20:45:28 2020
+++ pkgsrc/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_links.c      Thu May  7 20:45:28 2020
@@ -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;