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

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

Module Name:    pkgsrc
Committed By:   leot
Date:           Sat Aug  3 14:48:48 UTC 2019

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

Log Message:
zathura-pdf-mupdf: Fix build with mupdf-1.16.0

Backport upstream patch to fix the build with 1.16.0 and bump
BUILDLINK_API_DEPENDS.mupdf accordingly.

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/print/zathura-pdf-mupdf/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/zathura-pdf-mupdf/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_search.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.32 pkgsrc/print/zathura-pdf-mupdf/Makefile:1.33
--- pkgsrc/print/zathura-pdf-mupdf/Makefile:1.32        Sun Jul 21 22:25:39 2019
+++ pkgsrc/print/zathura-pdf-mupdf/Makefile     Sat Aug  3 14:48:48 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2019/07/21 22:25:39 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2019/08/03 14:48:48 leot Exp $
 #
 
 DISTNAME=      zathura-pdf-mupdf-0.3.4
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    print
 MASTER_SITES=  https://pwmt.org/projects/zathura/plugins/download/
 EXTRACT_SUFX=  .tar.xz
@@ -21,6 +21,7 @@ CPPFLAGS+=    -D_XOPEN_SOURCE=600
 
 .include "../../devel/py-meson/build.mk"
 .include "../../graphics/cairo/buildlink3.mk"
+BUILDLINK_API_DEPENDS.mupdf+=  mupdf>=1.16.0
 .include "../../print/mupdf/buildlink3.mk"
 .include "../../print/zathura/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/print/zathura-pdf-mupdf/distinfo
diff -u pkgsrc/print/zathura-pdf-mupdf/distinfo:1.9 pkgsrc/print/zathura-pdf-mupdf/distinfo:1.10
--- pkgsrc/print/zathura-pdf-mupdf/distinfo:1.9 Thu Oct  4 19:13:28 2018
+++ pkgsrc/print/zathura-pdf-mupdf/distinfo     Sat Aug  3 14:48:48 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2018/10/04 19:13:28 leot Exp $
+$NetBSD: distinfo,v 1.10 2019/08/03 14:48:48 leot Exp $
 
 SHA1 (zathura-pdf-mupdf-0.3.4.tar.xz) = f2adf855a67455f4dccd22c61dcf22cde4c5ae2a
 RMD160 (zathura-pdf-mupdf-0.3.4.tar.xz) = 0063ae456a6753954879edf68b85bb1c1ce613f2
 SHA512 (zathura-pdf-mupdf-0.3.4.tar.xz) = 8a885f1faa471d413f09bd6a78b86d419fe433139b2f811dcae9a9ea180beaf693ee8c11c7fe98ed7d5303520f6d9b3efd0d8e7edf978aa5099ef580db79166a
 Size (zathura-pdf-mupdf-0.3.4.tar.xz) = 8092 bytes
 SHA1 (patch-document.c) = ad929680aa1de6f21b71cabc06da9ba54491687a
+SHA1 (patch-zathura-pdf-mupdf_search.c) = 2f5b65fb9354eabc73cb1dacd0b469ece6998025

Added files:

Index: pkgsrc/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_search.c
diff -u /dev/null pkgsrc/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_search.c:1.1
--- /dev/null   Sat Aug  3 14:48:48 2019
+++ pkgsrc/print/zathura-pdf-mupdf/patches/patch-zathura-pdf-mupdf_search.c     Sat Aug  3 14:48:48 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-zathura-pdf-mupdf_search.c,v 1.1 2019/08/03 14:48:48 leot Exp $
+
+Backport upstream commit 95c830c9 to fix the build with MuPDF 1.16.0:
+
+ <https://git.pwmt.org/pwmt/zathura-pdf-mupdf/commit/95c830c9f6cfe4ba99535ecfba0a700ceb15a25a>
+
+--- zathura-pdf-mupdf/search.c.orig    2018-10-04 17:33:46.000000000 +0000
++++ zathura-pdf-mupdf/search.c
+@@ -39,7 +39,7 @@ pdf_page_search_text(zathura_page_t* pag
+     mupdf_page_extract_text(mupdf_document, mupdf_page);
+   }
+ 
+-  fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, sizeof(fz_quad));
++  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);
+