Index: head/graphics/mupdf/Makefile =================================================================== --- head/graphics/mupdf/Makefile (revision 535837) +++ head/graphics/mupdf/Makefile (revision 535838) @@ -1,70 +1,70 @@ # Created by: Martin Dieringer # $FreeBSD$ PORTNAME= mupdf -DISTVERSION= 1.16.0 +DISTVERSION= 1.17.0 DISTVERSIONSUFFIX= -source PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.mupdf.com/downloads/ \ http://www.mupdf.com/downloads/archive/ MAINTAINER= uzsolt@uzsolt.hu COMMENT= Lightweight PDF viewer and toolkit LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:ftp/curl \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libjbig2dec.so:graphics/jbig2dec \ libopenjp2.so:graphics/openjpeg USES= cpe compiler:c++11-lang gl gmake jpeg pkgconfig xorg USE_XORG= x11 xcursor xext xinerama xrandr USE_GL= gl glut USE_LDCONFIG= yes CPE_VENDOR= artifex # pkg-config to avoid the conflict with openjpeg15 CFLAGS+= `pkg-config --cflags libopenjp2` LDFLAGS+= `pkg-config --libs libjpeg libopenjp2` -ljbig2dec MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \ XCFLAGS+="-I${WRKSRC}/include/mupdf -fPIC" \ XLIBS+="-L${LOCALBASE}/lib -L${WRKSRC}/build/release" \ SOVERSION=${DISTVERSION} ALL_TARGET= all extra-libs OPTIONS_DEFINE= DOCS JS SCROLL OPTIONS_DEFAULT= SCROLL JS_DESC= JavaScript support (V8 engine) SCROLL_DESC= Build with scroll hacks JS_LIB_DEPENDS= libv8.so:lang/v8 JS_MAKE_ARGS= V8_PRESENT=1 V8LIBS=-lv8 SCROLL_EXTRA_PATCHES= ${FILESDIR}/scroll_hack-platform__x11__pdfapp.c PLIST_SUB= SOVERSION=${PORTVERSION} post-patch: @${REINPLACE_CMD} -e 's/-pipe -O2 //' \ ${WRKSRC}/Makerules @${REINPLACE_CMD} -e 's/-ldl //' ${WRKSRC}/Makerules \ ${WRKSRC}/Makethird post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 \ ${STAGEDIR}${PREFIX}/bin/mupdf ${INSTALL_PROGRAM} \ ${WRKSRC}/build/release/muraster \ ${STAGEDIR}${PREFIX}/bin ${LN} -s libmupdf.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib/libmupdf.so ${LN} -s libmupdf-third.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib/libmupdf-third.so .include Index: head/graphics/mupdf/distinfo =================================================================== --- head/graphics/mupdf/distinfo (revision 535837) +++ head/graphics/mupdf/distinfo (revision 535838) @@ -1,3 +1,3 @@ -TIMESTAMP = 1564598649 -SHA256 (mupdf-1.16.0-source.tar.gz) = 64d537895641b711737cc58fe762481b07ea71d1506e8bd8a13434e093b0068d -SIZE (mupdf-1.16.0-source.tar.gz) = 60805124 +TIMESTAMP = 1589721586 +SHA256 (mupdf-1.17.0-source.tar.gz) = 00e33fa89cb42f1ef9e3bb73671b1cb6d210f5159bd68168fa5c89ceb24dd48e +SIZE (mupdf-1.17.0-source.tar.gz) = 65510829 Index: head/graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c =================================================================== --- head/graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c (revision 535837) +++ head/graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c (revision 535838) @@ -1,36 +1,36 @@ ---- ./platform/x11/pdfapp.c.orig 2014-08-04 19:59:53.000000000 +0200 -+++ ./platform/x11/pdfapp.c 2014-08-04 20:03:46.000000000 +0200 -@@ -1166,6 +1166,8 @@ +--- ./platform/x11/pdfapp.c.orig 2020-05-05 04:29:09.000000000 -0700 ++++ ./platform/x11/pdfapp.c 2020-05-17 08:47:00.137902000 -0700 +@@ -1462,6 +1462,8 @@ + case 'j': { - int h = fz_pixmap_height(app->ctx, app->image); -+ if ( (app->pany + h) <= app->winh ) -+ goto pagedown; - if (h <= app->winh || app->pany <= app->winh - h) ++ if (app->pany + app->imgh <= app->winh) ++ goto pagedown; + if (app->imgh <= app->winh || app->pany <= app->winh - app->imgh) { panto = PAN_TO_TOP; -@@ -1182,6 +1184,8 @@ +@@ -1477,6 +1479,8 @@ + case 'k': { - int h = fz_pixmap_height(app->ctx, app->image); -+ if (app->pany >= 0) -+ goto pageup; - if (h <= app->winh || app->pany == 0) ++ if (app->pany >= 0) ++ goto pageup; + if (app->imgh <= app->winh || app->pany == 0) { panto = PAN_TO_BOTTOM; -@@ -1257,6 +1261,7 @@ +@@ -1550,6 +1554,7 @@ */ case ',': -+ pageup: - panto = PAN_TO_BOTTOM; ++ pageup: + panto = DONT_PAN; if (app->numberlen > 0) app->pageno -= atoi(app->number); -@@ -1265,6 +1270,7 @@ +@@ -1558,6 +1563,7 @@ break; case '.': -+ pagedown: - panto = PAN_TO_TOP; ++ pagedown: + panto = DONT_PAN; if (app->numberlen > 0) app->pageno += atoi(app->number); Index: head/graphics/mupdf/pkg-plist =================================================================== --- head/graphics/mupdf/pkg-plist (revision 535837) +++ head/graphics/mupdf/pkg-plist (revision 535838) @@ -1,113 +1,114 @@ bin/mupdf bin/mupdf-gl bin/muraster bin/mutool include/mupdf/fitz.h include/mupdf/fitz/archive.h include/mupdf/fitz/band-writer.h include/mupdf/fitz/bidi.h include/mupdf/fitz/bitmap.h include/mupdf/fitz/buffer.h include/mupdf/fitz/color.h include/mupdf/fitz/compress.h include/mupdf/fitz/compressed-buffer.h include/mupdf/fitz/config.h include/mupdf/fitz/context.h include/mupdf/fitz/crypt.h include/mupdf/fitz/device.h include/mupdf/fitz/display-list.h include/mupdf/fitz/document.h include/mupdf/fitz/filter.h include/mupdf/fitz/font.h include/mupdf/fitz/geometry.h include/mupdf/fitz/getopt.h include/mupdf/fitz/glyph-cache.h include/mupdf/fitz/glyph.h include/mupdf/fitz/hash.h include/mupdf/fitz/image.h include/mupdf/fitz/link.h +include/mupdf/fitz/log.h include/mupdf/fitz/outline.h include/mupdf/fitz/output-svg.h include/mupdf/fitz/output.h include/mupdf/fitz/path.h include/mupdf/fitz/pixmap.h include/mupdf/fitz/pool.h include/mupdf/fitz/separation.h include/mupdf/fitz/shade.h include/mupdf/fitz/store.h include/mupdf/fitz/stream.h include/mupdf/fitz/string-util.h include/mupdf/fitz/structured-text.h include/mupdf/fitz/system.h include/mupdf/fitz/text.h include/mupdf/fitz/track-usage.h include/mupdf/fitz/transition.h include/mupdf/fitz/tree.h include/mupdf/fitz/util.h include/mupdf/fitz/version.h include/mupdf/fitz/write-pixmap.h include/mupdf/fitz/writer.h include/mupdf/fitz/xml.h include/mupdf/memento.h include/mupdf/pdf.h include/mupdf/pdf/annot.h include/mupdf/pdf/clean.h include/mupdf/pdf/cmap.h include/mupdf/pdf/crypt.h include/mupdf/pdf/document.h include/mupdf/pdf/event.h include/mupdf/pdf/font.h include/mupdf/pdf/form.h include/mupdf/pdf/interpret.h include/mupdf/pdf/javascript.h include/mupdf/pdf/name-table.h include/mupdf/pdf/object.h include/mupdf/pdf/output-pdf.h include/mupdf/pdf/page.h include/mupdf/pdf/parse.h include/mupdf/pdf/resource.h include/mupdf/pdf/xref.h include/mupdf/ucdn.h lib/libmupdf-third.so lib/libmupdf-third.so.%%SOVERSION%% lib/libmupdf.so lib/libmupdf.so.%%SOVERSION%% man/man1/mupdf.1.gz man/man1/mutool.1.gz %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/android-sdk.html %%PORTDOCS%%%%DOCSDIR%%/artifex-logo.png %%PORTDOCS%%%%DOCSDIR%%/building.html %%PORTDOCS%%%%DOCSDIR%%/coding-overview.html %%PORTDOCS%%%%DOCSDIR%%/coding-progressive.html %%PORTDOCS%%%%DOCSDIR%%/coding-style.html %%PORTDOCS%%%%DOCSDIR%%/examples/bbox-device.js %%PORTDOCS%%%%DOCSDIR%%/examples/create-thumbnail.js %%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js %%PORTDOCS%%%%DOCSDIR%%/examples/draw-document.js %%PORTDOCS%%%%DOCSDIR%%/examples/example.c %%PORTDOCS%%%%DOCSDIR%%/examples/fix-s22pdf.js %%PORTDOCS%%%%DOCSDIR%%/examples/jpx-to-pdf.js %%PORTDOCS%%%%DOCSDIR%%/examples/multi-threaded.c %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create-lowlevel.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-dejpx.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-merge.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-portfolio.js %%PORTDOCS%%%%DOCSDIR%%/examples/trace-device.js %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/manual-mupdf-gl.html %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-clean.html %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-convert.html %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-create.html %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-draw.html %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-extract.html %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-merge.html %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-run.html %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-show.html %%PORTDOCS%%%%DOCSDIR%%/manual-mutool-trace.html %%PORTDOCS%%%%DOCSDIR%%/style.css %%PORTDOCS%%%%DOCSDIR%%/template.html %%PORTDOCS%%%%DOCSDIR%%/thirdparty.html Index: head/graphics/zathura-pdf-mupdf/files/patch-zathura-pdf-mupdf_index.c =================================================================== --- head/graphics/zathura-pdf-mupdf/files/patch-zathura-pdf-mupdf_index.c (nonexistent) +++ head/graphics/zathura-pdf-mupdf/files/patch-zathura-pdf-mupdf_index.c (revision 535838) @@ -0,0 +1,11 @@ +--- zathura-pdf-mupdf/index.c.orig 2020-05-18 10:56:42 UTC ++++ zathura-pdf-mupdf/index.c +@@ -67,7 +67,7 @@ build_index(fz_context* ctx, fz_document* document, fz + + 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.page_number = fz_page_number_from_location(ctx, document, fz_resolve_link(ctx, document, outline->uri, &x, &y)); + target.left = x; + target.top = y; + target.zoom = 0.0; Property changes on: head/graphics/zathura-pdf-mupdf/files/patch-zathura-pdf-mupdf_index.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/zathura-pdf-mupdf/files/patch-zathura-pdf-mupdf_links.c =================================================================== --- head/graphics/zathura-pdf-mupdf/files/patch-zathura-pdf-mupdf_links.c (nonexistent) +++ head/graphics/zathura-pdf-mupdf/files/patch-zathura-pdf-mupdf_links.c (revision 535838) @@ -0,0 +1,15 @@ +--- zathura-pdf-mupdf/links.c.orig 2020-05-18 11:05:39 UTC ++++ zathura-pdf-mupdf/links.c +@@ -56,8 +56,10 @@ pdf_page_links_get(zathura_page_t* page, void* data, z + + 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.page_number = ++ fz_page_number_from_location(mupdf_document->ctx, ++ mupdf_document->document, fz_resolve_link(mupdf_document->ctx, ++ mupdf_document->document, link->uri, &x, &y)); + target.left = x; + target.top = y; + target.zoom = 0.0; Property changes on: head/graphics/zathura-pdf-mupdf/files/patch-zathura-pdf-mupdf_links.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property