Attachment 171796 Details for Bug 210398 – mupdf updated patch

[patch] mupdf updated patch

mupdf-1.9a,1.diff (text/plain), 5.05 KB, created by Zsolt Udvari on 2016-06-25 18:50:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zsolt Udvari

Created: 2016-06-25 18:50:48 UTC

Size: 5.05 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 417444)
>+++ Makefile	(working copy)
>@@ -2,12 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	mupdf
>-PORTVERSION=	1.8
>+PORTVERSION=	1.9a
> DISTVERSIONSUFFIX=	-source
> PORTEPOCH=	1
> CATEGORIES=	graphics
>-MASTER_SITES=	http://www.mupdf.com/download/ \
>-		http://www.mupdf.com/download/archive/
>+MASTER_SITES=	http://www.mupdf.com/downloads/ \
>+		http://www.mupdf.com/downloads/archive/
> 
> MAINTAINER=	udvzsolt@gmail.com
> COMMENT=	Lightweight PDF viewer and toolkit
>@@ -17,14 +17,16 @@
> 
> LIB_DEPENDS=	libcurl.so:ftp/curl \
> 		libfreetype.so:print/freetype2 \
>+		libharfbuzz.so:print/harfbuzz \
> 		libjbig2dec.so:graphics/jbig2dec \
> 		libopenjp2.so:graphics/openjpeg
> 
>-CFLAGS+=	-I${WRKSRC}/include/mupdf
>+CFLAGS+=	-I${WRKSRC}/include/mupdf -I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
> MAKE_ARGS=	build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes
> USES=		cpe compiler:c++11-lang gmake jpeg pkgconfig
>-USE_XORG=	x11 xext
>+USE_XORG=	x11 xcursor xext xinerama xrandr
>+USE_GL=	gl
> 
> CPE_VENDOR=	artifex
> 
>@@ -45,9 +47,13 @@
> 		-e 's|/usr/local|${LOCALBASE}|' \
> 		-e 's/Linux/FreeBSD/' \
> 		${WRKSRC}/Makerules
>-	@${REINPLACE_CMD} '/^CFLAGS/s|$$| -I${LOCALBASE}/include|' \
>-		${WRKSRC}/Makefile
>-	@${RM} -r ${WRKSRC}/thirdparty/*
>+	@${RM} -r ${WRKSRC}/thirdparty/curl \
>+		${WRKSRC}/thirdparty/jbig2dec \
>+		${WRKSRC}/thirdparty/freetype \
>+		${WRKSRC}/thirdparty/harfbuzz \
>+		${WRKSRC}/thirdparty/jpeg \
>+		${WRKSRC}/thirdparty/openjpeg \
>+		${WRKSRC}/thirdparty/zlib
> 
> post-build:
> 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
>@@ -56,8 +62,10 @@
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/build/pic/libmupdf.a \
> 		${STAGEDIR}${PREFIX}/lib/libmupdf_pic.a
>+	${INSTALL_DATA} ${WRKSRC}/build/pic/libmupdfthird.a \
>+		${STAGEDIR}${PREFIX}/lib/libmupdfthird_pic.a
> 	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf
>-.for binary in mutool mujstest mupdf mupdf-x11-curl
>+.for binary in mutool mujstest mupdf mupdf-gl mupdf-x11-curl
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${binary}
> .endfor
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 417444)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (mupdf-1.8-source.tar.gz) = a2a3c64d8b24920f87cf4ea9339a25abf7388496440f13b37482d1403c33c206
>-SIZE (mupdf-1.8-source.tar.gz) = 14169777
>+TIMESTAMP = 1466328793
>+SHA256 (mupdf-1.9a-source.tar.gz) = 8015c55f4e6dd892d3c50db4f395c1e46660a10b460e2ecd180a497f55bbc4cc
>+SIZE (mupdf-1.9a-source.tar.gz) = 20493793
>Index: files/patch-scripts_fontdump.c
>===================================================================
>--- files/patch-scripts_fontdump.c	(revision 0)
>+++ files/patch-scripts_fontdump.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- scripts/fontdump.c.orig	2016-06-12 09:11:56 UTC
>++++ scripts/fontdump.c
>+@@ -50,7 +50,6 @@ main(int argc, char **argv)
>+ 	fprintf(fo, "#ifndef __STRICT_ANSI__\n");
>+ 	fprintf(fo, "#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)\n");
>+ 	fprintf(fo, "#if !defined(__ICC)\n");
>+-	fprintf(fo, "#define HAVE_INCBIN\n");
>+ 	fprintf(fo, "#endif\n");
>+ 	fprintf(fo, "#endif\n");
>+ 	fprintf(fo, "#endif\n");
>
>Property changes on: files/patch-scripts_fontdump.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 417444)
>+++ pkg-plist	(working copy)
>@@ -1,9 +1,11 @@
> bin/mujstest
> bin/mupdf
>+bin/mupdf-gl
> bin/mupdf-x11-curl
> bin/mutool
> include/mupdf/fitz.h
> include/mupdf/fitz/annotation.h
>+include/mupdf/fitz/bidi.h
> include/mupdf/fitz/bitmap.h
> include/mupdf/fitz/buffer.h
> include/mupdf/fitz/colorspace.h
>@@ -27,6 +29,7 @@
> include/mupdf/fitz/output-pcl.h
> include/mupdf/fitz/output-png.h
> include/mupdf/fitz/output-pnm.h
>+include/mupdf/fitz/output-ps.h
> include/mupdf/fitz/output-pwg.h
> include/mupdf/fitz/output-svg.h
> include/mupdf/fitz/output-tga.h
>@@ -33,6 +36,7 @@
> 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
>@@ -47,7 +51,6 @@
> include/mupdf/fitz/unzip.h
> include/mupdf/fitz/util.h
> include/mupdf/fitz/version.h
>-include/mupdf/fitz/write-document.h
> include/mupdf/fitz/xml.h
> include/mupdf/html.h
> include/mupdf/memento.h
>@@ -62,7 +65,8 @@
> include/mupdf/pdf/event.h
> include/mupdf/pdf/field.h
> include/mupdf/pdf/font.h
>-include/mupdf/pdf/interpret.h
>+include/mupdf/pdf/graft.h
>+include/mupdf/pdf/interpret.h 
> include/mupdf/pdf/javascript.h
> include/mupdf/pdf/name-table.h
> include/mupdf/pdf/object.h
>@@ -74,6 +78,8 @@
> include/mupdf/pdf/xref.h
> include/mupdf/xps.h
> lib/libmupdf.a
>+lib/libmupdfthird.a
>+lib/libmupdfthird_pic.a
> lib/libmupdf_pic.a
> man/man1/mupdf.1.gz
> man/man1/mutool.1.gz

Flags:

uzsolt: maintainer-approval+

Actions: View | Diff

Attachments on bug 210398: 171594 | 171702 | 171725 | 171754 | 171755 | 171756 | 171796 | 171797