Index: head/graphics/mupdf/Makefile =================================================================== --- head/graphics/mupdf/Makefile (revision 385231) +++ head/graphics/mupdf/Makefile (revision 385232) @@ -1,70 +1,70 @@ # Created by: Martin Dieringer # $FreeBSD$ PORTNAME= mupdf -PORTVERSION= 1.6 +PORTVERSION= 1.7 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE \ http://www.mupdf.com/download/ EXTRACT_SUFX= -source.tar.gz MAINTAINER= udvzsolt@gmail.com COMMENT= Lightweight PDF viewer and toolkit LICENSE= AGPLv3 LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \ libopenjp2.so:${PORTSDIR}/graphics/openjpeg LIBS+= -L${LOCALBASE}/lib MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes USES= cpe compiler:c++11-lang pkgconfig gmake USE_XORG= x11 xext CPE_VENDOR= artifex WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source OPTIONS_DEFINE= SCROLL JS OPTIONS_DEFAULT=SCROLL SCROLL_DESC= Build with scroll hacks JS_DESC= JavaScript support (V8 engine) .include .if ${PORT_OPTIONS:MSCROLL} EXTRA_PATCHES+= ${FILESDIR}/scroll_hack-platform__x11__pdfapp.c .endif .if ${PORT_OPTIONS:MJS} LIB_DEPENDS+= libv8.so:${PORTSDIR}/lang/v8 MAKE_ARGS+= V8_PRESENT=1 V8LIBS=-lv8 .endif post-patch: @${REINPLACE_CMD} -e 's/-pipe -O2 //' \ -e 's|/usr/local|${LOCALBASE}|' \ -e 's/Linux/FreeBSD/' \ ${WRKSRC}/Makerules @${REINPLACE_CMD} '/^CFLAGS/s|$$| -I${LOCALBASE}/include|' \ ${WRKSRC}/Makefile @${RM} -r ${WRKSRC}/thirdparty/* post-build: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} OUT=build/pic XCFLAGS=-fpic libs) post-install: ${INSTALL_DATA} ${WRKSRC}/build/pic/libmupdf.a \ ${STAGEDIR}${PREFIX}/lib/libmupdf_pic.a ${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf .for binary in mudraw mutool mujstest mupdf mupdf-x11-curl ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${binary} .endfor .include Index: head/graphics/mupdf/distinfo =================================================================== --- head/graphics/mupdf/distinfo (revision 385231) +++ head/graphics/mupdf/distinfo (revision 385232) @@ -1,2 +1,2 @@ -SHA256 (mupdf-1.6-source.tar.gz) = 9813ee330950a641364181649ebd369c947adbcea9d41ed953ec5365640ea563 -SIZE (mupdf-1.6-source.tar.gz) = 13975531 +SHA256 (mupdf-1.7-source.tar.gz) = d0bd5c656c464411cb5788c73d5a7c9a5b89f1e9e84e3c8c7c982ed8b90f5642 +SIZE (mupdf-1.7-source.tar.gz) = 13301969 Index: head/graphics/mupdf/files/patch-platform__x11__x11_main.c =================================================================== --- head/graphics/mupdf/files/patch-platform__x11__x11_main.c (revision 385231) +++ head/graphics/mupdf/files/patch-platform__x11__x11_main.c (nonexistent) @@ -1,27 +0,0 @@ ---- ./platform/x11/x11_main.c.orig 2014-06-10 17:09:28.000000000 +0200 -+++ ./platform/x11/x11_main.c 2014-08-04 18:51:44.000000000 +0200 -@@ -794,6 +794,24 @@ - exit(1); - } - -+/* reference: -+ * http://stackoverflow.com/questions/2621439/how-to-get-screen-dpi-linux-mac-programatically -+ */ -+int get_dpi(void) -+{ -+ Display *xdpy; -+ int xscr; -+ int x = 0; -+ -+ if ((xdpy = XOpenDisplay(NULL))) { -+ xscr = DefaultScreen(xdpy); -+ x = (int) (DisplayWidth(xdpy, xscr) * 25.4 / -+ DisplayWidthMM(xdpy, xscr) + 0.5); -+ XCloseDisplay(xdpy); -+ } -+ return x; -+} -+ - int main(int argc, char **argv) - { - int c; Property changes on: head/graphics/mupdf/files/patch-platform__x11__x11_main.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c =================================================================== --- head/graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c (revision 385231) +++ head/graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c (revision 385232) @@ -1,49 +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 @@ 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) { panto = PAN_TO_TOP; @@ -1182,6 +1184,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) { panto = PAN_TO_BOTTOM; @@ -1257,6 +1261,7 @@ */ case ',': + pageup: panto = PAN_TO_BOTTOM; if (app->numberlen > 0) app->pageno -= atoi(app->number); @@ -1265,6 +1270,7 @@ break; case '.': + pagedown: panto = PAN_TO_TOP; if (app->numberlen > 0) app->pageno += atoi(app->number); -@@ -1585,6 +1591,12 @@ - int isx = (modifiers & (1<<0)); - int xstep = isx ? 20 * dir : 0; - int ystep = !isx ? 20 * dir : 0; -+ if (!isx && dir < 0 && app->pany + -+ fz_pixmap_height(app->ctx, app->image) <= app->winh) -+ pdfapp_onkey(app, 'j'); -+ else if (!isx && dir > 0 && app->pany >= 0) -+ pdfapp_onkey(app, 'k'); -+ else - pdfapp_panview(app, app->panx + xstep, app->pany + ystep); - } - } Property changes on: head/graphics/mupdf/files/scroll_hack-platform__x11__pdfapp.c ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -ON \ No newline at end of property +yes \ No newline at end of property Index: head/graphics/mupdf/pkg-plist =================================================================== --- head/graphics/mupdf/pkg-plist (revision 385231) +++ head/graphics/mupdf/pkg-plist (revision 385232) @@ -1,85 +1,86 @@ bin/mudraw bin/mujstest bin/mupdf bin/mupdf-x11-curl bin/mutool -include/mupdf/cbz.h include/mupdf/fitz.h include/mupdf/fitz/annotation.h include/mupdf/fitz/bitmap.h include/mupdf/fitz/buffer.h include/mupdf/fitz/colorspace.h include/mupdf/fitz/compressed-buffer.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/function.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/math.h -include/mupdf/fitz/meta.h include/mupdf/fitz/outline.h include/mupdf/fitz/output-pcl.h include/mupdf/fitz/output-png.h include/mupdf/fitz/output-pnm.h include/mupdf/fitz/output-pwg.h include/mupdf/fitz/output-svg.h include/mupdf/fitz/output-tga.h include/mupdf/fitz/output.h include/mupdf/fitz/path.h include/mupdf/fitz/pixmap.h include/mupdf/fitz/shade.h include/mupdf/fitz/store.h include/mupdf/fitz/stream.h include/mupdf/fitz/string.h include/mupdf/fitz/structured-text.h include/mupdf/fitz/system.h include/mupdf/fitz/text.h include/mupdf/fitz/transition.h include/mupdf/fitz/tree.h +include/mupdf/fitz/unzip.h include/mupdf/fitz/version.h include/mupdf/fitz/write-document.h include/mupdf/fitz/xml.h -include/mupdf/img.h +include/mupdf/html.h include/mupdf/memento.h include/mupdf/pdf.h include/mupdf/pdf-tools.h include/mupdf/pdf/annot.h include/mupdf/pdf/appearance.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/field.h include/mupdf/pdf/font.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/widget.h include/mupdf/pdf/xref.h -include/mupdf/tiff.h include/mupdf/xps.h lib/libmupdf.a lib/libmupdf_pic.a man/man1/mudraw.1.gz man/man1/mupdf.1.gz man/man1/mutool.1.gz %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/naming.txt %%PORTDOCS%%%%DOCSDIR%%/overview.txt %%PORTDOCS%%%%DOCSDIR%%/progressive.txt %%PORTDOCS%%%%DOCSDIR%%/refcount.txt %%PORTDOCS%%%%DOCSDIR%%/thirdparty.txt