Attachment #178822 for bug #216002

Lines 2-9 Link Here

(-)graphics/zathura-pdf-mupdf/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zathura-pdf-mupdf	4	PORTNAME= zathura-pdf-mupdf
5	PORTVERSION= 0.3.0	5	PORTVERSION= 0.3.1
6	PORTREVISION= 3
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= http://pwmt.org/projects/zathura-pdf-mupdf/download/	7	MASTER_SITES= http://pwmt.org/projects/zathura-pdf-mupdf/download/
9		8

Lines 1-2 Link Here

(-)graphics/zathura-pdf-mupdf/distinfo (-2 / +3 lines)
1	SHA256 (zathura-pdf-mupdf-0.3.0.tar.gz) = 478cb9d1562d08e096ebec4a6db9116d616a3536260197c2a28a2772171f72c8	1	TIMESTAMP = 1484228209
2	SIZE (zathura-pdf-mupdf-0.3.0.tar.gz) = 9914	2	SHA256 (zathura-pdf-mupdf-0.3.1.tar.gz) = d9b9edc0297b9eddb53020976f287b4e8db33edef8cfa047d70e02653eb2f81b
		3	SIZE (zathura-pdf-mupdf-0.3.1.tar.gz) = 9755




--- document.c.orig	2016-02-14 22:49:46 UTC
+++ document.c
@@ -113,8 +113,8 @@ pdf_document_save_as(zathura_document_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_write_options opts = { 0 }; /* just use the default options */
+    pdf_save_document(mupdf_document->ctx, mupdf_document->document, (char*) path, &opts);
   } fz_catch (mupdf_document->ctx) {
     return ZATHURA_ERROR_UNKNOWN;
   }

Lines 1-11 Link Here

(-)graphics/zathura-pdf-mupdf/files/patch-image.c (-11 lines)
1	--- image.c.orig 2016-06-25 17:52:28 UTC
2	+++ image.c
3	@@ -93,7 +93,7 @@ pdf_page_image_get_cairo(zathura_page_t*
4	fz_pixmap* pixmap = NULL;
5	cairo_surface_t* surface = NULL;
6
7	- pixmap = fz_new_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0);
8	+ pixmap = fz_get_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0);
9	if (pixmap == NULL) {
10	goto error_free;
11	}




--- page.c.orig	2016-06-25 17:39:19 UTC
+++ 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) {




--- plugin.h.orig	2016-02-14 22:49:46 UTC
+++ 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;

Lines 1-11 Link Here

(-)graphics/zathura-pdf-mupdf/files/patch-search.c (-11 lines)
1	--- search.c.orig 2016-06-25 17:42:12 UTC
2	+++ search.c
3	@@ -40,7 +40,7 @@ pdf_page_search_text(zathura_page_t* pag
4	}
5
6	fz_rect* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, sizeof(fz_rect));
7	- int num_results = fz_search_text_page(mupdf_page->ctx, mupdf_page->text,
8	+ int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
9	(char*) text, hit_bbox, N_SEARCH_RESULTS);
10
11	for (int i = 0; i < num_results; i++) {

Lines 1-11 Link Here

(-)graphics/zathura-pdf-mupdf/files/patch-utils.c (-11 lines)
1	--- utils.c.orig 2016-06-25 17:44:43 UTC
2	+++ utils.c
3	@@ -14,7 +14,7 @@ mupdf_page_extract_text(mupdf_document_t
4	fz_device* text_device = NULL;
5
6	fz_try (mupdf_page->ctx) {
7	- text_device = fz_new_text_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text);
8	+ text_device = fz_new_stext_device(mupdf_page->ctx, mupdf_page->sheet, mupdf_page->text);
9
10	/* Disable FZ_IGNORE_IMAGE to collect image blocks */
11	fz_disable_device_hints(mupdf_page->ctx, text_device, FZ_IGNORE_IMAGE);

Return to bug 216002

Lines 1-13 Link Here

(-)graphics/zathura-pdf-mupdf/files/patch-document.c (-13 lines)
1	--- document.c.orig 2016-02-14 22:49:46 UTC
2	+++ document.c
3	@@ -113,8 +113,8 @@ pdf_document_save_as(zathura_document_t*
4	* pdf_write_document does not check if the third arguments is NULL for some
5	* options. */
6
7	- fz_write_options opts = { 0 }; /* just use the default options */
8	- fz_write_document(mupdf_document->ctx, mupdf_document->document, (char*) path, &opts);
9	+ pdf_write_options opts = { 0 }; /* just use the default options */
10	+ pdf_save_document(mupdf_document->ctx, mupdf_document->document, (char*) path, &opts);
11	} fz_catch (mupdf_document->ctx) {
12	return ZATHURA_ERROR_UNKNOWN;
13	}

Lines 1-31 Link Here

(-)graphics/zathura-pdf-mupdf/files/patch-page.c (-31 lines)
1	--- page.c.orig 2016-06-25 17:39:19 UTC
2	+++ page.c
3	@@ -43,12 +43,12 @@ pdf_page_init(zathura_page_t* page)
4	/* setup text */
5	mupdf_page->extracted_text = false;
6
7	- mupdf_page->text = fz_new_text_page(mupdf_page->ctx);
8	+ mupdf_page->text = fz_new_stext_page(mupdf_page->ctx);
9	if (mupdf_page->text == NULL) {
10	goto error_free;
11	}
12
13	- mupdf_page->sheet = fz_new_text_sheet(mupdf_page->ctx);
14	+ mupdf_page->sheet = fz_new_stext_sheet(mupdf_page->ctx);
15	if (mupdf_page->sheet == NULL) {
16	goto error_free;
17	}
18	@@ -74,11 +74,11 @@ pdf_page_clear(zathura_page_t* page, mup
19
20	if (mupdf_page != NULL) {
21	if (mupdf_page->text != NULL) {
22	- fz_drop_text_page(mupdf_page->ctx, mupdf_page->text);
23	+ fz_drop_stext_page(mupdf_page->ctx, mupdf_page->text);
24	}
25
26	if (mupdf_page->sheet != NULL) {
27	- fz_drop_text_sheet(mupdf_page->ctx, mupdf_page->sheet);
28	+ fz_drop_stext_sheet(mupdf_page->ctx, mupdf_page->sheet);
29	}
30
31	if (mupdf_page->page != NULL) {

Lines 1-13 Link Here

(-)graphics/zathura-pdf-mupdf/files/patch-plugin.h (-13 lines)
1	--- plugin.h.orig 2016-02-14 22:49:46 UTC
2	+++ plugin.h
3	@@ -21,8 +21,8 @@ typedef struct mupdf_page_s
4	{
5	fz_page* page; /*< Reference to the mupdf page /
6	fz_context* ctx; /*< Context /
7	- fz_text_sheet* sheet; /*< Text sheet /
8	- fz_text_page* text; /*< Page text /
9	+ fz_stext_sheet* sheet; /*< Text sheet /
10	+ fz_stext_page* text; /*< Page text /
11	fz_rect bbox; /*< Bbox /
12	bool extracted_text; /*< If text has already been extracted /
13	} mupdf_page_t;