Attachment 189202 Details for Bug 224712 – mupdf update patch

[patch] mupdf update patch

mupdf-1.12.0,1.diff (text/plain), 8.40 KB, created by Zsolt Udvari on 2017-12-29 18:10:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zsolt Udvari

Created: 2017-12-29 18:10:15 UTC

Size: 8.40 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 457485)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mupdf
>-PORTVERSION=	1.11
>-PORTREVISION=	2
>+PORTVERSION=	1.12.0
> DISTVERSIONSUFFIX=	-source
> PORTEPOCH=	1
> CATEGORIES=	graphics
>@@ -28,7 +27,7 @@
> 		SOVERSION=${PORTVERSION}
> USES=		cpe compiler:c++11-lang gmake jpeg pkgconfig
> USE_XORG=	x11 xcursor xext xinerama xrandr
>-USE_GL=		gl
>+USE_GL=		gl glut
> USE_LDCONFIG=	yes
> 
> CPE_VENDOR=	artifex
>@@ -51,6 +50,7 @@
> 	@${REINPLACE_CMD} -e 's/-ldl //' ${WRKSRC}/Makerules ${WRKSRC}/Makethird
> 	@${RM} -r ${WRKSRC}/thirdparty/curl \
> 		${WRKSRC}/thirdparty/freetype \
>+		${WRKSRC}/thirdparty/freeglut \
> 		${WRKSRC}/thirdparty/harfbuzz \
> 		${WRKSRC}/thirdparty/jbig2dec \
> 		${WRKSRC}/thirdparty/libjpeg \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 457485)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1492430059
>-SHA256 (mupdf-1.11-source.tar.gz) = 209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a
>-SIZE (mupdf-1.11-source.tar.gz) = 40156070
>+TIMESTAMP = 1514557967
>+SHA256 (mupdf-1.12.0-source.tar.gz) = 5c6353a82f1512f4f5280cf69a3725d1adac9c8b22377ec2a447c4fc45528755
>+SIZE (mupdf-1.12.0-source.tar.gz) = 51508917
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 457485)
>+++ files/patch-Makefile	(working copy)
>@@ -1,7 +1,7 @@
> $OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $
>---- Makefile.orig	2017-04-05 11:02:21 UTC
>+--- Makefile.orig	2017-12-13 14:00:30 UTC
> +++ Makefile
>-@@ -300,8 +300,8 @@ generate: $(JAVASCRIPT_GEN)
>+@@ -312,8 +312,8 @@ generate: $(JAVASCRIPT_GEN)
>  
>  # --- Library ---
>  
>@@ -11,8 +11,8 @@
> +THIRD_LIB = libmupdfthird.so.$(SOVERSION)
>  THREAD_LIB = $(OUT)/libmuthreads.a
>  
>- MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
>-@@ -309,7 +309,11 @@ THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_
>+ MUPDF_OBJ := \
>+@@ -344,7 +344,11 @@ THIRD_OBJ := \
>  THREAD_OBJ := $(THREAD_OBJ)
>  
>  $(MUPDF_LIB) : $(MUPDF_OBJ)
>Index: files/patch-Makerules
>===================================================================
>--- files/patch-Makerules	(revision 457485)
>+++ files/patch-Makerules	(working copy)
>@@ -1,7 +1,7 @@
>---- Makerules.orig	2017-04-05 11:02:21 UTC
>+--- Makerules.orig	2017-12-13 14:00:30 UTC
> +++ Makerules
>-@@ -110,27 +110,21 @@ LD := xcrun ld
>- RANLIB_CMD := xcrun ranlib $@
>+@@ -87,7 +87,7 @@ LD = xcrun ld
>+ RANLIB_CMD = xcrun ranlib $@
>  
>  # Linux uses pkg-config for system libraries.
> -else ifeq "$(OS)" "Linux"
>@@ -9,7 +9,9 @@
>  
>  HAVE_PTHREAD := yes
>  SYS_PTHREAD_CFLAGS :=
>- SYS_PTHREAD_LIBS := -lpthread
>+@@ -97,21 +97,15 @@ HAVE_GLUT := yes
>+ SYS_GLUT_CFLAGS :=
>+ SYS_GLUT_LIBS := -lglut -lGL
>  
> -ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
> -HAVE_LIBCRYPTO := yes
>Index: files/patch-scripts_hexdump.c
>===================================================================
>--- files/patch-scripts_hexdump.c	(revision 457485)
>+++ files/patch-scripts_hexdump.c	(nonexistent)
>@@ -1,10 +0,0 @@
>---- scripts/hexdump.c.orig	2017-04-05 11:02:21 UTC
>-+++ scripts/hexdump.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) && !defined(__ANDROID__)\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_hexdump.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: files/patch-source__fitz__load-jpx.c
>===================================================================
>--- files/patch-source__fitz__load-jpx.c	(revision 457485)
>+++ files/patch-source__fitz__load-jpx.c	(working copy)
>@@ -1,6 +1,6 @@
>---- source/fitz/load-jpx.c.orig	2017-04-05 11:02:21 UTC
>+--- source/fitz/load-jpx.c.orig	2017-12-13 14:00:30 UTC
> +++ source/fitz/load-jpx.c
>-@@ -444,14 +444,18 @@ fz_load_jpx_info(fz_context *ctx, unsign
>+@@ -445,14 +445,18 @@ fz_load_jpx_info(fz_context *ctx, const 
>  
>  #else /* HAVE_LURATECH */
>  
>@@ -9,7 +9,7 @@
> +{
>  #define OPJ_STATIC
>  #define OPJ_HAVE_INTTYPES_H
>- #if !defined(_WIN32) && !defined(_WIN64)
>+ #if !defined(_MSC_VER) || _MSC_VER >= 1600
>  #define OPJ_HAVE_STDINT_H
>  #endif
> +#endif
>@@ -20,7 +20,7 @@
>  
>  struct fz_jpxd_s
>  {
>-@@ -919,6 +923,10 @@ fz_load_jpx_info(fz_context *ctx, unsign
>+@@ -930,6 +934,10 @@ fz_load_jpx_info(fz_context *ctx, const 
>  	*yresp = state.yres;
>  }
>  
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 457485)
>+++ pkg-plist	(working copy)
>@@ -1,3 +1,4 @@
>+bin/mjsgen
> bin/mujstest
> bin/mupdf
> bin/mupdf-gl
>@@ -11,7 +12,9 @@
> include/mupdf/fitz/bidi.h
> include/mupdf/fitz/bitmap.h
> include/mupdf/fitz/buffer.h
>+include/mupdf/fitz/color-management.h
> include/mupdf/fitz/colorspace.h
>+include/mupdf/fitz/compress.h
> include/mupdf/fitz/compressed-buffer.h
> include/mupdf/fitz/config.h
> include/mupdf/fitz/context.h
>@@ -21,7 +24,6 @@
> include/mupdf/fitz/document.h
> include/mupdf/fitz/filter.h
> include/mupdf/fitz/font.h
>-include/mupdf/fitz/function.h
> include/mupdf/fitz/geometry.h
> include/mupdf/fitz/getopt.h
> include/mupdf/fitz/glyph-cache.h
>@@ -31,9 +33,11 @@
> include/mupdf/fitz/link.h
> include/mupdf/fitz/outline.h
> include/mupdf/fitz/output-pcl.h
>+include/mupdf/fitz/output-pclm.h
> include/mupdf/fitz/output-png.h
> include/mupdf/fitz/output-pnm.h
> include/mupdf/fitz/output-ps.h
>+include/mupdf/fitz/output-psd.h
> include/mupdf/fitz/output-pwg.h
> include/mupdf/fitz/output-svg.h
> include/mupdf/fitz/output-tga.h
>@@ -52,15 +56,13 @@
> include/mupdf/fitz/track-usage.h
> include/mupdf/fitz/transition.h
> include/mupdf/fitz/tree.h
>-include/mupdf/fitz/ucdn.h
> include/mupdf/fitz/util.h
> include/mupdf/fitz/version.h
> include/mupdf/fitz/writer.h
> include/mupdf/fitz/xml.h
>-include/mupdf/html.h
> include/mupdf/memento.h
>+include/mupdf/pdf-tools.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
>@@ -80,7 +82,7 @@
> include/mupdf/pdf/resource.h
> include/mupdf/pdf/widget.h
> include/mupdf/pdf/xref.h
>-include/mupdf/svg.h
>+include/mupdf/ucdn.h
> lib/libmupdf.so
> lib/libmupdf.so.%%SOVERSION%%
> lib/libmupdfthird.so
>@@ -90,9 +92,34 @@
> %%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
>-%%PORTDOCS%%%%DOCSDIR%%/types.txt
>+%%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/create-thumbnail.js
>+%%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js
>+%%PORTDOCS%%%%DOCSDIR%%/examples/draw-document.js
>+%%PORTDOCS%%%%DOCSDIR%%/examples/example.c
>+%%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-merge.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-portfolio.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

Actions: View | Diff

Attachments on bug 224712: 189202 | 189203 | 189204 | 189208