Attachment 145367 Details for Bug 184335 – Patch to 1.5

[patch] Patch to 1.5

mupdf-1.5.patch (text/plain), 5.40 KB, created by Zsolt Udvari on 2014-08-04 17:32:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zsolt Udvari

Created: 2014-08-04 17:32:36 UTC

Size: 5.40 KB

patch

obsolete

>diff -ur mupdf.orig/Makefile mupdf/Makefile
>--- mupdf.orig/Makefile	2014-08-04 12:52:17.000000000 +0200
>+++ mupdf/Makefile	2014-08-04 18:55:48.000000000 +0200
>@@ -2,13 +2,12 @@
> # $FreeBSD: head/graphics/mupdf/Makefile 355743 2014-05-29 20:18:17Z marino $
> 
> PORTNAME=	mupdf
>-PORTVERSION=	1.2
>-PORTREVISION=	2
>+PORTVERSION=	1.5
> PORTEPOCH=	1
> CATEGORIES=	graphics
> MASTER_SITES=	GOOGLE_CODE \
> 		http://www.mupdf.com/download/
>-EXTRACT_SUFX=	-source.zip
>+EXTRACT_SUFX=	-source.tar.gz
> 
> MAINTAINER=	lichray@gmail.com
> COMMENT=	Lightweight PDF viewer and toolkit
>@@ -18,11 +17,13 @@
> LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
> 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
> 		libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \
>-		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
>+		libopenjp2.so:${PORTSDIR}/graphics/openjpeg
> 
> MAKE_ARGS+=	build=release prefix=${PREFIX} verbose=1 mandir=${PREFIX}/man \
>-		XCFLAGS=-I${LOCALBASE}/include
>-USES=		pkgconfig gmake zip
>+			HAVE_X11=yes \
>+			XCFLAGS="`pkg-config --cflags freetype2` -I ${LOCALBASE}/include" \
>+			XLIBS="`pkg-config --libs freetype2 libopenjp2 x11 xext` -ljpeg -ljbig2dec"
>+USES=		pkgconfig gmake
> USE_XORG=	x11 xext
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
>@@ -50,17 +51,16 @@
> MAKE_ARGS+=	V8_PRESENT=1 V8LIBS=-lv8
> .endif
> 
>-post-patch:	.SILENT
>-	${REINPLACE_CMD} \
>-		-e '/install:/,/^$$/ { /-d/d; }' \
>-		-e '/install.*bindir)$$/s/install/$$(BSD_INSTALL_PROGRAM)/' \
>-		-e '/install.*libdir)$$/s/install/$$(BSD_INSTALL_DATA)/' \
>-		-e '/install.*incdir)$$/s/install/$$(BSD_INSTALL_DATA)/' \
>-		-e '/install.*man1$$/s/install/$$(BSD_INSTALL_MAN)/' \
>-		${WRKSRC}/Makefile
>+post-patch:
> 	${REINPLACE_CMD} -e 's/-pipe -O2 //' \
> 		-e 's|/usr/local|${LOCALBASE}|' \
> 		${WRKSRC}/Makerules
> 	${RM} -r ${WRKSRC}/thirdparty/*
> 
>+post-install:
>+	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf
>+.for binary in mudraw mutool mujstest mupdf
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${binary}
>+.endfor
>+
> .include <bsd.port.mk>
>diff -ur mupdf.orig/distinfo mupdf/distinfo
>--- mupdf.orig/distinfo	2014-08-04 12:52:17.000000000 +0200
>+++ mupdf/distinfo	2014-08-04 12:53:44.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (mupdf-1.2-source.zip) = 9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b
>-SIZE (mupdf-1.2-source.zip) = 13808821
>+SHA256 (mupdf-1.5-source.tar.gz) = e41fa8951de3b44a5ec95052b8897fbcca1eb721e0fd0289862e31e2f03f846a
>+SIZE (mupdf-1.5-source.tar.gz) = 13269193
>diff -ur mupdf.orig/files/patch-Makefile mupdf/files/patch-Makefile
>--- mupdf.orig/files/patch-Makefile	2014-08-04 12:52:17.000000000 +0200
>+++ mupdf/files/patch-Makefile	2014-08-04 15:10:32.000000000 +0200
>@@ -1,67 +1,16 @@
>---- Makefile.orig	2013-02-13 09:25:07.000000000 -0500
>-+++ Makefile	2013-05-06 13:00:30.619173583 -0400
>-@@ -12,19 +12,13 @@ default: all
>- # Do not specify CFLAGS or LIBS on the make invocation line - specify
>- # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
>- # set a variable that was set on the command line.
>--CFLAGS += $(XCFLAGS) -Ifitz -Ipdf -Ixps -Icbz -Iscripts
>--LIBS += $(XLIBS) -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lm
>-+CFLAGS += -Ifitz -Ipdf -Ixps -Icbz -Iscripts $(XCFLAGS)
>-+LIBS += -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lm $(XLIBS)
>- LIBS_V8 = $(LIBS) $(V8LIBS)
>- 
>+--- ./Makefile.orig	2014-08-04 15:10:15.000000000 +0200
>++++ ./Makefile	2014-08-04 15:10:27.000000000 +0200
>+@@ -18,13 +18,6 @@
>  include Makerules
>  include Makethird
>  
>--THIRD_LIBS := $(FREETYPE_LIB)
>+-THIRD_LIBS += $(FREETYPE_LIB)
> -THIRD_LIBS += $(JBIG2DEC_LIB)
> -THIRD_LIBS += $(JPEG_LIB)
> -THIRD_LIBS += $(OPENJPEG_LIB)
>+-THIRD_LIBS += $(OPENSSL_LIB)
> -THIRD_LIBS += $(ZLIB_LIB)
> -
>- ifeq "$(verbose)" ""
>- QUIET_AR = @ echo ' ' ' ' AR $@ ;
>- QUIET_CC = @ echo ' ' ' ' CC $@ ;
>-@@ -169,14 +163,15 @@ $(MUTOOL) : $(addprefix $(OUT)/, pdfclea
>- 
>- ifeq "$(NOX11)" ""
>- MUVIEW := $(OUT)/mupdf
>-+ifeq "$(V8_PRESENT)" "1"
>-+$(MUVIEW) : $(FITZ_V8_LIB) $(THIRD_LIBS)
>-+$(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
>-+	$(LINK_V8_CMD) $(X11_LIBS)
>-+else
>- $(MUVIEW) : $(FITZ_LIB) $(THIRD_LIBS)
>- $(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
>- 	$(LINK_CMD) $(X11_LIBS)
>--
>--MUVIEW_V8 := $(OUT)/mupdf-v8
>--$(MUVIEW_V8) : $(FITZ_V8_LIB) $(THIRD_LIBS)
>--$(MUVIEW_V8) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
>--	$(LINK_V8_CMD) $(X11_LIBS)
>-+endif
>- endif
>- 
>- MUJSTEST_V8 := $(OUT)/mujstest-v8
>-@@ -184,12 +179,6 @@ $(MUJSTEST_V8) : $(FITZ_V8_LIB) $(THIRD_
>- $(MUJSTEST_V8) : $(addprefix $(OUT)/, jstest_main.o pdfapp.o)
>- 	$(LINK_V8_CMD)
>- 
>--ifeq "$(V8_PRESENT)" "1"
>--JSTARGETS := $(MUJSTEST_V8) $(FITZ_V8_LIB) $(MUVIEW_V8)
>--else
>--JSTARGETS :=
>--endif
>--
>- # --- Format man pages ---
>- 
>- %.txt: %.1
>-@@ -212,7 +201,7 @@ install: $(FITZ_LIB) $(MUVIEW) $(MUDRAW)
>- 	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1
>- 	install $(FITZ_LIB) $(DESTDIR)$(libdir)
>- 	install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(DESTDIR)$(incdir)
>--	install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(DESTDIR)$(bindir)
>-+	install $(MUVIEW) $(MUDRAW) $(MUTOOL) $(DESTDIR)$(bindir)
>- 	install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1
>- 
>- # --- Clean and Default ---
>+ LIBS += $(FREETYPE_LIBS)
>+ LIBS += $(JBIG2DEC_LIBS)
>+ LIBS += $(JPEG_LIBS)
>Only in mupdf.orig/files: patch-apps_x11_main.c
>Only in mupdf/files: patch-platform__x11__x11_main.c
>Only in mupdf/files: patch-source__fitz__load-jpx.c

Actions: View | Diff

Attachments on bug 184335: 145367 | 145370 | 145371