pkg/49843: Update print/mupdf to 1.7

[Leonardo Taccari <iamleot%gmail.com@localhost>]

>Number:         49843
>Category:       pkg
>Synopsis:       Update print/mupdf to 1.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Apr 16 18:50:00 +0000 2015
>Originator:     Leonardo Taccari
>Release:        NetBSD 7.99.9
>Organization:
Università Politecnica delle Marche
>Environment:
	
	
System: NetBSD boh 7.99.9 NetBSD 7.99.9 (GENERIC) #15: Mon Apr 6 23:07:14 CEST 2015 leot@boh:/usr/obj/sys/arch/amd64/compile/GENERIC amd64
Architecture: x86_64
Machine: amd64
>Description:
	print/mupdf in pkgsrc (1.6) is not the latest stable version (1.7).
>How-To-Repeat:
	$ cd pkgsrc/print/mupdf
	$ make show-var VARNAME=PKGVERSION_NOREV
>Fix:
	Please apply the attached patches. While here I also would like to
	maintain this package and changed MAINTAINER accordingly. I have also
	updated files/mupdf.pc and bumped BUILDLINK_A[BP]I_DEPENDS.mupdf because
	the API has changed (for more information please give a look below to
	the attached changelog). A possible commit message is also attached.

	Thank you for your attention!


-------------------8<-----------------8<-----------------8<-------------------
Update print/mupdf to 1.7.

Changes:
MuPDF 1.7 (2015-04-16)

   The 1.7 release is here!

MuPDF 1.7 RC1 (2015-04-08)

   The 1.7 release is almost here!

   Headline changes:
     * New 'Indie dev' licensing options - contact sales%artifex.com@localhost
       for more details.
     * New HTML layout engine, and (DRM-free) EPUB viewer.
     * Reduced memory usage - displaylists and internal PDF representation
       take much less memory, reducing total memory use on some files by
       over 60%.

   Important API changes:
     * Bound contexts have been removed; we now pass fz_contexts
       explicitly.
     * Reference counting of paths and text structures.

   Features:
     * Add mutool pages option.
     * Tweaked rendering to prevent feature dropout in common cases.
     * Viewer tweaks
          + Better mouse wheel handling
          + Shift-space support
          + Mouse button control of presentation mode
          + Failed reloads do not close document

   Internal changes:
     * PDF filter revamp - simpler interface.
     * Devices use derived structures rather than user pointer.
     * Sparse PDF xrefs held in more compact form.
     * New gsview viewer split out to its own repository.

   Bug fixes
     * Improved handling of broken files.
     * Fix BBoxes of Type 3 fonts.
     * Updated fonts (including greek and cyrillic).
     * Various memory leaks and crashes.
     * And many more.
-------------------8<-----------------8<-----------------8<-------------------


-------------------8<-----------------8<-----------------8<-------------------
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- Makefile	5 Oct 2014 15:19:18 -0000	1.28
+++ Makefile	16 Apr 2015 18:33:07 -0000
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.28 2014/10/05 15:19:18 wiz Exp $
 
-DISTNAME=	mupdf-1.6-source
+DISTNAME=	mupdf-1.7-source
 PKGNAME=	${DISTNAME:S/-source//}
 CATEGORIES=	print
 MASTER_SITES=	http://mupdf.com/downloads/
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	leot1990%users.sourceforge.net@localhost
 HOMEPAGE=	http://mupdf.com/
 COMMENT=	Lightweight PDF viewer and toolkit
 LICENSE=	gnu-agpl-v3
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- PLIST	5 Oct 2014 15:19:18 -0000	1.8
+++ PLIST	16 Apr 2015 18:33:07 -0000
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2014/10/05 15:19:18 wiz Exp $
+@comment $NetBSD$
 bin/mudraw
 bin/mujstest
 bin/mupdf
 bin/mutool
-include/mupdf/cbz.h
 include/mupdf/fitz.h
 include/mupdf/fitz/annotation.h
 include/mupdf/fitz/bitmap.h
@@ -25,7 +24,6 @@
 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
@@ -45,22 +43,26 @@
 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-tools.h
 include/mupdf/pdf.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
@@ -68,7 +70,6 @@
 include/mupdf/pdf/resource.h
 include/mupdf/pdf/widget.h
 include/mupdf/pdf/xref.h
-include/mupdf/tiff.h
 include/mupdf/xps.h
 lib/libmujs.la
 lib/libmupdf.la
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- buildlink3.mk	30 May 2014 21:39:37 -0000	1.6
+++ buildlink3.mk	16 Apr 2015 18:33:07 -0000
@@ -5,8 +5,8 @@
 .if !defined(MUPDF_BUILDLINK3_MK)
 MUPDF_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mupdf+=	mupdf>=1.3
-BUILDLINK_ABI_DEPENDS.mupdf?=	mupdf>=1.4nb1
+BUILDLINK_API_DEPENDS.mupdf+=	mupdf>=1.7
+BUILDLINK_ABI_DEPENDS.mupdf?=	mupdf>=1.7
 BUILDLINK_PKGSRCDIR.mupdf?=	../../print/mupdf
 
 pkgbase := mupdf
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo	5 Oct 2014 15:19:18 -0000	1.17
+++ distinfo	16 Apr 2015 18:33:07 -0000
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.17 2014/10/05 15:19:18 wiz Exp $
 
-SHA1 (mupdf-1.6-source.tar.gz) = 491d7a3b131589791c7df6dd8161c6bfe41ce74a
-RMD160 (mupdf-1.6-source.tar.gz) = c2bab0bbb538cd446cbc7828c0a59c74c61c70cb
-Size (mupdf-1.6-source.tar.gz) = 13975531 bytes
+SHA1 (mupdf-1.7-source.tar.gz) = 2ea656e2baa31a9c0446090245e7aa9510d1f54a
+RMD160 (mupdf-1.7-source.tar.gz) = efcfa3ff6c54faf74dd76c10b686158a3997112d
+Size (mupdf-1.7-source.tar.gz) = 13301969 bytes
 SHA1 (patch-Makethird) = 5ec66437c5695558f5e6497182d1f0c197ee5299
 SHA1 (patch-ab) = b965020ec098fc1bf8577cb16102ab4c37bb37d3
-SHA1 (patch-ac) = 2b0fe5f97df7b6709ba7a3abfbefdf72ee81e0a3
+SHA1 (patch-ac) = 2db78731ebbac03a2cfe3329e20544db013b3b10
 SHA1 (patch-ae) = bad4b6b8c669c752c6318bb564d1176daac30d19
 SHA1 (patch-source_fitz_load-jpx.c) = e5271cf60aff104e05ff60333be54712475d5a33
Index: files/mupdf.pc
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/files/mupdf.pc,v
retrieving revision 1.6
diff -u -r1.6 mupdf.pc
--- files/mupdf.pc	21 Apr 2014 16:14:40 -0000	1.6
+++ files/mupdf.pc	16 Apr 2015 18:33:07 -0000
@@ -5,6 +5,6 @@
 
 Name: mupdf
 Description: library for PDF files
-Version: 1.4
+Version: 1.7
 Libs: -Wl,-R${libdir} -L${libdir} -lmupdf
 Cflags: -I${includedir}
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/patches/patch-ac,v
retrieving revision 1.9
diff -u -r1.9 patch-ac
--- patches/patch-ac	15 Jun 2014 14:14:18 -0000	1.9
+++ patches/patch-ac	16 Apr 2015 18:33:07 -0000
@@ -6,7 +6,7 @@
  install it as "mupdf"
 o libmujs support: install like a non-thirdparty mupdf's library
 
---- Makefile.orig	2014-06-10 15:09:28.000000000 +0000
+--- Makefile.orig	2015-04-08 15:04:10.000000000 +0000
 +++ Makefile
 @@ -41,22 +41,12 @@ CFLAGS += $(ZLIB_CFLAGS)
  
@@ -37,22 +37,20 @@
  
  # --- File lists ---
  
-@@ -90,33 +80,33 @@ CBZ_SRC_HDR := $(wildcard source/cbz/*.h
- IMG_SRC_HDR := $(wildcard source/img/*.h)
- TIFF_SRC_HDR := $(wildcard source/tiff/*.h)
+@@ -87,32 +77,32 @@ PDF_SRC_HDR := $(wildcard source/pdf/*.h
+ XPS_SRC_HDR := $(wildcard source/xps/*.h)
+ HTML_SRC_HDR := $(wildcard source/html/*.h)
  
 -FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC))))
 -PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC))))
 -XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC))))
 -CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC))))
--IMG_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(IMG_SRC))))
--TIFF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(TIFF_SRC))))
+-HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(HTML_SRC))))
 +FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(FITZ_SRC))))
 +PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(PDF_SRC))))
 +XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(XPS_SRC))))
 +CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(CBZ_SRC))))
-+IMG_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(IMG_SRC))))
-+TIFF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(TIFF_SRC))))
++HTML_OBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(HTML_SRC))))
  
  # --- Choice of Javascript library ---
  
@@ -84,17 +82,16 @@
  endif
  
  $(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR)
-@@ -128,41 +118,44 @@ $(TIFF_OBJ) : $(FITZ_HDR) $(IMG_HDR) $(T
+@@ -123,44 +113,47 @@ $(HTML_OBJ) : $(FITZ_HDR) $(HTML_HDR) $(
  
  # --- Library ---
  
 -MUPDF_LIB := $(OUT)/libmupdf.a
 +MUPDF_LIB := $(OUT)/libmupdf.la
  
- $(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(IMG_OBJ) $(TIFF_OBJ)
+ $(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ)
  
--INSTALL_LIBS := $(MUPDF_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) 
+ INSTALL_LIBS := $(MUPDF_LIB)
 +ifeq "$(HAVE_MUJS)" "yes"
 +INSTALL_LIBS += $(MUJS_LIB)
 +endif
@@ -130,6 +127,10 @@
 +$(OUT)/platform/x11/%.lo : platform/x11/%.c | $(ALL_DIR)
  	$(CC_CMD) $(X11_CFLAGS)
  
+-$(OUT)/platform/x11/%.o: platform/x11/%.rc | $(OUT)
++$(OUT)/platform/x11/%.lo: platform/x11/%.rc | $(OUT)
+ 	windres $< $@
+ 
 -$(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR)
 +$(OUT)/platform/x11/curl/%.lo : platform/x11/%.c | $(ALL_DIR)
  	$(CC_CMD) $(X11_CFLAGS) $(CURL_CFLAGS) -DHAVE_CURL
@@ -139,38 +140,40 @@
  
  # --- Generated CMAP, FONT and JAVASCRIPT files ---
  
-@@ -222,23 +215,23 @@ endif
+@@ -224,24 +217,24 @@ endif
  
- generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN)
+ generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) $(NAME_GEN)
  
 -$(OUT)/pdf/pdf-cmap-table.o : $(CMAP_GEN)
 -$(OUT)/pdf/pdf-fontfile.o : $(FONT_GEN)
 -$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN)
 -$(OUT)/pdf/js/pdf-js.o : $(JAVASCRIPT_GEN)
--$(OUT)/cmapdump.o : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c
+-$(OUT)/pdf/pdf-object.o : source/pdf/pdf-name-table.h
+-$(OUT)/cmapdump.o : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h
 +$(OUT)/pdf/pdf-cmap-table.lo : $(CMAP_GEN)
 +$(OUT)/pdf/pdf-fontfile.lo : $(FONT_GEN)
 +$(OUT)/pdf/pdf-pkcs7.lo : $(ADOBECA_GEN)
 +$(OUT)/pdf/js/pdf-js.lo : $(JAVASCRIPT_GEN)
-+$(OUT)/cmapdump.lo : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c
++$(OUT)/pdf/pdf-object.lo : source/pdf/pdf-name-table.h
++$(OUT)/cmapdump.lo : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h
  
  # --- Tools and Apps ---
  
  MUDRAW := $(addprefix $(OUT)/, mudraw)
 -MUDRAW_OBJ := $(addprefix $(OUT)/tools/, mudraw.o)
 +MUDRAW_OBJ := $(addprefix $(OUT)/tools/, mudraw.lo)
- $(MUDRAW_OBJ) : $(FITZ_HDR)
+ $(MUDRAW_OBJ) : $(FITZ_HDR) $(PDF_HDR)
  $(MUDRAW) : $(MUPDF_LIB) $(THIRD_LIBS)
  $(MUDRAW) : $(MUDRAW_OBJ)
  	$(LINK_CMD)
  
  MUTOOL := $(addprefix $(OUT)/, mutool)
--MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o)
-+MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.lo pdfclean.lo pdfextract.lo pdfinfo.lo pdfposter.lo pdfshow.lo)
+-MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o)
++MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.lo pdfclean.lo pdfextract.lo pdfinfo.lo pdfposter.lo pdfshow.lo pdfpages.lo)
  $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
  $(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIBS)
  $(MUTOOL) : $(MUTOOL_OBJ)
-@@ -246,25 +239,25 @@ $(MUTOOL) : $(MUTOOL_OBJ)
+@@ -249,27 +242,27 @@ $(MUTOOL) : $(MUTOOL_OBJ)
  
  MJSGEN := $(OUT)/mjsgen
  $(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIBS)
@@ -179,9 +182,11 @@
  	$(LINK_CMD)
  
  MUJSTEST := $(OUT)/mujstest
+-MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
++MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.lo pdfapp.lo)
+ $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR)
  $(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIBS)
--$(MUJSTEST) : $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
-+$(MUJSTEST) : $(addprefix $(OUT)/platform/x11/, jstest_main.lo pdfapp.lo)
+ $(MUJSTEST) : $(MUJSTEST_OBJ)
  	$(LINK_CMD)
  
  ifeq "$(HAVE_X11)" "yes"
@@ -202,9 +207,18 @@
  $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
  $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIBS) $(CURL_LIB)
  $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ)
-@@ -275,7 +268,12 @@ endif
- MUVIEW := $(MUVIEW_X11)
- MUVIEW_CURL := $(MUVIEW_X11_CURL)
+@@ -279,7 +272,7 @@ endif
+ 
+ ifeq "$(HAVE_WIN32)" "yes"
+ MUVIEW_WIN32 := $(OUT)/mupdf
+-MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o)
++MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.lo pdfapp.lo win_res.lo)
+ $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR)
+ $(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIBS)
+ $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ)
+@@ -289,7 +282,12 @@ endif
+ MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32)
+ MUVIEW_CURL := $(MUVIEW_X11_CURL) $(MUVIEW_WIN32_CURL)
  
 -INSTALL_APPS := $(MUDRAW) $(MUTOOL) $(MUVIEW) $(MUJSTEST) $(MUVIEW_CURL)
 +INSTALL_APPS := $(MUDRAW) $(MUTOOL) $(MUJSTEST)
@@ -214,9 +228,9 @@
 +INSTALL_APPS += $(MUVIEW)
 +endif
  
- # --- Update version string header ---
+ # --- Examples ---
  
-@@ -308,24 +306,26 @@ libs: $(INSTALL_LIBS)
+@@ -331,24 +329,26 @@ libs: $(INSTALL_LIBS)
  apps: $(INSTALL_APPS)
  
  install: libs apps

>Unformatted: