diff options
author | leot <leot> | 2016-04-27 12:38:45 +0000 |
---|---|---|
committer | leot <leot> | 2016-04-27 12:38:45 +0000 |
commit | 927576c133905a5553b00e89f81ecb1486e879e8 (patch) | |
tree | eba208f71266d8b970d6fefcd390d12ab8ae560b /print/zathura-pdf-mupdf/patches | |
parent | 669d89c9b8861bea832ea0f708635978f84eea89 (diff) | |
download | pkgsrc-927576c133905a5553b00e89f81ecb1486e879e8.tar.gz |
Add patches to adapt zathura-pdf-mupdf to the mupdf-1.9 API.
Bump PKGREVISION.
Diffstat (limited to 'print/zathura-pdf-mupdf/patches')
-rw-r--r-- | print/zathura-pdf-mupdf/patches/patch-document.c | 21 | ||||
-rw-r--r-- | print/zathura-pdf-mupdf/patches/patch-image.c | 15 | ||||
-rw-r--r-- | print/zathura-pdf-mupdf/patches/patch-page.c | 35 | ||||
-rw-r--r-- | print/zathura-pdf-mupdf/patches/patch-plugin.h | 17 | ||||
-rw-r--r-- | print/zathura-pdf-mupdf/patches/patch-search.c | 15 | ||||
-rw-r--r-- | print/zathura-pdf-mupdf/patches/patch-utils.c | 15 |
6 files changed, 115 insertions, 3 deletions
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); |