<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[150686] trunk/dports/office/zathura-plugin-pdf-mupdf</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/150686">150686</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-07-26 11:50:23 -0700 (Tue, 26 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>zathura-plugin-pdf-mupdf: maintainer update to version 0.3.0 (#51918, #50259).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsofficezathurapluginpdfmupdfPortfile">trunk/dports/office/zathura-plugin-pdf-mupdf/Portfile</a></li>
<li><a href="#trunkdportsofficezathurapluginpdfmupdffilespatchMakefilediff">trunk/dports/office/zathura-plugin-pdf-mupdf/files/patch-Makefile.diff</a></li>
<li><a href="#trunkdportsofficezathurapluginpdfmupdffilespatchconfigmkdiff">trunk/dports/office/zathura-plugin-pdf-mupdf/files/patch-config.mk.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsofficezathurapluginpdfmupdffilespatchmupdfdiff">trunk/dports/office/zathura-plugin-pdf-mupdf/files/patch-mupdf.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsofficezathurapluginpdfmupdfPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/office/zathura-plugin-pdf-mupdf/Portfile (150685 => 150686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/office/zathura-plugin-pdf-mupdf/Portfile 2016-07-26 18:06:17 UTC (rev 150685)
+++ trunk/dports/office/zathura-plugin-pdf-mupdf/Portfile 2016-07-26 18:50:23 UTC (rev 150686)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name zathura-plugin-pdf-mupdf
</span><del>-version 0.2.8
</del><ins>+version 0.3.0
</ins><span class="cx"> categories office
</span><span class="cx"> platforms darwin
</span><span class="cx"> license zlib
</span><span class="lines">@@ -21,18 +21,22 @@
</span><span class="cx"> master_sites http://pwmt.org/projects/zathura-pdf-mupdf/download/
</span><span class="cx"> distname zathura-pdf-mupdf-${version}
</span><span class="cx">
</span><del>-checksums rmd160 c5fb22a9b571ae2086e43d5f56a42f092002f2a9 \
- sha256 9f8b92762cdad14a2a587744c758edc0e1003be6a0c1511486065bdc91a66910
</del><ins>+checksums rmd160 377e7848a5ea7f43f020e131aacc24c51453bf8f \
+ sha256 478cb9d1562d08e096ebec4a6db9116d616a3536260197c2a28a2772171f72c8
</ins><span class="cx">
</span><del>-patchfiles patch-Makefile.diff \
</del><ins>+patch.pre_args -p1
+patchfiles patch-mupdf.diff \
+ patch-Makefile.diff \
</ins><span class="cx"> patch-config.mk.diff
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><del>- path:lib/libmujs.a:mupdf
</del><ins>+ path:lib/libmupdfthird.a:mupdf
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:mupdf \
</span><span class="cx"> port:openjpeg \
</span><ins>+ port:freetype \
+ port:harfbuzz \
</ins><span class="cx"> path:lib/libgirara-gtk3.dylib:girara \
</span><span class="cx"> path:bin/zathura:zathura
</span><span class="cx">
</span><span class="lines">@@ -48,8 +52,8 @@
</span><span class="cx"> LDFLAGS="[get_canonical_archflags ld]" \
</span><span class="cx"> VERBOSE=1
</span><span class="cx">
</span><del>-eval destroot.env ${build.env}
-eval destroot.args ${build.args}
</del><ins>+destroot.env {*}${build.env}
+destroot.args {*}${build.args}
</ins><span class="cx">
</span><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span></span></pre></div>
<a id="trunkdportsofficezathurapluginpdfmupdffilespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/office/zathura-plugin-pdf-mupdf/files/patch-Makefile.diff (150685 => 150686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/office/zathura-plugin-pdf-mupdf/files/patch-Makefile.diff 2016-07-26 18:06:17 UTC (rev 150685)
+++ trunk/dports/office/zathura-plugin-pdf-mupdf/files/patch-Makefile.diff 2016-07-26 18:50:23 UTC (rev 150686)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><del>---- Makefile.orig 2015-05-27 22:57:06.000000000 -0500
-+++ Makefile 2015-05-27 22:57:14.000000000 -0500
-@@ -18,7 +18,7 @@
</del><ins>+diff --git a/Makefile b/Makefile
+index 1fb42e2..423657a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,7 +18,7 @@ CPPFLAGS += "-DVERSION_MAJOR=${VERSION_MAJOR}"
</ins><span class="cx"> CPPFLAGS += "-DVERSION_MINOR=${VERSION_MINOR}"
</span><span class="cx"> CPPFLAGS += "-DVERSION_REV=${VERSION_REV}"
</span><span class="cx">
</span><span class="lines">@@ -9,7 +11,7 @@
</span><span class="cx">
</span><span class="cx"> zathura-version-check:
</span><span class="cx"> ifneq ($(ZATHURA_VERSION_CHECK), 0)
</span><del>-@@ -46,16 +46,16 @@
</del><ins>+@@ -46,19 +46,19 @@ options:
</ins><span class="cx"> ${OBJECTS}: config.mk zathura-version-check
</span><span class="cx"> ${DOBJECTS}: config.mk zathura-version-check
</span><span class="cx">
</span><span class="lines">@@ -19,17 +21,22 @@
</span><span class="cx"> - $(QUIET)${CC} -shared ${LDFLAGS} -o $@ $(OBJECTS) ${LIBS}
</span><span class="cx"> + $(QUIET)${CC} -Wl,-dylib_install_name,${PLUGIN}.dylib -Wl,-bundle_loader,${PREFIX}/bin/zathura -bundle ${LDFLAGS} -o $@ $(OBJECTS) ${LIBS}
</span><span class="cx">
</span><del>- ${PLUGIN}-debug.so: ${DOBJECTS}
</del><ins>+-${PLUGIN}-debug.so: ${DOBJECTS}
++${PLUGIN}-debug.dylib: ${DOBJECTS}
</ins><span class="cx"> $(ECHO) LD $@
</span><span class="cx"> $(QUIET)${CC} -shared ${LDFLAGS} -o $@ $(DOBJECTS) ${LIBS}
</span><span class="cx">
</span><span class="cx"> clean:
</span><span class="cx"> - $(QUIET)rm -rf ${OBJECTS} ${DOBJECTS} $(PLUGIN).so $(PLUGIN)-debug.so \
</span><del>-+ $(QUIET)rm -rf ${OBJECTS} ${DOBJECTS} $(PLUGIN).dylib $(PLUGIN)-debug.so \
</del><ins>++ $(QUIET)rm -rf ${OBJECTS} ${DOBJECTS} $(PLUGIN).dylib $(PLUGIN)-debug.dylib \
</ins><span class="cx"> doc .depend ${PROJECT}-${VERSION}.tar.gz zathura-version-check
</span><span class="cx">
</span><del>- debug: options ${PLUGIN}-debug.so
-@@ -75,18 +75,18 @@
</del><ins>+-debug: options ${PLUGIN}-debug.so
++debug: options ${PLUGIN}-debug.dylib
+
+ dist: clean
+ $(QUIET)mkdir -p ${PROJECT}-${VERSION}
+@@ -75,18 +75,18 @@ doc: clean
</ins><span class="cx"> install: all
</span><span class="cx"> $(ECHO) installing ${PLUGIN} plugin
</span><span class="cx"> $(QUIET)mkdir -p ${DESTDIR}${PLUGINDIR}
</span><span class="lines">@@ -44,11 +51,11 @@
</span><span class="cx"> - $(QUIET)rm -f ${DESTDIR}${PLUGINDIR}/${PLUGIN}.so
</span><span class="cx"> - $(QUIET)rmdir --ignore-fail-on-non-empty ${DESTDIR}${PLUGINDIR} 2> /dev/null
</span><span class="cx"> + $(QUIET)rm -f ${DESTDIR}${PLUGINDIR}/${PLUGIN}.dylib
</span><del>-+ $(QUIET)-rmdir ${DESTDIR}${PLUGINDIR} 2> /dev/null
</del><ins>++ $(QUIET)rmdir ${DESTDIR}${PLUGINDIR} 2> /dev/null
</ins><span class="cx"> $(ECHO) removing desktop file
</span><span class="cx"> $(QUIET)rm -f ${DESTDIR}${DESKTOPPREFIX}/${PROJECT}.desktop
</span><span class="cx"> - $(QUIET)rmdir --ignore-fail-on-non-empty ${DESTDIR}${DESKTOPPREFIX} 2> /dev/null
</span><del>-+ $(QUIET)-rmdir ${DESTDIR}${DESKTOPPREFIX} 2> /dev/null
</del><ins>++ $(QUIET)rmdir ${DESTDIR}${DESKTOPPREFIX} 2> /dev/null
</ins><span class="cx">
</span><span class="cx"> -include $(wildcard .depend/*.dep)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsofficezathurapluginpdfmupdffilespatchconfigmkdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/office/zathura-plugin-pdf-mupdf/files/patch-config.mk.diff (150685 => 150686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/office/zathura-plugin-pdf-mupdf/files/patch-config.mk.diff 2016-07-26 18:06:17 UTC (rev 150685)
+++ trunk/dports/office/zathura-plugin-pdf-mupdf/files/patch-config.mk.diff 2016-07-26 18:50:23 UTC (rev 150686)
</span><span class="lines">@@ -1,11 +1,23 @@
</span><del>---- config.mk.original 2015-05-27 23:48:00.000000000 -0500
-+++ config.mk 2015-05-27 23:48:07.000000000 -0500
-@@ -35,7 +35,7 @@
- MUPDF_LIB ?= -lmupdf -lmujs
</del><ins>+diff --git a/config.mk b/config.mk
+index 6407ae6..404f4f1 100644
+--- a/config.mk
++++ b/config.mk
+@@ -32,10 +32,16 @@ endif
+ OPENSSL_INC ?= $(shell pkg-config --cflags libcrypto)
+ OPENSSL_LIB ?= $(shell pkg-config --libs libcrypto)
</ins><span class="cx">
</span><del>- INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC}
</del><ins>++FREETYPE_INC ?= $(shell pkg-config --cflags freetype2)
++FREETYPE_LIB ?= $(shell pkg-config --libs freetype2)
++
++HARFBUZZ_INC ?= $(shell pkg-config --cflags harfbuzz)
++HARFBUZZ_LIB ?= $(shell pkg-config --libs harfbuzz)
++
+ MUPDF_LIB ?= -lmupdf -lmupdfthird
+
+-INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC}
</ins><span class="cx"> -LIBS = ${GTK_LIB} ${GIRARA_LIB} ${MUPDF_LIB} ${OPENSSL_LIB} -ljbig2dec -lopenjp2 -ljpeg
</span><del>-+LIBS = ${GTK_LIB} ${GIRARA_LIB} ${MUPDF_LIB} ${OPENSSL_LIB} -ljbig2dec -lopenjp2 -ljpeg -lz
</del><ins>++INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC} ${FREETYPE_INC} ${HARFBUZZ_INC}
++LIBS = ${GTK_LIB} ${GIRARA_LIB} ${MUPDF_LIB} ${OPENSSL_LIB} ${FREETYPE_LIB} ${HARFBUZZ_LIB} -ljbig2dec -lopenjp2 -ljpeg -lz
</ins><span class="cx">
</span><del>- # flags
</del><ins>+ # compiler flags
</ins><span class="cx"> CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
</span></span></pre></div>
<a id="trunkdportsofficezathurapluginpdfmupdffilespatchmupdfdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/office/zathura-plugin-pdf-mupdf/files/patch-mupdf.diff (0 => 150686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/office/zathura-plugin-pdf-mupdf/files/patch-mupdf.diff (rev 0)
+++ trunk/dports/office/zathura-plugin-pdf-mupdf/files/patch-mupdf.diff 2016-07-26 18:50:23 UTC (rev 150686)
</span><span class="lines">@@ -0,0 +1,129 @@
</span><ins>+diff --git a/AUTHORS b/AUTHORS
+index f5f8430..371ebf1 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -5,5 +5,6 @@ Sebastian Ramacher <s.ramacher@gmx.at>
+
+ Other contributors are (in alphabetical order):
+
++Christian Hesse <mail@eworm.de>
+ Pavel Borzenkov <pavel.borzenkov@gmail.com>
+ William Skeith <wes@cs.ccny.cuny.edu>
+diff --git a/config.mk b/config.mk
+index cba8d40..6407ae6 100644
+--- a/config.mk
++++ b/config.mk
+@@ -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
+diff --git a/document.c b/document.c
+index 873866c..8d0aae4 100644
+--- a/document.c
++++ b/document.c
+@@ -109,12 +109,7 @@ pdf_document_save_as(zathura_document_t* document, mupdf_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_document*) mupdf_document->document, (char*) path, NULL);
+ } fz_catch (mupdf_document->ctx) {
+ return ZATHURA_ERROR_UNKNOWN;
+ }
+diff --git a/image.c b/image.c
+index 97d4143..8f6912b 100644
+--- a/image.c
++++ b/image.c
+@@ -93,7 +93,7 @@ pdf_page_image_get_cairo(zathura_page_t* page, mupdf_page_t* mupdf_page,
+ 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/page.c b/page.c
+index beb0351..219fc2a 100644
+--- a/page.c
++++ b/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, mupdf_page_t* mupdf_page)
+
+ 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/plugin.h b/plugin.h
+index f2fb4a0..84c5e53 100644
+--- a/plugin.h
++++ b/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/search.c b/search.c
+index 3a9fad4..c672b9f 100644
+--- a/search.c
++++ b/search.c
+@@ -40,7 +40,7 @@ pdf_page_search_text(zathura_page_t* page, mupdf_page_t* mupdf_page, const char*
+ }
+
+ 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/utils.c b/utils.c
+index 4a003b9..a4b9320 100644
+--- a/utils.c
++++ b/utils.c
+@@ -14,7 +14,7 @@ mupdf_page_extract_text(mupdf_document_t* mupdf_document, mupdf_page_t* mupdf_pa
+ 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);
</ins></span></pre>
</div>
</div>
</body>
</html>