Hi,
i just updated x11/girara to fix a gtk3 issue, and realized there was a
pending update for zathura and its plugins... please test it if you use
it (i only use the poppler plugin). It also removes all mupdf compat
patches which were merged usptream.
Landry
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/core/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- core/Makefile 17 Oct 2016 08:37:44 -0000 1.9
+++ core/Makefile 1 Mar 2017 16:07:53 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.9 2016/10/17 08:37:44 sthen Exp $
-V = 0.3.6
-REVISION = 0
+V = 0.3.7
COMMENT = document viewer for PDF and other formats with a
vi-like UI
DISTNAME = zathura-${V}
CATEGORIES = textproc x11
@@ -24,7 +23,7 @@
LIB_DEPENDS = databases/sqlite3 \
graphics/gdk-pixbuf2 \
devel/libmagic \
- x11/girara>=0.2.3
+ x11/girara>=0.2.7
MAKE_FLAGS = MANPREFIX=${PREFIX}/man \
DESKTOPPREFIX=${PREFIX}/share/applications \
Index: core/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/core/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- core/distinfo 16 Oct 2016 13:50:35 -0000 1.4
+++ core/distinfo 1 Mar 2017 16:07:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-0.3.6.tar.gz) = CGqL4l1Tj8ZTn77o8B7PFtJYGd+q1QzS29hOMBUsyzs=
-SIZE (zathura-0.3.6.tar.gz) = 169560
+SHA256 (zathura-0.3.7.tar.gz) = Iq//ifQJPyL7ghiEF/+b+paVsZpP6JTcoFt8ghs5D/A=
+SIZE (zathura-0.3.7.tar.gz) = 174095
Index: plugins/cb/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/cb/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- plugins/cb/Makefile 16 Oct 2016 13:51:21 -0000 1.5
+++ plugins/cb/Makefile 1 Mar 2017 16:07:53 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.5 2016/10/16 13:51:21 sthen Exp $
-V = 0.1.5
+V = 0.1.6
COMMENT = comic book plugin for zathura
DISTNAME = zathura-cb-${V}
Index: plugins/cb/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/cb/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- plugins/cb/distinfo 16 Oct 2016 13:51:21 -0000 1.2
+++ plugins/cb/distinfo 1 Mar 2017 16:07:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-cb-0.1.5.tar.gz) = N19pEr15ZIYDutUcNjXOKOrKe/TfUhwA/5Zz2bT/av0=
-SIZE (zathura-cb-0.1.5.tar.gz) = 7193
+SHA256 (zathura-cb-0.1.6.tar.gz) = iI6VQh4TuUTRlgT6sSnlmSY29ATn7SB1HU9QVG8lNbo=
+SIZE (zathura-cb-0.1.6.tar.gz) = 7205
Index: plugins/djvu/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/djvu/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- plugins/djvu/Makefile 16 Oct 2016 13:51:21 -0000 1.5
+++ plugins/djvu/Makefile 1 Mar 2017 16:07:53 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.5 2016/10/16 13:51:21 sthen Exp $
-V = 0.2.5
+V = 0.2.6
COMMENT = djvu plugin for zathura
DISTNAME = zathura-djvu-${V}
Index: plugins/djvu/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/djvu/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- plugins/djvu/distinfo 16 Oct 2016 13:51:21 -0000 1.2
+++ plugins/djvu/distinfo 1 Mar 2017 16:07:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-djvu-0.2.5.tar.gz) =
CLcRCvE+F6nSIb16D307R5s+MWMdeLxsXvtGJxopnA0=
-SIZE (zathura-djvu-0.2.5.tar.gz) = 11137
+SHA256 (zathura-djvu-0.2.6.tar.gz) =
rv72o7cC+gYUXxbyVZSQ9NltMga6/U4MeKwYR4jKwF8=
+SIZE (zathura-djvu-0.2.6.tar.gz) = 11137
Index: plugins/mupdf/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/mupdf/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- plugins/mupdf/Makefile 13 Dec 2016 13:15:17 -0000 1.9
+++ plugins/mupdf/Makefile 1 Mar 2017 16:07:53 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.9 2016/12/13 13:15:17 sthen Exp $
-V = 0.3.0
-REVISION = 0
+V = 0.3.1
COMMENT = mupdf pdf plugin for zathura
DISTNAME = zathura-pdf-mupdf-${V}
@@ -16,5 +15,6 @@
WANTLIB += atk-1.0 cairo cairo-gobject crypto gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 girara-gtk3 glib-2.0 gobject-2.0 gtk-3 intl
WANTLIB += jbig2dec jpeg mupdf openjp2 pango-1.0 pangocairo-1.0
+WANTLIB += freetype harfbuzz z
.include <bsd.port.mk>
Index: plugins/mupdf/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/mupdf/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- plugins/mupdf/distinfo 16 Oct 2016 13:51:21 -0000 1.3
+++ plugins/mupdf/distinfo 1 Mar 2017 16:07:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-pdf-mupdf-0.3.0.tar.gz) =
R4y50VYtCOCW6+xKbbkRbWFqNTYmAZfCooonchcfcsg=
-SIZE (zathura-pdf-mupdf-0.3.0.tar.gz) = 9914
+SHA256 (zathura-pdf-mupdf-0.3.1.tar.gz) =
2bntwCl7nt21MCCXbyh7To2zPt74z6BH1w4CZT6y+Bs=
+SIZE (zathura-pdf-mupdf-0.3.1.tar.gz) = 9755
Index: plugins/mupdf/patches/patch-config_mk
===================================================================
RCS file: plugins/mupdf/patches/patch-config_mk
diff -N plugins/mupdf/patches/patch-config_mk
--- plugins/mupdf/patches/patch-config_mk 16 Oct 2016 13:51:21 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-config_mk,v 1.1 2016/10/16 13:51:21 sthen Exp $
-
-From e3e49d206fbe5761c53a85b9499c940a0d718c8a Mon Sep 17 00:00:00 2001
-From: Christian Hesse <m...@eworm.de>
-Date: Thu, 28 Apr 2016 09:59:31 +0200
-Subject: [PATCH] mupdf 1.9 compatibility
-
---- config.mk.orig Sun Feb 14 22:49:46 2016
-+++ config.mk Sun Oct 16 13:48:04 2016
-@@ -32,7 +32,7 @@ endif
- OPENSSL_INC ?= $(shell pkg-config --cflags libcrypto)
- OPENSSL_LIB ?= $(shell pkg-config --libs libcrypto)
-
--MUPDF_LIB ?= -lmupdf -lmujs
-+MUPDF_LIB ?= -lmupdf -lmupdfthird
-
- INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC}
- LIBS = ${GTK_LIB} ${GIRARA_LIB} ${MUPDF_LIB} ${OPENSSL_LIB} -ljbig2dec
-lopenjp2 -ljpeg
Index: plugins/mupdf/patches/patch-document_c
===================================================================
RCS file: plugins/mupdf/patches/patch-document_c
diff -N plugins/mupdf/patches/patch-document_c
--- plugins/mupdf/patches/patch-document_c 13 Dec 2016 13:15:18 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-document_c,v 1.3 2016/12/13 13:15:18 sthen Exp $
-
-From e3e49d206fbe5761c53a85b9499c940a0d718c8a Mon Sep 17 00:00:00 2001
-From: Christian Hesse <m...@eworm.de>
-Date: Thu, 28 Apr 2016 09:59:31 +0200
-Subject: [PATCH] mupdf 1.9 compatibility
-
-From 518fd77c351fa1bac37679e195dc14fa76c8e895 Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <m...@pwmt.org>
-Date: Thu, 24 Nov 2016 00:51:45 +0100
-Subject: [PATCH] Make compatible to mupdf 1.10
-
---- document.c.orig Tue Dec 13 13:11:06 2016
-+++ document.c Tue Dec 13 13:11:00 2016
-@@ -3,7 +3,6 @@
- #define _POSIX_C_SOURCE 1
-
- #include <mupdf/fitz.h>
--#include <mupdf/xps.h>
- #include <mupdf/pdf.h>
-
- #include <glib-2.0/glib.h>
-@@ -109,12 +108,12 @@ pdf_document_save_as(zathura_document_t* document, mup
- }
-
- fz_try (mupdf_document->ctx) {
-- /* fz_write_document claims to accepts NULL as third argument but doesn't.
-+ /* pdf_save_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_write_options opts = { 0 }; /* just use the default options */
-+ pdf_save_document(mupdf_document->ctx, (pdf_document*)
mupdf_document->document, (char*) path, &opts);
- } fz_catch (mupdf_document->ctx) {
- return ZATHURA_ERROR_UNKNOWN;
- }
Index: plugins/mupdf/patches/patch-image_c
===================================================================
RCS file: plugins/mupdf/patches/patch-image_c
diff -N plugins/mupdf/patches/patch-image_c
--- plugins/mupdf/patches/patch-image_c 13 Dec 2016 13:15:18 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-image_c,v 1.3 2016/12/13 13:15:18 sthen Exp $
-
-From e3e49d206fbe5761c53a85b9499c940a0d718c8a Mon Sep 17 00:00:00 2001
-From: Christian Hesse <m...@eworm.de>
-Date: Thu, 28 Apr 2016 09:59:31 +0200
-Subject: [PATCH] mupdf 1.9 compatibility
-
-From 518fd77c351fa1bac37679e195dc14fa76c8e895 Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <m...@pwmt.org>
-Date: Thu, 24 Nov 2016 00:51:45 +0100
-Subject: [PATCH] Make compatible to mupdf 1.10
-
---- image.c.orig Tue Dec 13 13:11:06 2016
-+++ image.c Tue Dec 13 13:11:00 2016
-@@ -93,7 +93,7 @@ pdf_page_image_get_cairo(zathura_page_t* page, mupdf_p
- 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, NULL, NULL,
0, 0);
- if (pixmap == NULL) {
- goto error_free;
- }
Index: plugins/mupdf/patches/patch-index_c
===================================================================
RCS file: plugins/mupdf/patches/patch-index_c
diff -N plugins/mupdf/patches/patch-index_c
--- plugins/mupdf/patches/patch-index_c 13 Dec 2016 13:15:18 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,113 +0,0 @@
-$OpenBSD: patch-index_c,v 1.3 2016/12/13 13:15:18 sthen Exp $
-
-From 518fd77c351fa1bac37679e195dc14fa76c8e895 Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <m...@pwmt.org>
-Date: Thu, 24 Nov 2016 00:51:45 +0100
-Subject: [PATCH] Make compatible to mupdf 1.10
-
---- index.c.orig Sun Feb 14 22:49:46 2016
-+++ index.c Tue Dec 13 13:11:00 2016
-@@ -6,7 +6,8 @@
-
- #include "plugin.h"
-
--static void build_index(fz_outline* outline, girara_tree_node_t* root);
-+static void build_index(fz_context* ctx, fz_document* document, fz_outline*
-+ outline, girara_tree_node_t* root);
-
- girara_tree_node_t*
- pdf_document_index_generate(zathura_document_t* document, mupdf_document_t*
mupdf_document, zathura_error_t* error)
-@@ -29,7 +30,7 @@ pdf_document_index_generate(zathura_document_t* docume
-
- /* generate index */
- girara_tree_node_t* root =
girara_node_new(zathura_index_element_new("ROOT"));
-- build_index(outline, root);
-+ build_index(mupdf_document->ctx, mupdf_document->document, outline, root);
-
- /* free outline */
- fz_drop_outline(mupdf_document->ctx, outline);
-@@ -38,7 +39,7 @@ pdf_document_index_generate(zathura_document_t* docume
- }
-
- static void
--build_index(fz_outline* outline, girara_tree_node_t* root)
-+build_index(fz_context* ctx, fz_document* document, fz_outline* outline,
girara_tree_node_t* root)
- {
- if (outline == NULL || root == NULL) {
- return;
-@@ -50,49 +51,24 @@ build_index(fz_outline* outline, girara_tree_node_t* r
- zathura_link_type_t type = ZATHURA_LINK_INVALID;
- zathura_rectangle_t rect = { .x1 = 0, .y1 = 0, .x2 = 0, .y2
= 0 };
-
-- switch (outline->dest.kind) {
-- case FZ_LINK_NONE:
-- type = ZATHURA_LINK_NONE;
-- break;
-- case FZ_LINK_URI:
-+ if (fz_is_external_link(ctx, outline->uri) == 1) {
-+ if (strstr(outline->uri, "file://") == outline->uri) {
-+ type = ZATHURA_LINK_GOTO_REMOTE;
-+ target.value = outline->uri;
-+ } else {
- type = ZATHURA_LINK_URI;
-- target.value = outline->dest.ld.uri.uri;
-- break;
-- case FZ_LINK_GOTO:
-- type = ZATHURA_LINK_GOTO_DEST;
-- target.page_number = outline->dest.ld.gotor.page;
-- target.destination_type = ZATHURA_LINK_DESTINATION_XYZ;
-- target.left = 0;
-- target.top = 0;
-- target.scale = 0.0;
-- {
-- int gflags = outline->dest.ld.gotor.flags;
-- if (gflags & fz_link_flag_l_valid) {
-- target.left = outline->dest.ld.gotor.lt.x;
-- }
-- if (gflags & fz_link_flag_t_valid) {
-- target.top = outline->dest.ld.gotor.lt.y;
-- }
-- /* if (gflags & fz_link_flag_r_is_zoom) { */
-- /* target.scale = outline->dest.ld.gotor.rb.x; */
-- /* } */
-- }
-- break;
-- case FZ_LINK_LAUNCH:
-- type = ZATHURA_LINK_LAUNCH;
-- target.value = outline->dest.ld.launch.file_spec;
-- break;
-- case FZ_LINK_NAMED:
-- type = ZATHURA_LINK_NAMED;
-- target.value = outline->dest.ld.named.named;
-- break;
-- case FZ_LINK_GOTOR:
-- type = ZATHURA_LINK_GOTO_REMOTE;
-- target.value = outline->dest.ld.gotor.file_spec;
-- break;
-- default:
-- outline = outline->next; // TODO: Don't skip unknown type
-- continue;
-+ target.value = outline->uri;
-+ }
-+ } else {
-+ float x = 0;
-+ float y = 0;
-+
-+ 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.left = x;
-+ target.top = y;
-+ target.scale = 0.0;
- }
-
- index_element->link = zathura_link_new(type, rect, target);
-@@ -104,7 +80,7 @@ build_index(fz_outline* outline, girara_tree_node_t* r
- girara_tree_node_t* node = girara_node_append_data(root, index_element);
-
- if (outline->down != NULL) {
-- build_index(outline->down, node);
-+ build_index(ctx, document, outline->down, node);
- }
-
- outline = outline->next;
Index: plugins/mupdf/patches/patch-links_c
===================================================================
RCS file: plugins/mupdf/patches/patch-links_c
diff -N plugins/mupdf/patches/patch-links_c
--- plugins/mupdf/patches/patch-links_c 13 Dec 2016 13:15:18 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,86 +0,0 @@
-$OpenBSD: patch-links_c,v 1.3 2016/12/13 13:15:18 sthen Exp $
-
-From 518fd77c351fa1bac37679e195dc14fa76c8e895 Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <m...@pwmt.org>
-Date: Thu, 24 Nov 2016 00:51:45 +0100
-Subject: [PATCH] Make compatible to mupdf 1.10
-
---- links.c.orig Sun Feb 14 22:49:46 2016
-+++ links.c Tue Dec 13 13:11:00 2016
-@@ -43,58 +43,30 @@ pdf_page_links_get(zathura_page_t* page, mupdf_page_t*
- zathura_link_type_t type = ZATHURA_LINK_INVALID;
- zathura_link_target_t target = { 0 };
-
-- char* buffer = NULL;
-- switch (link->dest.kind) {
-- case FZ_LINK_NONE:
-- type = ZATHURA_LINK_NONE;
-- break;
-- case FZ_LINK_URI:
-+ if (fz_is_external_link(mupdf_document->ctx, link->uri) == 1) {
-+ if (strstr(link->uri, "file://") == link->uri) {
-+ type = ZATHURA_LINK_GOTO_REMOTE;
-+ target.value = link->uri;
-+ } else {
- type = ZATHURA_LINK_URI;
-- target.value = link->dest.ld.uri.uri;
-- break;
-- case FZ_LINK_GOTO:
-- type = ZATHURA_LINK_GOTO_DEST;
-- target.page_number = link->dest.ld.gotor.page;
-- target.destination_type = ZATHURA_LINK_DESTINATION_XYZ;
-- target.left = 0;
-- target.top = 0;
-- target.scale = 0.0;
-- {
-- int gflags = link->dest.ld.gotor.flags;
-- if (gflags & fz_link_flag_l_valid) {
-- target.left = link->dest.ld.gotor.lt.x;
-- }
-- if (gflags & fz_link_flag_t_valid) {
-- target.top = link->dest.ld.gotor.lt.y;
-- }
-- /* if (gflags & fz_link_flag_r_is_zoom) { */
-- /* target.scale = link->dest.ld.gotor.rb.x; */
-- /* } */
-- }
-- break;
-- case FZ_LINK_LAUNCH:
-- type = ZATHURA_LINK_LAUNCH;
-- target.value = link->dest.ld.launch.file_spec;
-- break;
-- case FZ_LINK_NAMED:
-- type = ZATHURA_LINK_NAMED;
-- target.value = link->dest.ld.named.named;
-- break;
-- case FZ_LINK_GOTOR:
-- type = ZATHURA_LINK_GOTO_REMOTE;
-- target.value = link->dest.ld.gotor.file_spec;
-- break;
-- default:
-- continue;
-+ target.value = link->uri;
-+ }
-+ } else {
-+ float x = 0;
-+ float y = 0;
-+
-+ 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.left = x;
-+ target.top = y;
-+ target.scale = 0.0;
- }
-
- zathura_link_t* zathura_link = zathura_link_new(type, position, target);
- if (zathura_link != NULL) {
- girara_list_append(list, zathura_link);
-- }
--
-- if (buffer != NULL) {
-- g_free(buffer);
- }
- }
-
Index: plugins/mupdf/patches/patch-page_c
===================================================================
RCS file: plugins/mupdf/patches/patch-page_c
diff -N plugins/mupdf/patches/patch-page_c
--- plugins/mupdf/patches/patch-page_c 13 Dec 2016 13:15:18 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-$OpenBSD: patch-page_c,v 1.3 2016/12/13 13:15:18 sthen Exp $
-
-From e3e49d206fbe5761c53a85b9499c940a0d718c8a Mon Sep 17 00:00:00 2001
-From: Christian Hesse <m...@eworm.de>
-Date: Thu, 28 Apr 2016 09:59:31 +0200
-Subject: [PATCH] mupdf 1.9 compatibility
-
-From 518fd77c351fa1bac37679e195dc14fa76c8e895 Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <m...@pwmt.org>
-Date: Thu, 24 Nov 2016 00:51:45 +0100
-Subject: [PATCH] Make compatible to mupdf 1.10
-
---- page.c.orig Tue Dec 13 13:11:06 2016
-+++ page.c Tue Dec 13 13:11:00 2016
-@@ -43,12 +43,14 @@ pdf_page_init(zathura_page_t* page)
- /* setup text */
- mupdf_page->extracted_text = false;
-
-- mupdf_page->text = fz_new_text_page(mupdf_page->ctx);
-+ fz_rect mediabox;
-+ mupdf_page->text = fz_new_stext_page(mupdf_page->ctx,
-+ fz_bound_page(mupdf_page->ctx, mupdf_page->page, &mediabox));
- 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 +76,11 @@ pdf_page_clear(zathura_page_t* page, mupdf_page_t* 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) {
Index: plugins/mupdf/patches/patch-plugin_h
===================================================================
RCS file: plugins/mupdf/patches/patch-plugin_h
diff -N plugins/mupdf/patches/patch-plugin_h
--- plugins/mupdf/patches/patch-plugin_h 16 Oct 2016 13:51:21 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-plugin_h,v 1.1 2016/10/16 13:51:21 sthen Exp $
-
-From e3e49d206fbe5761c53a85b9499c940a0d718c8a Mon Sep 17 00:00:00 2001
-From: Christian Hesse <m...@eworm.de>
-Date: Thu, 28 Apr 2016 09:59:31 +0200
-Subject: [PATCH] mupdf 1.9 compatibility
-
---- plugin.h.orig Sun Feb 14 22:49:46 2016
-+++ plugin.h Sun Oct 16 13:48:04 2016
-@@ -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;
Index: plugins/mupdf/patches/patch-render_c
===================================================================
RCS file: plugins/mupdf/patches/patch-render_c
diff -N plugins/mupdf/patches/patch-render_c
--- plugins/mupdf/patches/patch-render_c 13 Dec 2016 13:15:18 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-render_c,v 1.3 2016/12/13 13:15:18 sthen Exp $
-
-From 518fd77c351fa1bac37679e195dc14fa76c8e895 Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <m...@pwmt.org>
-Date: Thu, 24 Nov 2016 00:51:45 +0100
-Subject: [PATCH] Make compatible to mupdf 1.10
-
---- render.c.orig Sun Feb 14 22:49:46 2016
-+++ render.c Tue Dec 13 13:11:00 2016
-@@ -20,7 +20,7 @@ pdf_page_render_to_buffer(mupdf_document_t* mupdf_docu
- return ZATHURA_ERROR_UNKNOWN;
- }
-
-- fz_display_list* display_list = fz_new_display_list(mupdf_page->ctx);
-+ fz_display_list* display_list = fz_new_display_list(mupdf_page->ctx, NULL);
- fz_device* device = fz_new_list_device(mupdf_page->ctx,
display_list);
-
- fz_try (mupdf_document->ctx) {
-@@ -37,10 +37,10 @@ pdf_page_render_to_buffer(mupdf_document_t* mupdf_docu
- fz_rect rect = { .x1 = page_width, .y1 = page_height };
-
- fz_colorspace* colorspace = fz_device_bgr(mupdf_document->ctx);
-- fz_pixmap* pixmap = fz_new_pixmap_with_bbox_and_data(mupdf_page->ctx,
colorspace, &irect, image);
-+ fz_pixmap* pixmap = fz_new_pixmap_with_bbox_and_data(mupdf_page->ctx,
colorspace, &irect, 1, image);
- fz_clear_pixmap_with_value(mupdf_page->ctx, pixmap, 0xFF);
-
-- device = fz_new_draw_device(mupdf_page->ctx, pixmap);
-+ device = fz_new_draw_device(mupdf_page->ctx, NULL, pixmap);
- fz_run_display_list(mupdf_page->ctx, display_list, device, &fz_identity,
&rect, NULL);
- fz_drop_device(mupdf_page->ctx, device);
-
Index: plugins/mupdf/patches/patch-search_c
===================================================================
RCS file: plugins/mupdf/patches/patch-search_c
diff -N plugins/mupdf/patches/patch-search_c
--- plugins/mupdf/patches/patch-search_c 16 Oct 2016 13:51:21 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-search_c,v 1.2 2016/10/16 13:51:21 sthen Exp $
-
-From e3e49d206fbe5761c53a85b9499c940a0d718c8a Mon Sep 17 00:00:00 2001
-From: Christian Hesse <m...@eworm.de>
-Date: Thu, 28 Apr 2016 09:59:31 +0200
-Subject: [PATCH] mupdf 1.9 compatibility
-
---- search.c.orig Sun Feb 14 22:49:46 2016
-+++ search.c Sun Oct 16 13:48:04 2016
-@@ -40,7 +40,7 @@ pdf_page_search_text(zathura_page_t* page, mupdf_page_
- }
-
- 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++) {
Index: plugins/mupdf/patches/patch-utils_c
===================================================================
RCS file: plugins/mupdf/patches/patch-utils_c
diff -N plugins/mupdf/patches/patch-utils_c
--- plugins/mupdf/patches/patch-utils_c 13 Dec 2016 13:15:18 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-utils_c,v 1.3 2016/12/13 13:15:18 sthen Exp $
-
-From e3e49d206fbe5761c53a85b9499c940a0d718c8a Mon Sep 17 00:00:00 2001
-From: Christian Hesse <m...@eworm.de>
-Date: Thu, 28 Apr 2016 09:59:31 +0200
-Subject: [PATCH] mupdf 1.9 compatibility
-
-From 518fd77c351fa1bac37679e195dc14fa76c8e895 Mon Sep 17 00:00:00 2001
-From: Moritz Lipp <m...@pwmt.org>
-Date: Thu, 24 Nov 2016 00:51:45 +0100
-Subject: [PATCH] Make compatible to mupdf 1.10
-
---- utils.c.orig Tue Dec 13 13:11:06 2016
-+++ utils.c Tue Dec 13 13:11:00 2016
-@@ -14,7 +14,7 @@ mupdf_page_extract_text(mupdf_document_t* mupdf_docume
- 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, NULL);
-
- /* Disable FZ_IGNORE_IMAGE to collect image blocks */
- fz_disable_device_hints(mupdf_page->ctx, text_device, FZ_IGNORE_IMAGE);
Index: plugins/poppler/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/poppler/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- plugins/poppler/Makefile 16 Oct 2016 13:51:21 -0000 1.6
+++ plugins/poppler/Makefile 1 Mar 2017 16:07:53 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.6 2016/10/16 13:51:21 sthen Exp $
-V = 0.2.6
+V = 0.2.7
COMMENT = poppler pdf plugin for zathura
DISTNAME = zathura-pdf-poppler-${V}
Index: plugins/poppler/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/poppler/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- plugins/poppler/distinfo 16 Oct 2016 13:51:21 -0000 1.2
+++ plugins/poppler/distinfo 1 Mar 2017 16:07:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-pdf-poppler-0.2.6.tar.gz) =
0esMek9kfBQRkqLXv2ZBO5xfGEJGOUerh6ih7c+OWNU=
-SIZE (zathura-pdf-poppler-0.2.6.tar.gz) = 10024
+SHA256 (zathura-pdf-poppler-0.2.7.tar.gz) =
mF5OTc5hQ/39JG54sMy+8NMriAnGpPCLtTovffvTg8A=
+SIZE (zathura-pdf-poppler-0.2.7.tar.gz) = 9610
Index: plugins/ps/Makefile
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/ps/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- plugins/ps/Makefile 16 Oct 2016 13:51:21 -0000 1.6
+++ plugins/ps/Makefile 1 Mar 2017 16:07:53 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.6 2016/10/16 13:51:21 sthen Exp $
-V = 0.2.3
+V = 0.2.4
COMMENT = spectre postscript plugin for zathura
DISTNAME = zathura-ps-${V}
Index: plugins/ps/distinfo
===================================================================
RCS file: /cvs/ports/textproc/zathura/plugins/ps/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- plugins/ps/distinfo 16 Oct 2016 13:51:21 -0000 1.2
+++ plugins/ps/distinfo 1 Mar 2017 16:07:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (zathura-ps-0.2.3.tar.gz) = qe73SxKuyHrCxDCfEtD5yDsij+ZKeI7kayw6fJF3mqM=
-SIZE (zathura-ps-0.2.3.tar.gz) = 5973
+SHA256 (zathura-ps-0.2.4.tar.gz) = +5/H6ed2X7CqKTW5P/NmMzLQ2ITfNejQsep+Sx+gq9s=
+SIZE (zathura-ps-0.2.4.tar.gz) = 5980
