Add patches to adapt zathura-pdf-mupdf to the mupdf-1.9 API.

Bump PKGREVISION.

8 files changed, 125 insertions, 8 deletions

diff --git a/print/zathura-pdf-mupdf/Makefile b/print/zathura-pdf-mupdf/Makefile
index 1795e6b5c1a..c92a86f7d2f 100644
--- a/print/zathura-pdf-mupdf/Makefile
+++ b/print/zathura-pdf-mupdf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2016/03/05 11:29:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2016/04/27 12:38:45 leot Exp $
 #
 
 DISTNAME=	zathura-pdf-mupdf-0.3.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://pwmt.org/projects/zathura/plugins/download/
 
@@ -18,7 +18,7 @@ USE_LIBTOOL=	yes
 
 CPPFLAGS+=	-D_XOPEN_SOURCE=600
 
-MAKE_ENV+=	MUPDF_LIB="-lmupdf -lmujs"
+MAKE_ENV+=	MUPDF_LIB="-lmupdf -lmupdfthird"
 
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../print/mupdf/buildlink3.mk"
diff --git a/print/zathura-pdf-mupdf/distinfo b/print/zathura-pdf-mupdf/distinfo
index 11cb4a79232..6278da8bd24 100644
--- a/print/zathura-pdf-mupdf/distinfo
+++ b/print/zathura-pdf-mupdf/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.2 2016/02/15 03:04:27 leot Exp $
+$NetBSD: distinfo,v 1.3 2016/04/27 12:38:45 leot Exp $
 
 SHA1 (zathura-pdf-mupdf-0.3.0.tar.gz) = ae0be41ea7c75b8ddc083fe01f1366673ea9751a
 RMD160 (zathura-pdf-mupdf-0.3.0.tar.gz) = 377e7848a5ea7f43f020e131aacc24c51453bf8f
 SHA512 (zathura-pdf-mupdf-0.3.0.tar.gz) = c83eef453176c6317be338260e311c39e049b8ae1ae719445c6303725b4e993758ed3f3a61f0af31032d09f1f2f03574f862d24e36b27fa38732e0b6c7aa18ea
 Size (zathura-pdf-mupdf-0.3.0.tar.gz) = 9914 bytes
-SHA1 (patch-document.c) = dfef8e98cf6f5fbe65a904c7d53c369775b9f1b1
+SHA1 (patch-document.c) = a891f161ae4af2d5b3cb3b46b3c7f010fee2ee9c
+SHA1 (patch-image.c) = 1b4c178832aca195d5d1ccacd283dc52fa4d823e
+SHA1 (patch-page.c) = d60e89e0ef2c98b20d9ca02ae8cb68a2c434c8e8
+SHA1 (patch-plugin.h) = 4ec3e1510938f4bf7c10194ee7702666b1e18eb9
+SHA1 (patch-search.c) = 312d29bd2463df3bbbe4410f5f5fad07f9f04b93
+SHA1 (patch-utils.c) = 38d6717abad516ff007a7eb4f6f6d1d263385b4f
diff --git a/print/zathura-pdf-mupdf/patches/patch-document.c b/print/zathura-pdf-mupdf/patches/patch-document.c
index 8d5741d4101..6df8bcb7b23 100644
--- a/print/zathura-pdf-mupdf/patches/patch-document.c
+++ b/print/zathura-pdf-mupdf/patches/patch-document.c
@@ -1,8 +1,9 @@
-$NetBSD: patch-document.c,v 1.1 2016/02/14 14:01:49 leot Exp $
+$NetBSD: patch-document.c,v 1.2 2016/04/27 12:38:45 leot Exp $
 
-Correct the glib-2.0 include header file path.
+o Correct the glib-2.0 include header file path.
+o Update to mupdf-1.9 API
 
---- document.c.orig	2015-12-22 22:38:09.000000000 +0000
+--- document.c.orig	2016-02-14 22:49:46.000000000 +0000
 +++ document.c
 @@ -6,7 +6,7 @@
  #include <mupdf/xps.h>
@@ -13,3 +14,17 @@ Correct the glib-2.0 include header file path.
  
  #include "plugin.h"
  
+@@ -109,12 +109,7 @@ pdf_document_save_as(zathura_document_t*
+   }
+ 
+   fz_try (mupdf_document->ctx) {
+-    /* fz_write_document claims to accepts NULL as third argument but doesn't.
+-     * pdf_write_document does not check if the third arguments is NULL for some
+-     * options. */
+-
+-    fz_write_options opts = { 0 }; /* just use the default options */
+-    fz_write_document(mupdf_document->ctx, mupdf_document->document, (char*) path, &opts);
++    pdf_save_document(mupdf_document->ctx, pdf_specifics(mupdf_document->ctx, mupdf_document->document), (char*) path, NULL);
+   } fz_catch (mupdf_document->ctx) {
+     return ZATHURA_ERROR_UNKNOWN;
+   }
diff --git a/print/zathura-pdf-mupdf/patches/patch-image.c b/print/zathura-pdf-mupdf/patches/patch-image.c
new file mode 100644
index 00000000000..ab40fc54131
--- /dev/null
+++ b/print/zathura-pdf-mupdf/patches/patch-image.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-image.c,v 1.1 2016/04/27 12:38:45 leot Exp $
+
+Update to mupdf-1.9 API.
+
+--- image.c.orig	2016-02-14 22:49:46.000000000 +0000
++++ image.c
+@@ -93,7 +93,7 @@ pdf_page_image_get_cairo(zathura_page_t*
+   fz_pixmap* pixmap = NULL;
+   cairo_surface_t* surface = NULL;
+ 
+-  pixmap = fz_new_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0);
++  pixmap = fz_get_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0);
+   if (pixmap == NULL) {
+     goto error_free;
+   }
diff --git a/print/zathura-pdf-mupdf/patches/patch-page.c b/print/zathura-pdf-mupdf/patches/patch-page.c
new file mode 100644
index 00000000000..17395bb6877
--- /dev/null
+++ b/print/zathura-pdf-mupdf/patches/patch-page.c
@@ -0,0 +1,35 @@
+$NetBSD: patch-page.c,v 1.1 2016/04/27 12:38:45 leot Exp $
+
+Update to mupdf-1.9 API.
+
+--- page.c.orig	2016-02-14 22:49:46.000000000 +0000
++++ page.c
+@@ -43,12 +43,12 @@ pdf_page_init(zathura_page_t* page)
+   /* setup text */
+   mupdf_page->extracted_text = false;
+ 
+-  mupdf_page->text = fz_new_text_page(mupdf_page->ctx);
++  mupdf_page->text = fz_new_stext_page(mupdf_page->ctx);
+   if (mupdf_page->text == NULL) {
+     goto error_free;
+   }
+ 
+-  mupdf_page->sheet = fz_new_text_sheet(mupdf_page->ctx);
++  mupdf_page->sheet = fz_new_stext_sheet(mupdf_page->ctx);
+   if (mupdf_page->sheet == NULL) {
+     goto error_free;
+   }
+@@ -74,11 +74,11 @@ pdf_page_clear(zathura_page_t* page, mup
+ 
+   if (mupdf_page != NULL) {
+     if (mupdf_page->text != NULL) {
+-      fz_drop_text_page(mupdf_page->ctx, mupdf_page->text);
++      fz_drop_stext_page(mupdf_page->ctx, mupdf_page->text);
+     }
+ 
+     if (mupdf_page->sheet != NULL) {
+-      fz_drop_text_sheet(mupdf_page->ctx, mupdf_page->sheet);
++      fz_drop_stext_sheet(mupdf_page->ctx, mupdf_page->sheet);
+     }
+ 
+     if (mupdf_page->page != NULL) {
diff --git a/print/zathura-pdf-mupdf/patches/patch-plugin.h b/print/zathura-pdf-mupdf/patches/patch-plugin.h
new file mode 100644
index 00000000000..e7b7483f627
--- /dev/null
+++ b/print/zathura-pdf-mupdf/patches/patch-plugin.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-plugin.h,v 1.1 2016/04/27 12:38:45 leot Exp $
+
+Update to mupdf-1.9 API.
+
+--- plugin.h.orig	2016-02-14 22:49:46.000000000 +0000
++++ plugin.h
+@@ -21,8 +21,8 @@ typedef struct mupdf_page_s
+ {
+   fz_page* page; /**< Reference to the mupdf page */
+   fz_context* ctx; /**< Context */
+-  fz_text_sheet* sheet; /**< Text sheet */
+-  fz_text_page* text; /**< Page text */
++  fz_stext_sheet* sheet; /**< Text sheet */
++  fz_stext_page* text; /**< Page text */
+   fz_rect bbox; /**< Bbox */
+   bool extracted_text; /**< If text has already been extracted */
+ } mupdf_page_t;
diff --git a/print/zathura-pdf-mupdf/patches/patch-search.c b/print/zathura-pdf-mupdf/patches/patch-search.c
new file mode 100644
index 00000000000..b4ceceabf69
--- /dev/null
+++ b/print/zathura-pdf-mupdf/patches/patch-search.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-search.c,v 1.1 2016/04/27 12:38:45 leot Exp $
+
+Update to mupdf-1.9 API.
+
+--- search.c.orig	2016-02-14 22:49:46.000000000 +0000
++++ search.c
+@@ -40,7 +40,7 @@ pdf_page_search_text(zathura_page_t* pag
+   }
+ 
+   fz_rect* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, sizeof(fz_rect));
+-  int num_results = fz_search_text_page(mupdf_page->ctx, mupdf_page->text,
++  int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
+       (char*) text, hit_bbox, N_SEARCH_RESULTS);
+ 
+   for (int i = 0; i < num_results; i++) {
diff --git a/print/zathura-pdf-mupdf/patches/patch-utils.c b/print/zathura-pdf-mupdf/patches/patch-utils.c
new file mode 100644
index 00000000000..4b96094e03f
--- /dev/null
+++ b/print/zathura-pdf-mupdf/patches/patch-utils.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-utils.c,v 1.1 2016/04/27 12:38:45 leot Exp $
+
+Update to mupdf-1.9 API.
+
+--- utils.c.orig	2016-02-14 22:49:46.000000000 +0000
++++ utils.c
+@@ -14,7 +14,7 @@ mupdf_page_extract_text(mupdf_document_t
+   fz_device* text_device = NULL;
+ 
+   fz_try (mupdf_page->ctx) {
+-    text_device = fz_new_text_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text);
++    text_device = fz_new_stext_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text);
+ 
+     /* Disable FZ_IGNORE_IMAGE to collect image blocks */
+     fz_disable_device_hints(mupdf_page->ctx, text_device, FZ_IGNORE_IMAGE);