Attachment 195107 Details for Bug 229110 – updated, combined patch

[patch] updated, combined patch

mupdf_zathura-pdf-mupdf.patch (text/plain), 5.63 KB, created by Zsolt Udvari on 2018-07-13 12:31:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zsolt Udvari

Created: 2018-07-13 12:31:34 UTC

Size: 5.63 KB

patch

obsolete

>Index: graphics/mupdf/Makefile
>===================================================================
>--- graphics/mupdf/Makefile	(revision 474577)
>+++ graphics/mupdf/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mupdf
>-PORTVERSION=	1.12.0
>+PORTVERSION=	1.13.0
> DISTVERSIONSUFFIX=	-source
> PORTEPOCH=	1
> CATEGORIES=	graphics
>@@ -27,6 +27,7 @@
> LIBS+=		-L${LOCALBASE}/lib
> MAKE_ARGS=	build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \
> 		SOVERSION=${PORTVERSION}
>+ALL_TARGET=	all extra
> USES=		cpe compiler:c++11-lang gmake jpeg pkgconfig
> USE_XORG=	x11 xcursor xext xinerama xrandr
> USE_GL=		gl glut
>@@ -61,6 +62,12 @@
> 
> post-install:
> 	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf
>+	${INSTALL_PROGRAM} \
>+		${WRKSRC}/build/release/mjsgen \
>+		${WRKSRC}/build/release/mujstest \
>+		${WRKSRC}/build/release/mupdf-x11-curl \
>+		${WRKSRC}/build/release/muraster \
>+		${STAGEDIR}${PREFIX}/bin
> 	${LN} -s libmupdf.so.${PORTVERSION} \
> 		${STAGEDIR}${PREFIX}/lib/libmupdf.so
> 	${LN} -s libmupdfthird.so.${PORTVERSION} \
>Index: graphics/mupdf/distinfo
>===================================================================
>--- graphics/mupdf/distinfo	(revision 474577)
>+++ graphics/mupdf/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1514557967
>-SHA256 (mupdf-1.12.0-source.tar.gz) = 5c6353a82f1512f4f5280cf69a3725d1adac9c8b22377ec2a447c4fc45528755
>-SIZE (mupdf-1.12.0-source.tar.gz) = 51508917
>+TIMESTAMP = 1529321680
>+SHA256 (mupdf-1.13.0-source.tar.gz) = 071c6962cbee1136188da62136596a9d704b81e35fe617cd34874bbb0ae7ca09
>+SIZE (mupdf-1.13.0-source.tar.gz) = 51425034
>Index: graphics/mupdf/files/patch-Makerules
>===================================================================
>--- graphics/mupdf/files/patch-Makerules	(revision 474577)
>+++ graphics/mupdf/files/patch-Makerules	(working copy)
>@@ -1,4 +1,4 @@
>---- Makerules.orig	2017-12-13 14:00:30 UTC
>+--- Makerules.orig	2018-06-18 11:40:10 UTC
> +++ Makerules
> @@ -87,7 +87,7 @@ LD = xcrun ld
>  RANLIB_CMD = xcrun ranlib $@
>@@ -13,7 +13,7 @@
>  SYS_GLUT_CFLAGS :=
>  SYS_GLUT_LIBS := -lglut -lGL
>  
>--ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
>+-ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
> -HAVE_LIBCRYPTO := yes
> -SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
> -SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
>Index: graphics/mupdf/files/patch-source__fitz__load-jpx.c
>===================================================================
>--- graphics/mupdf/files/patch-source__fitz__load-jpx.c	(revision 474577)
>+++ graphics/mupdf/files/patch-source__fitz__load-jpx.c	(nonexistent)
>@@ -1,33 +0,0 @@
>---- source/fitz/load-jpx.c.orig	2017-12-13 14:00:30 UTC
>-+++ source/fitz/load-jpx.c
>-@@ -445,14 +445,18 @@ fz_load_jpx_info(fz_context *ctx, const 
>- 
>- #else /* HAVE_LURATECH */
>- 
>-+#ifdef __cplusplus
>-+extern "C"
>-+{
>- #define OPJ_STATIC
>- #define OPJ_HAVE_INTTYPES_H
>- #if !defined(_MSC_VER) || _MSC_VER >= 1600
>- #define OPJ_HAVE_STDINT_H
>- #endif
>-+#endif
>- #define USE_JPIP
>- 
>--#include <openjpeg.h>
>-+#include <openjpeg-2.3/openjpeg.h>
>- 
>- struct fz_jpxd_s
>- {
>-@@ -930,6 +934,10 @@ fz_load_jpx_info(fz_context *ctx, const 
>- 	*yresp = state.yres;
>- }
>- 
>-+#ifdef __cplusplus
>-+}
>-+#endif
>-+
>- #endif /* HAVE_LURATECH */
>- 
>- #else /* FZ_ENABLE_JPX */
>
>Property changes on: graphics/mupdf/files/patch-source__fitz__load-jpx.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: graphics/zathura-pdf-mupdf/Makefile
>===================================================================
>--- graphics/zathura-pdf-mupdf/Makefile	(revision 474577)
>+++ graphics/zathura-pdf-mupdf/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	zathura-pdf-mupdf
>-PORTVERSION=	0.3.2
>+PORTVERSION=	0.3.3
> CATEGORIES=	graphics
> MASTER_SITES=	https://pwmt.org/projects/zathura-pdf-mupdf/download/ \
> 		http://www.madpilot.net/~mad/pwmt.org/
>@@ -22,15 +22,18 @@
> 		libmupdf.so:graphics/mupdf \
> 		libopenjp2.so:graphics/openjpeg
> 
>-PLIST_FILES=	lib/zathura/pdf.so share/applications/zathura-pdf-mupdf.desktop
>+PLIST_FILES=	lib/zathura/libpdf-mupdf.so \
>+		share/applications/org.pwmt.zathura-pdf-mupdf.desktop \
>+		share/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml
> 
>-MAKE_ARGS=	OPENSSL_INC=-I${OPENSSLINC} OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto"
>-USES=		compiler:c11 desktop-file-utils gmake gettext jpeg pkgconfig ssl
>+#MAKE_ARGS=	OPENSSL_INC=-I${OPENSSLINC} OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto"
>+USES=		compiler:c11 desktop-file-utils gmake jpeg meson pkgconfig tar:xz
> USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30
>+USE_LDCONFIG=	yes
> 
> CONFLICTS_INSTALL=	zathura-pdf-poppler-[0-9]*
> 
>-post-install:
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/zathura/pdf.so
>+post-patch:
>+	${REINPLACE_CMD} "s@$cc.find_library(.*$)@\1,dirs:'${PREFIX}/lib')@" ${WRKSRC}/meson.build
> 
> .include <bsd.port.mk>
>Index: graphics/zathura-pdf-mupdf/distinfo
>===================================================================
>--- graphics/zathura-pdf-mupdf/distinfo	(revision 474577)
>+++ graphics/zathura-pdf-mupdf/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1514565077
>-SHA256 (zathura-pdf-mupdf-0.3.2.tar.gz) = 931d88c4d1adc3be77a8fa9f28c25fc2aa9c9ffbabfaeac4aacc1e1d07936a76
>-SIZE (zathura-pdf-mupdf-0.3.2.tar.gz) = 9687
>+TIMESTAMP = 1531483831
>+SHA256 (zathura-pdf-mupdf-0.3.3.tar.xz) = 52b02ceee272a47f7ef9c2b73cc4f6fb480c02fdce0e7f6b7c8e93ad6ac46dfd
>+SIZE (zathura-pdf-mupdf-0.3.3.tar.xz) = 7880

Flags:

uzsolt: maintainer-approval+

Actions: View | Diff

Attachments on bug 229110: 194360 | 195107 | 195108