mupdf: Update to 1.18.0

Changes:
1.18.0
------
mutool draw: bbox output format.
mutool draw: structured text extraction in JSON format.
mutool run: StructuredText.walk()
mutool run: PDFPage.process() and PDFAnnotation.process()

mupdf-gl: Added IBM Common User Access shortcuts for copy & paste.
mupdf-gl: Improved redaction UI.

java: Example desktop Java viewer.

wasm: WebAssembly viewer that runs in a browser.

api: Dehyphenation option in structured text extraction, to improve
     searching for words that are hyphenated across lines.
api: pdf_new_date, pdf_to_date, pdf_dict_put_date and pdf_dict_get_date.
api: Added choice of image redaction algorithms: none, full, partial.
api: Optional use of Tesseract to use OCR to extract text.

svg: Many small parsing fixes.
svg: Parse inline CSS style attributes.
svg: Text elements (simple text layout only).

html: Added HTML5 parser.

pdf: High security redaction -- save redacted PDF as flattened bitmap,
     guaranteed to not leak any sensitive redacted information.

Experimental C++ bindings.
Experimental Python bindings.

7 files changed, 100 insertions, 61 deletions

diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile
index 2e470df519e..8bcf30b3d51 100644
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2020/05/22 10:55:50 adam Exp $
+# $NetBSD: Makefile,v 1.85 2020/10/08 22:50:16 leot Exp $
 
-DISTNAME=	mupdf-1.17.0-source
+DISTNAME=	mupdf-1.18.0-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	https://mupdf.com/downloads/archive/
 
@@ -11,7 +10,7 @@ HOMEPAGE=	https://mupdf.com/
 COMMENT=	Lightweight PDF, XPS and E-book viewer and toolkit
 LICENSE=	gnu-agpl-v3
 
-USE_LANGUAGES=	c99
+USE_LANGUAGES=	c99 c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake
 
@@ -22,7 +21,6 @@ LDFLAGS+=		${COMPILER_RPATH_FLAG}${X11BASE}/lib
 MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=		XCFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=		build=release
-MAKE_ENV+=		HAVE_LIBCRYPTO=no	# Needs openssl-1.1.0
 MAKE_ENV+=		USE_SYSTEM_LIBS=yes
 
 CFLAGS.SunOS+=	-D_XOPEN_SOURCE=600
@@ -37,6 +35,7 @@ post-extract:
 	    ${WRKSRC}/thirdparty/curl \
 	    ${WRKSRC}/thirdparty/freeglut \
 	    ${WRKSRC}/thirdparty/freetype \
+	    ${WRKSRC}/thirdparty/gumbo-parser \
 	    ${WRKSRC}/thirdparty/harfbuzz \
 	    ${WRKSRC}/thirdparty/jbig2dec \
 	    ${WRKSRC}/thirdparty/lcms2 \
@@ -64,4 +63,5 @@ BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.7
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
+.include "../../www/gumbo-parser/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/mupdf/PLIST b/print/mupdf/PLIST
index 189d0de5c62..13a776cf6d4 100644
--- a/print/mupdf/PLIST
+++ b/print/mupdf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2020/05/07 20:42:56 leot Exp $
+@comment $NetBSD: PLIST,v 1.21 2020/10/08 22:50:16 leot Exp $
 bin/mupdf
 ${PLIST.curl}bin/mupdf-curl
 ${PLIST.opengl}bin/mupdf-gl
@@ -87,6 +87,8 @@ share/doc/mupdf/building.html
 share/doc/mupdf/coding-overview.html
 share/doc/mupdf/coding-progressive.html
 share/doc/mupdf/coding-style.html
+share/doc/mupdf/ecosystem.html
+share/doc/mupdf/ecosystem.png
 share/doc/mupdf/examples/bbox-device.js
 share/doc/mupdf/examples/create-thumbnail.js
 share/doc/mupdf/examples/draw-device.js
@@ -98,8 +100,10 @@ share/doc/mupdf/examples/multi-threaded.c
 share/doc/mupdf/examples/pdf-create-lowlevel.js
 share/doc/mupdf/examples/pdf-create.js
 share/doc/mupdf/examples/pdf-dejpx.js
+share/doc/mupdf/examples/pdf-extract-rich-media.js
 share/doc/mupdf/examples/pdf-merge.js
 share/doc/mupdf/examples/pdf-portfolio.js
+share/doc/mupdf/examples/pdf-trace.js
 share/doc/mupdf/examples/trace-device.js
 share/doc/mupdf/index.html
 share/doc/mupdf/manual-mupdf-gl.html
diff --git a/print/mupdf/buildlink3.mk b/print/mupdf/buildlink3.mk
index 396c59e5560..f99e32721c8 100644
--- a/print/mupdf/buildlink3.mk
+++ b/print/mupdf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.39 2020/05/22 10:55:50 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.40 2020/10/08 22:50:16 leot Exp $
 
 BUILDLINK_TREE+=	mupdf
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	mupdf
 MUPDF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mupdf+=	mupdf>=1.14.0
-BUILDLINK_ABI_DEPENDS.mupdf?=	mupdf>=1.17.0nb1
+BUILDLINK_ABI_DEPENDS.mupdf?=	mupdf>=1.18.0
 BUILDLINK_PKGSRCDIR.mupdf?=	../../print/mupdf
 
 pkgbase := mupdf
@@ -27,6 +27,7 @@ pkgbase := mupdf
 .include "../../graphics/jbig2dec/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../www/gumbo-parser/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif	# MUPDF_BUILDLINK3_MK
diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo
index 2731365c921..523f776beb7 100644
--- a/print/mupdf/distinfo
+++ b/print/mupdf/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.51 2020/05/07 20:42:56 leot Exp $
+$NetBSD: distinfo,v 1.52 2020/10/08 22:50:16 leot Exp $
 
-SHA1 (mupdf-1.17.0-source.tar.gz) = 3d7db1aaeef5dc61143e2d89e78c3b1a66866b35
-RMD160 (mupdf-1.17.0-source.tar.gz) = 98c5473e78a48ece1fb2c6c49e5ded007ba42dab
-SHA512 (mupdf-1.17.0-source.tar.gz) = a049c4dde20d42d4165959c58434a838581413b89afe0c4e72f40dc54097966b995357eece5e81d87b5d64f24c57c5778bc5b9a7b668057d01b736fc17bc3cb3
-Size (mupdf-1.17.0-source.tar.gz) = 65510829 bytes
-SHA1 (patch-Makethird) = 027f69be8ab3bb29535d3315d85c2d5d32a4dccf
-SHA1 (patch-ab) = 6f6764288ce71f452364ef70db8d7cb532c9fc00
-SHA1 (patch-ac) = 3128a383a7ece0330e6fa05b396087d2b17f58d9
+SHA1 (mupdf-1.18.0-source.tar.gz) = 8cc9d04313d06e3d514b961b7b900b721ebc24e0
+RMD160 (mupdf-1.18.0-source.tar.gz) = 59fce4cd71417510ed997ce518e34f426e981951
+SHA512 (mupdf-1.18.0-source.tar.gz) = dd3d413badc5ea50ee100a39aa0265f2d096006e6466f3029ef5f4902e7a9f8e9f958b78ae484524233217ae6ef6ecf56431b8ac462d603a050c4e490503aef1
+Size (mupdf-1.18.0-source.tar.gz) = 72621417 bytes
+SHA1 (patch-Makethird) = 4d9eeba69db25be49d1652b826312a66eb8e2d5a
+SHA1 (patch-ab) = 7c4c8f809dcd79a75fbb6f2411596893cbd62b43
+SHA1 (patch-ac) = a65476612d200647342a870689205c241aeeb144
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = 48f48f13c9a6376231de25aa63411560ea9d91ca
 SHA1 (patch-platform_gl_gl-main.c) = c760d16f0ac4a9b09800869d22b7324724bc007b
diff --git a/print/mupdf/patches/patch-Makethird b/print/mupdf/patches/patch-Makethird
index 34d49a53efe..7e015a57f7d 100644
--- a/print/mupdf/patches/patch-Makethird
+++ b/print/mupdf/patches/patch-Makethird
@@ -1,25 +1,25 @@
-$NetBSD: patch-Makethird,v 1.11 2019/08/03 14:47:41 leot Exp $
+$NetBSD: patch-Makethird,v 1.12 2020/10/08 22:50:16 leot Exp $
 
 - Do not pass thirdparty lcms2 CFLAGS (mupdf is always built without lcms2)
 - mujs building support with libtool
 
---- Makethird.orig	2019-07-23 12:23:08.000000000 +0000
+--- Makethird.orig	2020-10-07 10:35:03.000000000 +0000
 +++ Makethird
-@@ -216,8 +216,6 @@ else
+@@ -284,8 +284,6 @@ else
  
  THIRD_SRC += $(sort $(wildcard thirdparty/lcms2/src/cms*.c))
  
 -THIRD_CFLAGS += -Ithirdparty/lcms2/include -DHAVE_LCMS2MT
 -
  $(OUT)/thirdparty/lcms2/%.o: thirdparty/lcms2/%.c
- 	$(CC_CMD) -Ithirdparty/lcms2/include
+ 	$(CC_CMD) $(LIB_CFLAGS) -Ithirdparty/lcms2/include
  
-@@ -233,7 +231,7 @@ else
+@@ -301,7 +299,7 @@ else
  THIRD_SRC += thirdparty/mujs/one.c
  THIRD_CFLAGS += -Ithirdparty/mujs
  
 -$(OUT)/thirdparty/mujs/%.o: thirdparty/mujs/%.c
 +$(OUT)/thirdparty/mujs/%.lo: thirdparty/mujs/%.c
- 	$(CC_CMD)
+ 	$(CC_CMD) $(LIB_CFLAGS)
  
  endif
diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab
index 12ba94e20fd..a7cc7fe47d9 100644
--- a/print/mupdf/patches/patch-ab
+++ b/print/mupdf/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.22 2020/05/07 20:42:56 leot Exp $
+$NetBSD: patch-ab,v 1.23 2020/10/08 22:50:16 leot Exp $
 
 - Handle the various operating systems in the same way avoiding hardcoding
 - Avoid to use objcopy by setting HAVE_OBJCOPY to no (if `yes', and with
@@ -14,9 +14,9 @@ $NetBSD: patch-ab,v 1.22 2020/05/07 20:42:56 leot Exp $
   If no lcms2 is available just pass `-DFZ_ENABLE_ICC=0' to disable it via
   CFLAGS.
 
---- Makerules.orig	2020-05-05 11:29:09.000000000 +0000
+--- Makerules.orig	2020-10-07 10:35:03.000000000 +0000
 +++ Makerules
-@@ -6,17 +6,6 @@ OS := $(OS:MSYS%=MINGW)
+@@ -6,19 +6,6 @@ OS := $(OS:MSYS%=MINGW)
  OS := $(OS:Windows_NT=MINGW)
  OS := $(OS:Darwin=MACOS)
  
@@ -27,14 +27,16 @@ $NetBSD: patch-ab,v 1.22 2020/05/07 20:42:56 leot Exp $
 -
 -ifeq ($(OS),MACOS)
 -  LDREMOVEUNREACH := -Wl,-dead_strip
+-  SO := dylib
 -else
 -  LDREMOVEUNREACH := -Wl,--gc-sections
+-  SO := so
 -endif
 -
  CFLAGS += -Wsign-compare
  
  SANITIZE_FLAGS += -fsanitize=address
-@@ -78,77 +67,63 @@ ifneq "$(CLUSTER)" ""
+@@ -102,93 +89,79 @@ ifneq "$(CLUSTER)" ""
    CFLAGS += -DCLUSTER
  endif
  
@@ -50,16 +52,22 @@ $NetBSD: patch-ab,v 1.22 2020/05/07 20:42:56 leot Exp $
 -  AR = xcrun ar
 -  LD = xcrun ld
 -  RANLIB = xcrun ranlib
-+HAVE_OBJCOPY := no
- 
+-
 -else ifeq ($(OS),Linux)
 -  HAVE_OBJCOPY := yes
--
++HAVE_OBJCOPY := no
+ 
 -  ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
 +ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
  	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
  	SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
 -  endif
+-  ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
++endif
++ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
+ 	SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo)
+ 	SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo)
+-  endif
 -  ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
 +endif
 +ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
@@ -94,6 +102,24 @@ $NetBSD: patch-ab,v 1.22 2020/05/07 20:42:56 leot Exp $
 -  endif
 +endif
  
+-  HAVE_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
+-  ifeq ($(HAVE_LEPTONICA),yes)
++HAVE_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
++ifeq ($(HAVE_LEPTONICA),yes)
+ 	SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept)
+ 	SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept)
+-  endif
++endif
+ 
+-  HAVE_TESSERACT := $(shell pkg-config --exists 'tesseract-ocr >= 4.0.0' && echo yes)
+-  ifeq ($(HAVE_TESSERACT),yes)
++HAVE_TESSERACT := $(shell pkg-config --exists 'tesseract-ocr >= 4.0.0' && echo yes)
++ifeq ($(HAVE_TESSERACT),yes)
+ 	SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract)
+ 	SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract)
+-  endif
++endif
+ 
 -  HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
 -  ifeq ($(HAVE_SYS_CURL),yes)
 +HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
@@ -105,13 +131,11 @@ $NetBSD: patch-ab,v 1.22 2020/05/07 20:42:56 leot Exp $
  
 -  HAVE_GLUT := yes
 -  ifeq ($(HAVE_GLUT),yes)
--	SYS_GLUT_CFLAGS :=
--	SYS_GLUT_LIBS := -lglut -lGL
--  endif
-+HAVE_GLUT ?= $(shell pkg-config --exists glut && echo yes)
++HAVE_GLUT := yes
 +ifeq ($(HAVE_GLUT),yes)
-+	SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut)
-+	SYS_GLUT_LIBS := $(shell pkg-config --libs glut)
+ 	SYS_GLUT_CFLAGS :=
+ 	SYS_GLUT_LIBS := -lglut -lGL
+-  endif
 +endif
  
 -  HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
diff --git a/print/mupdf/patches/patch-ac b/print/mupdf/patches/patch-ac
index 06bc41fced4..9eed125cedc 100644
--- a/print/mupdf/patches/patch-ac
+++ b/print/mupdf/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
+$NetBSD: patch-ac,v 1.26 2020/10/08 22:50:16 leot Exp $
 
 - libtool support 
 - Install target cleanup
@@ -8,14 +8,14 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
   be invoked during the building phase)
 - Install mupdf with curl support as `mupdf-curl'
 
---- Makefile.orig	2020-05-05 11:29:09.000000000 +0000
+--- Makefile.orig	2020-10-07 10:35:03.000000000 +0000
 +++ Makefile
-@@ -51,68 +51,68 @@ ifneq ($(verbose),yes)
+@@ -55,20 +55,20 @@ ifneq ($(verbose),yes)
  endif
  
  MKTGTDIR = mkdir -p $(dir $@)
 -CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
--CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $<
+-CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(CXX) $(CFLAGS) $(XCXXFLAGS) -MMD -MP -o $@ -c $<
 -AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(AR) cr $@ $^
 +CC_CMD = $(QUIET_CC) $(MKTGTDIR) ; $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -MMD -MP -o $@ -c $<
 +CXX_CMD = $(QUIET_CXX) $(MKTGTDIR) ; $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) -MMD -MP -o $@ -c $<
@@ -27,7 +27,7 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
 +LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  TAGS_CMD = $(QUIET_TAGS) ctags -R --c-kinds=+p
  WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
- OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -o $@ $<
+ OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -z noexecstack -o $@ $<
  
  # --- Rules ---
  
@@ -36,16 +36,17 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
  	$(AR_CMD)
  	$(RANLIB_CMD)
  
- $(OUT)/%.exe: %.c
- 	$(LINK_CMD)
+@@ -78,52 +78,52 @@ $(OUT)/%.exe: %.c
+ $(OUT)/%.$(SO):
+ 	$(LINK_CMD) $(LIB_LDFLAGS) $(THIRD_LIBS) $(LIBCRYPTO_LIBS)
  
 -$(OUT)/source/helpers/mu-threads/%.o : source/helpers/mu-threads/%.c
 +$(OUT)/source/helpers/mu-threads/%.lo : source/helpers/mu-threads/%.c
- 	$(CC_CMD) $(THREADING_CFLAGS)
+ 	$(CC_CMD) $(LIB_CFLAGS) $(THREADING_CFLAGS)
  
 -$(OUT)/source/helpers/pkcs7/%.o : source/helpers/pkcs7/%.c
 +$(OUT)/source/helpers/pkcs7/%.lo : source/helpers/pkcs7/%.c
- 	$(CC_CMD) $(LIBCRYPTO_CFLAGS)
+ 	$(CC_CMD) $(LIB_CFLAGS) $(LIBCRYPTO_CFLAGS)
  
 -$(OUT)/source/tools/%.o : source/tools/%.c
 +$(OUT)/source/tools/%.lo : source/tools/%.c
@@ -53,7 +54,7 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
  
 -$(OUT)/generated/%.o : generated/%.c
 +$(OUT)/generated/%.lo : generated/%.c
- 	$(CC_CMD) -O0
+ 	$(CC_CMD) $(LIB_CFLAGS) -O0
  
 -$(OUT)/platform/x11/%.o : platform/x11/%.c
 +$(OUT)/platform/x11/%.lo : platform/x11/%.c
@@ -70,12 +71,16 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
  ifeq ($(HAVE_OBJCOPY),yes)
 -  $(OUT)/source/fitz/noto.o : source/fitz/noto.c
 +  $(OUT)/source/fitz/noto.lo : source/fitz/noto.c
- 	$(CC_CMD) -Wall -Wdeclaration-after-statement -DHAVE_OBJCOPY $(THIRD_CFLAGS)
+ 	$(CC_CMD) -Wall -Wdeclaration-after-statement -DHAVE_OBJCOPY $(LIB_CFLAGS) $(THIRD_CFLAGS)
  endif
  
 -$(OUT)/source/%.o : source/%.c
 +$(OUT)/source/%.lo : source/%.c
- 	$(CC_CMD) -Wall -Wdeclaration-after-statement $(THIRD_CFLAGS)
+ 	$(CC_CMD) -Wall -Wdeclaration-after-statement $(LIB_CFLAGS) $(THIRD_CFLAGS)
+ 
+-$(OUT)/source/%.o : source/%.cpp
++$(OUT)/source/%.lo : source/%.cpp
+ 	$(CXX_CMD) -Wall $(LIB_CFLAGS) $(THIRD_CFLAGS)
  
 -$(OUT)/platform/%.o : platform/%.c
 +$(OUT)/platform/%.lo : platform/%.c
@@ -93,17 +98,21 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
  
 -THIRD_OBJ := $(THIRD_SRC:%.c=$(OUT)/%.o)
 -THIRD_OBJ := $(THIRD_OBJ:%.cc=$(OUT)/%.o)
+-THIRD_OBJ := $(THIRD_OBJ:%.cpp=$(OUT)/%.o)
 +THIRD_OBJ := $(THIRD_SRC:%.c=$(OUT)/%.lo)
 +THIRD_OBJ := $(THIRD_OBJ:%.cc=$(OUT)/%.lo)
++THIRD_OBJ := $(THIRD_OBJ:%.cpp=$(OUT)/%.lo)
  
  MUPDF_SRC := $(sort $(wildcard source/fitz/*.c))
- MUPDF_SRC += $(sort $(wildcard source/pdf/*.c))
-@@ -121,14 +121,14 @@ MUPDF_SRC += $(sort $(wildcard source/sv
+ MUPDF_SRC += $(sort $(wildcard source/fitz/*.cpp))
+@@ -133,15 +133,15 @@ MUPDF_SRC += $(sort $(wildcard source/sv
  MUPDF_SRC += $(sort $(wildcard source/html/*.c))
  MUPDF_SRC += $(sort $(wildcard source/cbz/*.c))
  
 -MUPDF_OBJ := $(MUPDF_SRC:%.c=$(OUT)/%.o)
+-MUPDF_OBJ := $(MUPDF_OBJ:%.cpp=$(OUT)/%.o)
 +MUPDF_OBJ := $(MUPDF_SRC:%.c=$(OUT)/%.lo)
++MUPDF_OBJ := $(MUPDF_OBJ:%.cpp=$(OUT)/%.lo)
  
  THREAD_SRC := source/helpers/mu-threads/mu-threads.c
 -THREAD_OBJ := $(THREAD_SRC:%.c=$(OUT)/%.o)
@@ -116,7 +125,7 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
  
  # --- Generated embedded font files ---
  
-@@ -149,13 +149,13 @@ generated/%.ttf.c : %.ttf $(HEXDUMP_EXE)
+@@ -162,13 +162,13 @@ generated/%.ttf.c : %.ttf $(HEXDUMP_EXE)
  generated/%.ttc.c : %.ttc $(HEXDUMP_EXE) ; $(QUIET_GEN) $(MKTGTDIR) ; $(HEXDUMP_EXE) -s $@ $<
  
  ifeq ($(HAVE_OBJCOPY),yes)
@@ -136,10 +145,10 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
  endif
  
  generate: $(FONT_GEN)
-@@ -189,17 +189,17 @@ generate: source/pdf/js/util.js.h
- 
- # --- Library ---
+@@ -214,10 +214,10 @@ MUPDF_LIB = $(OUT)/libmupdf.$(SO)
  
+ $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) $(THREAD_OBJ) $(PKCS7_OBJ)
+ else
 -MUPDF_LIB = $(OUT)/libmupdf.a
 -THIRD_LIB = $(OUT)/libmupdf-third.a
 -THREAD_LIB = $(OUT)/libmupdf-threads.a
@@ -151,6 +160,7 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
  
  $(MUPDF_LIB) : $(MUPDF_OBJ)
  $(THIRD_LIB) : $(THIRD_OBJ)
+@@ -230,7 +230,7 @@ $(THIRD_LIB) : $(THIRD_OBJ)
  $(THREAD_LIB) : $(THREAD_OBJ)
  $(PKCS7_LIB) : $(PKCS7_OBJ)
  
@@ -159,7 +169,7 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
  
  # --- Main tools and viewers ---
  
-@@ -210,13 +210,13 @@ MUTOOL_SRC += source/tools/murun.c
+@@ -241,13 +241,13 @@ MUTOOL_SRC += source/tools/murun.c
  MUTOOL_SRC += source/tools/mutrace.c
  MUTOOL_SRC += source/tools/cmapdump.c
  MUTOOL_SRC += $(sort $(wildcard source/tools/pdf*.c))
@@ -175,7 +185,7 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
  MURASTER_EXE := $(OUT)/muraster
  $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(THREAD_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS) $(LIBCRYPTO_LIBS)
-@@ -224,7 +224,7 @@ TOOL_APPS += $(MURASTER_EXE)
+@@ -255,7 +255,7 @@ TOOL_APPS += $(MURASTER_EXE)
  
  ifeq ($(HAVE_GLUT),yes)
    MUVIEW_GLUT_SRC += $(sort $(wildcard platform/gl/*.c))
@@ -184,7 +194,7 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
    MUVIEW_GLUT_EXE := $(OUT)/mupdf-gl
    $(MUVIEW_GLUT_EXE) : $(MUVIEW_GLUT_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(GLUT_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS) $(WIN32_LDFLAGS) $(GLUT_LIBS)
-@@ -232,10 +232,10 @@ ifeq ($(HAVE_GLUT),yes)
+@@ -263,10 +263,10 @@ ifeq ($(HAVE_GLUT),yes)
  endif
  
  ifeq ($(HAVE_X11),yes)
@@ -199,7 +209,7 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
    $(MUVIEW_X11_EXE) : $(MUVIEW_X11_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(LIBCRYPTO_LIBS)
    VIEW_APPS += $(MUVIEW_X11_EXE)
-@@ -243,9 +243,9 @@ endif
+@@ -274,9 +274,9 @@ endif
  
  ifeq ($(HAVE_WIN32),yes)
    MUVIEW_WIN32_EXE := $(OUT)/mupdf-w32
@@ -212,7 +222,7 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
    $(MUVIEW_WIN32_EXE) : $(MUVIEW_WIN32_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(WIN32_LDFLAGS) $(WIN32_LIBS) $(LIBCRYPTO_LIBS)
    VIEW_APPS += $(MUVIEW_WIN32_EXE)
-@@ -254,12 +254,12 @@ endif
+@@ -285,12 +285,12 @@ endif
  ifeq ($(HAVE_X11),yes)
  ifeq ($(HAVE_CURL),yes)
  ifeq ($(HAVE_PTHREAD),yes)
@@ -231,7 +241,7 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
    $(MUVIEW_X11_CURL_EXE) : $(MUVIEW_X11_CURL_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(PKCS7_LIB) $(CURL_LIB)
  	$(LINK_CMD) $(THIRD_LIBS) $(X11_LIBS) $(LIBCRYPTO_LIBS) $(CURL_LIBS) $(PTHREAD_LIBS)
    VIEW_APPS += $(MUVIEW_X11_CURL_EXE)
-@@ -269,19 +269,19 @@ endif
+@@ -300,19 +300,19 @@ endif
  
  # --- Generated dependencies ---
  
@@ -263,7 +273,7 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
  
  # --- Examples ---
  
-@@ -294,10 +294,10 @@ $(OUT)/multi-threaded: docs/examples/mul
+@@ -325,10 +325,10 @@ $(OUT)/multi-threaded: docs/examples/mul
  
  # --- Update version string header ---
  
@@ -278,7 +288,7 @@ $NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
  
  # --- Format man pages ---
  
-@@ -325,27 +325,30 @@ tools: $(TOOL_APPS)
+@@ -356,27 +356,30 @@ tools: $(TOOL_APPS)
  apps: $(TOOL_APPS) $(VIEW_APPS)
  
  install: libs apps