[pkgsrc/trunk]: pkgsrc/print/mupdf mupdf: Update print/mupdf to ...

[leot <leot%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3cff3c59251b
branches:  trunk
changeset: 307439:3cff3c59251b
user:      leot <leot%pkgsrc.org@localhost>
date:      Sun May 06 13:19:10 2018 +0000
description:
mupdf: Update print/mupdf to 1.13.0

pkgsrc changes:
 - Directly override VERSION in files/mupdf.pc in the post-build phase
   (to avoid an extra manual step for every mupdf update)
 - Get rid of OPJ_STATIC patch hunk in patches/patch-source_fitz_load-jpx.c (it
   is no more needed, because the `-DOPJ_STATIC' is now passed in Makefile-s
   when the bundled openjpeg is used).
 - Pass HAVE_LIBCRYPTO=no to avoid requiring openssl>=1.1.0.

Changes:
1.13.0
------
* This is primarily a bugfix release.
* New "mutool sign" tool for showing and verifying digital signatures.
* Chinese, Japanese, Korean, Cyrillic, and Greek font support in mutool create.
* Improvements to annotation editing API.

diffstat:

 print/mupdf/Makefile                               |   9 +-
 print/mupdf/PLIST                                  |   3 +-
 print/mupdf/buildlink3.mk                          |   5 +-
 print/mupdf/distinfo                               |  19 ++--
 print/mupdf/files/mupdf.pc                         |   4 +-
 print/mupdf/patches/patch-ab                       |  17 +--
 print/mupdf/patches/patch-ac                       |  80 ++++++++++++---------
 print/mupdf/patches/patch-platform_gl_gl-main.c    |  16 ++++
 print/mupdf/patches/patch-source_fitz_load-jpx.c   |  23 +----
 print/mupdf/patches/patch-thirdparty_mujs_Makefile |  82 ++++++++++-----------
 10 files changed, 133 insertions(+), 125 deletions(-)

diffs (truncated from 594 to 300 lines):

diff -r 35b6406a8bfe -r 3cff3c59251b print/mupdf/Makefile
--- a/print/mupdf/Makefile      Sun May 06 12:18:04 2018 +0000
+++ b/print/mupdf/Makefile      Sun May 06 13:19:10 2018 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2018/04/29 21:31:22 adam Exp $
+# $NetBSD: Makefile,v 1.60 2018/05/06 13:19:10 leot Exp $
 
-DISTNAME=      mupdf-1.12.0-source
+DISTNAME=      mupdf-1.13.0-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   3
 CATEGORIES=    print
 MASTER_SITES=  https://mupdf.com/downloads/archive/
 
@@ -22,6 +21,7 @@
 MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=           XCFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=           build=release
+MAKE_ENV+=             HAVE_LIBCRYPTO=no       # Needs openssl-1.1.0
 
 CFLAGS+=       -DJBIG_NO_MEMENTO
 CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
@@ -44,7 +44,8 @@
            ${WRKSRC}/thirdparty/zlib
 
 post-build:
-       sed -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc
+       sed -e "s,@PREFIX@,${PREFIX}," -e "s,@VERSION@,${PKGVERSION_NOREV}," \
+            ${FILESDIR}/mupdf.pc > ${WRKSRC}/mupdf.pc
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/mupdf.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
diff -r 35b6406a8bfe -r 3cff3c59251b print/mupdf/PLIST
--- a/print/mupdf/PLIST Sun May 06 12:18:04 2018 +0000
+++ b/print/mupdf/PLIST Sun May 06 13:19:10 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2017/12/18 15:06:33 leot Exp $
+@comment $NetBSD: PLIST,v 1.16 2018/05/06 13:19:10 leot Exp $
 bin/mjsgen
 bin/mujstest
 bin/mupdf
@@ -85,6 +85,7 @@
 include/mupdf/ucdn.h
 lib/libmupdf.la
 lib/libmupdfthird.la
+lib/libmupkcs7.la
 lib/libmuthreads.la
 lib/pkgconfig/mupdf.pc
 man/man1/mupdf.1
diff -r 35b6406a8bfe -r 3cff3c59251b print/mupdf/buildlink3.mk
--- a/print/mupdf/buildlink3.mk Sun May 06 12:18:04 2018 +0000
+++ b/print/mupdf/buildlink3.mk Sun May 06 13:19:10 2018 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.23 2018/04/29 21:31:22 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2018/05/06 13:19:10 leot Exp $
 
 BUILDLINK_TREE+=       mupdf
 
 .if !defined(MUPDF_BUILDLINK3_MK)
 MUPDF_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mupdf+=  mupdf>=1.12.0
-BUILDLINK_ABI_DEPENDS.mupdf?=  mupdf>=1.12.0nb3
+BUILDLINK_API_DEPENDS.mupdf+=  mupdf>=1.13.0
 BUILDLINK_PKGSRCDIR.mupdf?=    ../../print/mupdf
 
 pkgbase := mupdf
diff -r 35b6406a8bfe -r 3cff3c59251b print/mupdf/distinfo
--- a/print/mupdf/distinfo      Sun May 06 12:18:04 2018 +0000
+++ b/print/mupdf/distinfo      Sun May 06 13:19:10 2018 +0000
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.39 2017/12/18 15:06:33 leot Exp $
+$NetBSD: distinfo,v 1.40 2018/05/06 13:19:10 leot Exp $
 
-SHA1 (mupdf-1.12.0-source.tar.gz) = 0daee66600023de2bda2f1928a97a8515c17d2d2
-RMD160 (mupdf-1.12.0-source.tar.gz) = 9d36991f260c55c28ffc7f3b1d2acee84f735407
-SHA512 (mupdf-1.12.0-source.tar.gz) = 11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
-Size (mupdf-1.12.0-source.tar.gz) = 51508917 bytes
+SHA1 (mupdf-1.13.0-source.tar.gz) = d4fe867dbdef2e1a465e66cbbd1efb4b1285ef48
+RMD160 (mupdf-1.13.0-source.tar.gz) = 078e972c2f41a34308a52af24ac5ddbf41471342
+SHA512 (mupdf-1.13.0-source.tar.gz) = d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707
+Size (mupdf-1.13.0-source.tar.gz) = 51425034 bytes
 SHA1 (patch-Makethird) = 77820f7344e00140a9792b5a6a3ddb1afa01b7bb
-SHA1 (patch-ab) = 0aafa5815fc0907e3ddcc8f0e7c83510a82669d8
-SHA1 (patch-ac) = 799efd894505fd960953905e61022411e8adf1ef
+SHA1 (patch-ab) = 5ca9de36a7f38cdcf0578cded98cdd54bed78ab5
+SHA1 (patch-ac) = 0c140ee7f0a86bc300c91845da0bd3bf5f0b7c14
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = 6e5e547df27ecb2b82cadd71489d2eb9138c1ce2
-SHA1 (patch-source_fitz_load-jpx.c) = 18b47e3b478183c8e85a6ad1e6cabbbf48cf9f6b
-SHA1 (patch-thirdparty_mujs_Makefile) = 713946f25ae1ea44878b19b9430324e3d9f98990
+SHA1 (patch-platform_gl_gl-main.c) = 526c3e8c1c548490ef97f59e491b237f803f250e
+SHA1 (patch-source_fitz_load-jpx.c) = b507c1ebab027167af363c9f0f64d8690ea75ff3
+SHA1 (patch-thirdparty_mujs_Makefile) = d3e163bcc4e3d2509401b87e5da8eddb35394dc9
diff -r 35b6406a8bfe -r 3cff3c59251b print/mupdf/files/mupdf.pc
--- a/print/mupdf/files/mupdf.pc        Sun May 06 12:18:04 2018 +0000
+++ b/print/mupdf/files/mupdf.pc        Sun May 06 13:19:10 2018 +0000
@@ -5,6 +5,6 @@
 
 Name: mupdf
 Description: library for PDF files
-Version: 1.12.0
-Libs: -Wl,-R${libdir} -L${libdir} -lmupdf -lmupdfthird -lmuthreads
+Version: @VERSION@
+Libs: -Wl,-R${libdir} -L${libdir} -lmupdf -lmupdfthird -lmuthreads -lmupkcs7
 Cflags: -I${includedir}
diff -r 35b6406a8bfe -r 3cff3c59251b print/mupdf/patches/patch-ab
--- a/print/mupdf/patches/patch-ab      Sun May 06 12:18:04 2018 +0000
+++ b/print/mupdf/patches/patch-ab      Sun May 06 13:19:10 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.16 2017/12/18 15:06:34 leot Exp $
+$NetBSD: patch-ab,v 1.17 2018/05/06 13:19:10 leot Exp $
 
 - Handle the various operating systems in the same way avoiding hardcoding
 - Avoid internal version of freeglut and try to pick it up via pkg-config and
@@ -8,9 +8,9 @@
   If no lcms2 is available just pass `-DNO_ICC' to disable it via
   SYS_LCMS2_CFLAGS.
 
---- Makerules.orig     2017-11-23 11:42:45.000000000 +0000
+--- Makerules.orig     2018-04-12 13:14:06.000000000 +0000
 +++ Makerules
-@@ -62,41 +62,10 @@ else
+@@ -65,38 +65,10 @@ else
  $(error unknown build setting: '$(build)')
  endif
  
@@ -20,9 +20,6 @@
 -WINDRES := windres
 -HAVE_X11 ?= no
 -HAVE_WIN32 := yes
--CC=gcc
--# Add flags required for Harfbuzz because of missing strdup
--CFLAGS+= -U__STRICT_ANSI__
 -
 -# Mac OS X doesn't have pkg-config so we hard code paths.
 -else ifeq "$(OS)" "MACOS"
@@ -49,10 +46,10 @@
 -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)
-@@ -113,7 +82,6 @@ SYS_CURL_CFLAGS += $(shell pkg-config --
+@@ -113,7 +85,6 @@ SYS_CURL_CFLAGS += $(shell pkg-config --
  SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
  endif
  endif
@@ -60,7 +57,7 @@
  
  ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
  HAVE_X11 := yes
-@@ -121,6 +89,12 @@ SYS_X11_CFLAGS := $(shell pkg-config --c
+@@ -121,6 +92,12 @@ SYS_X11_CFLAGS := $(shell pkg-config --c
  SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
  endif
  
@@ -73,7 +70,7 @@
  ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
  SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
  SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
-@@ -136,12 +110,17 @@ SYS_OPENJPEG_CFLAGS := $(shell pkg-confi
+@@ -136,12 +113,17 @@ SYS_OPENJPEG_CFLAGS := $(shell pkg-confi
  SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
  endif
  
diff -r 35b6406a8bfe -r 3cff3c59251b print/mupdf/patches/patch-ac
--- a/print/mupdf/patches/patch-ac      Sun May 06 12:18:04 2018 +0000
+++ b/print/mupdf/patches/patch-ac      Sun May 06 13:19:10 2018 +0000
@@ -1,22 +1,23 @@
-$NetBSD: patch-ac,v 1.18 2017/12/18 15:06:34 leot Exp $
+$NetBSD: patch-ac,v 1.19 2018/05/06 13:19:10 leot Exp $
 
 - libtool support 
 - Install target cleanup
-- Also install muthreads library (needed by various tools)
+- Also install muthreads and mupkcs7 libraries (needed by various tools)
 - Do not force `-O0' flag when building
 - Get rid of unused VERSION variable and `version:' target (otherwise `git' can
   be invoked during the building phase)
 - Install only one `mupdf' binary, prefer the featureful one and always
   install it as `mupdf'.
+- Install all EXTRA_APPS (muraster, mujstest, mjsgen)
 
---- Makefile.orig      2017-11-23 11:42:45.000000000 +0000
+--- Makefile.orig      2018-04-12 13:14:06.000000000 +0000
 +++ Makefile
-@@ -71,10 +71,10 @@ QUIET_TAGS = @ echo ' ' ' ' TAGS $@ ;
+@@ -72,10 +72,10 @@ QUIET_TAGS = @ echo ' ' ' ' TAGS $@ ;
  QUIET_WINDRES = @ echo ' ' ' ' WINDRES $@ ;
  endif
  
 -CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $<
--CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $<
+-CXX_CMD = $(QUIET_CXX) $(CXX) $(filter-out -Wdeclaration-after-statement,$(CFLAGS)) -o $@ -c $<
 -AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
 -LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 +CC_CMD = $(QUIET_CC) ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $<
@@ -26,7 +27,7 @@
  MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
  RM_CMD = $(QUIET_RM) rm -f $@
  TAGS_CMD = $(QUIET_TAGS) ctags $^
-@@ -85,42 +85,42 @@ WINDRES_CMD = $(QUIET_WINDRES) $(WINDRES
+@@ -86,45 +86,45 @@ WINDRES_CMD = $(QUIET_WINDRES) $(WINDRES
  $(ALL_DIR) $(OUT) generated :
        $(MKDIR_CMD)
  
@@ -40,10 +41,14 @@
 +$(OUT)/%.exe: $(OUT)/%.lo | $(ALL_DIR)
        $(LINK_CMD)
  
--$(OUT)/source/helpers/%.o : source/helpers/%.c | $(ALL_DIR)
-+$(OUT)/source/helpers/%.lo : source/helpers/%.c | $(ALL_DIR)
+-$(OUT)/source/helpers/mu-threads/%.o : source/helpers/mu-threads/%.c | $(ALL_DIR)
++$(OUT)/source/helpers/mu-threads/%.lo : source/helpers/mu-threads/%.c | $(ALL_DIR)
        $(CC_CMD) $(THREADING_CFLAGS)
  
+-$(OUT)/source/helpers/pkcs7/%.o : source/helpers/pkcs7/%.c | $(ALL_DIR)
++$(OUT)/source/helpers/pkcs7/%.lo : source/helpers/pkcs7/%.c | $(ALL_DIR)
+       $(CC_CMD)
+ 
 -$(OUT)/source/tools/%.o : source/tools/%.c | $(ALL_DIR)
 +$(OUT)/source/tools/%.lo : source/tools/%.c | $(ALL_DIR)
        $(CC_CMD) $(THREADING_CFLAGS)
@@ -82,7 +87,7 @@
  
  # --- File lists ---
  
-@@ -144,14 +144,14 @@ SVG_SRC_HDR := $(wildcard source/svg/*.h
+@@ -153,16 +153,16 @@ SVG_SRC_HDR := $(wildcard source/svg/*.h
  HTML_SRC_HDR := $(wildcard source/html/*.h)
  GPRF_SRC_HDR := $(wildcard source/gprf/*.h)
  
@@ -94,6 +99,8 @@
 -HTML_OBJ := $(HTML_SRC:%.c=$(OUT)/%.o)
 -GPRF_OBJ := $(GPRF_SRC:%.c=$(OUT)/%.o)
 -THREAD_OBJ := $(THREAD_SRC:%.c=$(OUT)/%.o)
+-PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
+-SIGNATURE_OBJ := $(OUT)/platform/x11/pdfapp.o $(OUT)/source/tools/pdfsign.o
 +FITZ_OBJ := $(FITZ_SRC:%.c=$(OUT)/%.lo)
 +PDF_OBJ := $(PDF_SRC:%.c=$(OUT)/%.lo)
 +XPS_OBJ := $(XPS_SRC:%.c=$(OUT)/%.lo)
@@ -102,10 +109,12 @@
 +HTML_OBJ := $(HTML_SRC:%.c=$(OUT)/%.lo)
 +GPRF_OBJ := $(GPRF_SRC:%.c=$(OUT)/%.lo)
 +THREAD_OBJ := $(THREAD_SRC:%.c=$(OUT)/%.lo)
++PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.lo)
++SIGNATURE_OBJ := $(OUT)/platform/x11/pdfapp.lo $(OUT)/source/tools/pdfsign.lo
  
  $(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR)
  $(PDF_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR)
-@@ -177,7 +177,7 @@ ifneq "$(CROSSCOMPILE)" "yes"
+@@ -190,7 +190,7 @@ ifneq "$(CROSSCOMPILE)" "yes"
  $(NAME_GEN) : $(NAMEDUMP_EXE)
  endif
  
@@ -114,7 +123,7 @@
  
  generate: $(NAME_GEN)
  
-@@ -199,7 +199,7 @@ FONT_GEN_SIL := $(subst resources/fonts/
+@@ -212,7 +212,7 @@ FONT_GEN_SIL := $(subst resources/fonts/
  
  FONT_BIN := $(FONT_BIN_DROID) $(FONT_BIN_NOTO) $(FONT_BIN_HAN) $(FONT_BIN_URW) $(FONT_BIN_SIL)
  FONT_GEN := $(FONT_GEN_DROID) $(FONT_GEN_NOTO) $(FONT_GEN_HAN) $(FONT_GEN_URW) $(FONT_GEN_SIL)
@@ -123,7 +132,7 @@
  
  generated/%.c : resources/fonts/droid/%.ttf $(HEXDUMP_EXE) | generated
        $(QUIET_GEN) $(HEXDUMP_EXE) -s $@ $<
-@@ -229,7 +229,7 @@ generate: $(FONT_GEN)
+@@ -242,7 +242,7 @@ generate: $(FONT_GEN)
  
  ICC_BIN := resources/icc/gray.icc resources/icc/rgb.icc resources/icc/cmyk.icc resources/icc/lab.icc
  ICC_GEN := generated/icc-profiles.c
@@ -132,7 +141,7 @@
  
  $(ICC_OBJ) : $(ICC_GEN)
  $(ICC_GEN) : $(ICC_BIN) | generated
-@@ -255,7 +255,7 @@ CMAP_GEN := \
+@@ -268,7 +268,7 @@ CMAP_GEN := \
        generated/pdf-cmap-extra.c \
        generated/pdf-cmap-utf8.c \
        generated/pdf-cmap-utf32.c
@@ -141,7 +150,7 @@
  
  generated/pdf-cmap-cjk.c : $(CMAP_CJK_SRC) | generated
        $(QUIET_GEN) $(CMAPDUMP_EXE) $@ $(CMAP_CJK_SRC)
-@@ -274,7 +274,7 @@ endif
+@@ -287,7 +287,7 @@ endif
  
  generate: $(CMAP_GEN)
  
@@ -150,7 +159,7 @@
        $(NAME_GEN) \
        include/mupdf/pdf/cmap.h \
        source/fitz/context.c \
-@@ -297,7 +297,7 @@ $(OUT)/scripts/cmapdump.o : \
+@@ -310,7 +310,7 @@ $(OUT)/scripts/cmapdump.o : \