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

To: source-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/print/mupdf mupdf: Update to 1.17.0
From: leot <leot%pkgsrc.org@localhost>
Date: Thu, 07 May 2020 21:47:59 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/31568cc8c45e
branches:  trunk
changeset: 431012:31568cc8c45e
user:      leot <leot%pkgsrc.org@localhost>
date:      Thu May 07 20:42:56 2020 +0000

description:
mupdf: Update to 1.17.0

pkgsrc changes:
 - Remove patches/patch-platform_x11_pdfapp.c, no longer needed

Changes:
1.17.0
------
api: Improved accessors for markup/ink/polygon annotation data.
api: Chapter based API for faster EPUB loading.
api: Add more documentation to header files.
api: Improved digital signature signing and verification.
api: Validate changes in a signed PDF file.

build: Moved windows build to VS2019 solution.

pdf: Redaction now works on images and links as well as text.
pdf: Greek, Cyrillic, Chinese, Japanese, and Korean scripts in forms and annotations.
pdf: File attachment annotations.
pdf: Use CCITT Fax compression for 1-bit images when creating PDF files.

epub: More forgiving XHTML parsing.
epub: Accelerator files to cache chapter data for faster EPUB loading.
epub: Optimized memory use.

mutool run: Edit Markup, Ink, and Polygon annotation data.
mutool run: Fill out form fields.
viewer: Ask for confirmation before closing a PDF with unsaved changes.
viewer: Embed and extract file attachment annotations.

library: Miscellaneous bugfixes.
library: Fixes to store operation.

thirdparty: Updated Harfbuzz to 2.6.4.
thirdparty: Updated jbig2dec to 0.18.
thirdparty: Updated MuJS to 1.0.7.
thirdparty: Updated OpenJPEG to 2.3.1.
thirdparty: Updated cURL to 7.66.0 (windows only).

diffstat:

 print/mupdf/Makefile                               |   5 +--
 print/mupdf/PLIST                                  |   3 +-
 print/mupdf/buildlink3.mk                          |   4 +-
 print/mupdf/distinfo                               |  23 ++++++++++-----------
 print/mupdf/patches/patch-ab                       |  14 ++++++------
 print/mupdf/patches/patch-ac                       |  14 ++++++------
 print/mupdf/patches/patch-platform_gl_gl-app.h     |   7 ++---
 print/mupdf/patches/patch-platform_gl_gl-main.c    |   8 +++---
 print/mupdf/patches/patch-platform_x11_pdfapp.c    |  20 -------------------
 print/mupdf/patches/patch-source_fitz_load-jpx.c   |  12 +++++-----
 print/mupdf/patches/patch-thirdparty_mujs_Makefile |  21 +++++++++++++++----
 11 files changed, 60 insertions(+), 71 deletions(-)

diffs (truncated from 333 to 300 lines):

diff -r 3a5ee2898c95 -r 31568cc8c45e print/mupdf/Makefile
--- a/print/mupdf/Makefile      Thu May 07 20:21:41 2020 +0000
+++ b/print/mupdf/Makefile      Thu May 07 20:42:56 2020 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2020/05/06 14:04:12 adam Exp $
+# $NetBSD: Makefile,v 1.83 2020/05/07 20:42:56 leot Exp $
 
-DISTNAME=      mupdf-1.16.1-source
+DISTNAME=      mupdf-1.17.0-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   9
 CATEGORIES=    print
 MASTER_SITES=  https://mupdf.com/downloads/archive/
 
diff -r 3a5ee2898c95 -r 31568cc8c45e print/mupdf/PLIST
--- a/print/mupdf/PLIST Thu May 07 20:21:41 2020 +0000
+++ b/print/mupdf/PLIST Thu May 07 20:42:56 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2019/08/03 14:47:41 leot Exp $
+@comment $NetBSD: PLIST,v 1.20 2020/05/07 20:42:56 leot Exp $
 bin/mupdf
 ${PLIST.curl}bin/mupdf-curl
 ${PLIST.opengl}bin/mupdf-gl
@@ -28,6 +28,7 @@
 include/mupdf/fitz/hash.h
 include/mupdf/fitz/image.h
 include/mupdf/fitz/link.h
+include/mupdf/fitz/log.h
 include/mupdf/fitz/outline.h
 include/mupdf/fitz/output-svg.h
 include/mupdf/fitz/output.h
diff -r 3a5ee2898c95 -r 31568cc8c45e print/mupdf/buildlink3.mk
--- a/print/mupdf/buildlink3.mk Thu May 07 20:21:41 2020 +0000
+++ b/print/mupdf/buildlink3.mk Thu May 07 20:42:56 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.37 2020/05/06 14:04:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.38 2020/05/07 20:42:56 leot Exp $
 
 BUILDLINK_TREE+=       mupdf
 
@@ -6,7 +6,7 @@
 MUPDF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mupdf+=  mupdf>=1.14.0
-BUILDLINK_ABI_DEPENDS.mupdf?=  mupdf>=1.16.1nb9
+BUILDLINK_ABI_DEPENDS.mupdf?=  mupdf>=1.17.0
 BUILDLINK_PKGSRCDIR.mupdf?=    ../../print/mupdf
 
 pkgbase := mupdf
diff -r 3a5ee2898c95 -r 31568cc8c45e print/mupdf/distinfo
--- a/print/mupdf/distinfo      Thu May 07 20:21:41 2020 +0000
+++ b/print/mupdf/distinfo      Thu May 07 20:42:56 2020 +0000
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.50 2019/12/12 14:35:55 leot Exp $
+$NetBSD: distinfo,v 1.51 2020/05/07 20:42:56 leot Exp $
 
-SHA1 (mupdf-1.16.1-source.tar.gz) = ccbef63c3d43d6a866b7978db5674dc4b1719f0f
-RMD160 (mupdf-1.16.1-source.tar.gz) = 4787d4699504cab9e3fee9884f1faaa410f805c9
-SHA512 (mupdf-1.16.1-source.tar.gz) = d4e789bd7b1ba8f01bff1e68df3a980c79230e0a28d6d6e709169a2822ac6240aad185c2d8d4f55ba8d2451e5738801f6b490683c239543d27efc4e960a673e7
-Size (mupdf-1.16.1-source.tar.gz) = 60805318 bytes
+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) = 18bc9e283624ec810662d29309db9a8dd9268bb8
-SHA1 (patch-ac) = 97442b78e52e57b783d93771c6002702dda38e8f
+SHA1 (patch-ab) = 6f6764288ce71f452364ef70db8d7cb532c9fc00
+SHA1 (patch-ac) = 3128a383a7ece0330e6fa05b396087d2b17f58d9
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
-SHA1 (patch-platform_gl_gl-app.h) = 09064acf631f5e850cd65cb51ab5315485fb4200
-SHA1 (patch-platform_gl_gl-main.c) = edff1aa77c4d6af59b2eca442340606a0bae9970
-SHA1 (patch-platform_x11_pdfapp.c) = e731d1d99d21ecdfd6172d7b5ed5ba1be2ef6a75
-SHA1 (patch-source_fitz_load-jpx.c) = 161d21bca13bb57db37807aec844c85dc5b34157
-SHA1 (patch-thirdparty_mujs_Makefile) = 833e44f4e23d2a6ff61e6276feede4892feeb9bb
+SHA1 (patch-platform_gl_gl-app.h) = 48f48f13c9a6376231de25aa63411560ea9d91ca
+SHA1 (patch-platform_gl_gl-main.c) = c760d16f0ac4a9b09800869d22b7324724bc007b
+SHA1 (patch-source_fitz_load-jpx.c) = 8d7f58168c8429a82127b821387298341a1fcbfb
+SHA1 (patch-thirdparty_mujs_Makefile) = 8ff3cc67a60b648841b074846bd6e7de943fd034
diff -r 3a5ee2898c95 -r 31568cc8c45e print/mupdf/patches/patch-ab
--- a/print/mupdf/patches/patch-ab      Thu May 07 20:21:41 2020 +0000
+++ b/print/mupdf/patches/patch-ab      Thu May 07 20:42:56 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.21 2019/08/03 14:47:41 leot Exp $
+$NetBSD: patch-ab,v 1.22 2020/05/07 20:42:56 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,7 +14,7 @@
   If no lcms2 is available just pass `-DFZ_ENABLE_ICC=0' to disable it via
   CFLAGS.
 
---- Makerules.orig     2019-07-23 12:23:08.000000000 +0000
+--- Makerules.orig     2020-05-05 11:29:09.000000000 +0000
 +++ Makerules
 @@ -6,17 +6,6 @@ OS := $(OS:MSYS%=MINGW)
  OS := $(OS:Windows_NT=MINGW)
@@ -31,12 +31,12 @@
 -  LDREMOVEUNREACH := -Wl,--gc-sections
 -endif
 -
- SANITIZE_FLAGS += -fsanitize=address
- SANITIZE_FLAGS += -fsanitize=leak
+ CFLAGS += -Wsign-compare
  
-@@ -72,77 +61,63 @@ SYS_MUJS_LIBS := -lmujs
- SYS_OPENJPEG_LIBS := -lopenjp2
- SYS_ZLIB_LIBS := -lz
+ SANITIZE_FLAGS += -fsanitize=address
+@@ -78,77 +67,63 @@ ifneq "$(CLUSTER)" ""
+   CFLAGS += -DCLUSTER
+ endif
  
 -ifeq ($(OS),MINGW)
 -  WINDRES := windres
diff -r 3a5ee2898c95 -r 31568cc8c45e print/mupdf/patches/patch-ac
--- a/print/mupdf/patches/patch-ac      Thu May 07 20:21:41 2020 +0000
+++ b/print/mupdf/patches/patch-ac      Thu May 07 20:42:56 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.24 2019/08/03 14:47:41 leot Exp $
+$NetBSD: patch-ac,v 1.25 2020/05/07 20:42:57 leot Exp $
 
 - libtool support 
 - Install target cleanup
@@ -8,7 +8,7 @@
   be invoked during the building phase)
 - Install mupdf with curl support as `mupdf-curl'
 
---- Makefile.orig      2019-07-26 14:10:07.000000000 +0000
+--- Makefile.orig      2020-05-05 11:29:09.000000000 +0000
 +++ Makefile
 @@ -51,68 +51,68 @@ ifneq ($(verbose),yes)
  endif
@@ -25,7 +25,7 @@
  endif
 -LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 +LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- TAGS_CMD = $(QUIET_TAGS) ctags -R
+ 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 $@ $<
  
@@ -173,8 +173,8 @@
 -MURASTER_OBJ := $(OUT)/source/tools/muraster.o
 +MURASTER_OBJ := $(OUT)/source/tools/muraster.lo
  MURASTER_EXE := $(OUT)/muraster
- $(MURASTER_EXE) : $(MURASTER_OBJ) $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
-       $(LINK_CMD) $(THIRD_LIBS) $(THREADING_LIBS)
+ $(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)
  
  ifeq ($(HAVE_GLUT),yes)
@@ -263,7 +263,7 @@
  
  # --- Examples ---
  
-@@ -292,10 +292,10 @@ $(OUT)/multi-threaded: docs/examples/mul
+@@ -294,10 +294,10 @@ $(OUT)/multi-threaded: docs/examples/mul
  
  # --- Update version string header ---
  
@@ -278,7 +278,7 @@
  
  # --- Format man pages ---
  
-@@ -323,27 +323,30 @@ tools: $(TOOL_APPS)
+@@ -325,27 +325,30 @@ tools: $(TOOL_APPS)
  apps: $(TOOL_APPS) $(VIEW_APPS)
  
  install: libs apps
diff -r 3a5ee2898c95 -r 31568cc8c45e print/mupdf/patches/patch-platform_gl_gl-app.h
--- a/print/mupdf/patches/patch-platform_gl_gl-app.h    Thu May 07 20:21:41 2020 +0000
+++ b/print/mupdf/patches/patch-platform_gl_gl-app.h    Thu May 07 20:42:56 2020 +0000
@@ -1,20 +1,19 @@
-$NetBSD: patch-platform_gl_gl-app.h,v 1.3 2019/09/23 12:17:04 nia Exp $
+$NetBSD: patch-platform_gl_gl-app.h,v 1.4 2020/05/07 20:42:57 leot Exp $
 
 - Do not force freeglut GLUT implementation to every non-APPLE platforms.
 - Adjust the glut.h include.
 
---- platform/gl/gl-app.h.orig  2018-09-25 12:39:17.000000000 +0000
+--- platform/gl/gl-app.h.orig  2020-05-05 11:29:09.000000000 +0000
 +++ platform/gl/gl-app.h
 @@ -7,11 +7,7 @@ void win_install(void);
  #include "mupdf/ucdn.h"
  #include "mupdf/pdf.h" /* for pdf specifics and forms */
  
 -#ifndef __APPLE__
--#include <GL/freeglut.h>
+ #include <GL/freeglut.h>
 -#else
 -#include <GLUT/glut.h>
 -#endif
-+#include <GL/freeglut.h>
  
  /* UI */
  
diff -r 3a5ee2898c95 -r 31568cc8c45e print/mupdf/patches/patch-platform_gl_gl-main.c
--- a/print/mupdf/patches/patch-platform_gl_gl-main.c   Thu May 07 20:21:41 2020 +0000
+++ b/print/mupdf/patches/patch-platform_gl_gl-main.c   Thu May 07 20:42:56 2020 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-platform_gl_gl-main.c,v 1.2 2018/10/04 19:02:33 leot Exp $
+$NetBSD: patch-platform_gl_gl-main.c,v 1.3 2020/05/07 20:42:57 leot Exp $
 
 glutLeaveMainLoop() is present only on freeglut, define it otherwise.
 
---- platform/gl/gl-main.c.orig 2018-10-03 11:29:14.000000000 +0000
+--- platform/gl/gl-main.c.orig 2020-05-05 11:29:09.000000000 +0000
 +++ platform/gl/gl-main.c
-@@ -16,7 +16,7 @@
- char *realpath(const char *path, char *resolved_path); /* in gl-file.c */
+@@ -26,7 +26,7 @@
+ #include <direct.h> /* for getcwd */
  #endif
  
 -#ifdef __APPLE__
diff -r 3a5ee2898c95 -r 31568cc8c45e print/mupdf/patches/patch-platform_x11_pdfapp.c
--- a/print/mupdf/patches/patch-platform_x11_pdfapp.c   Thu May 07 20:21:41 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-platform_x11_pdfapp.c,v 1.1 2019/12/12 14:35:55 leot Exp $
-
-Fix ` ' on the last page.
-
-When ` ' (space) is pressed on the second to last page it doesn't
-go to the last page.  Adjust the check to DTRT.
-
-Also fixed upstream via commit 606fcf8383943d7f986d6706f1cb67fbdab0e224.
-
---- platform/x11/pdfapp.c.orig 2019-08-02 14:49:26.000000000 +0000
-+++ platform/x11/pdfapp.c
-@@ -1503,7 +1503,7 @@ void pdfapp_onkey(pdfapp_t *app, int c, 
-               {
-                       if (app->imgw + app->panx <= app->winw)
-                       {
--                              if (app->pageno + 1 < app->pagecount)
-+                              if (app->pageno + 1 <= app->pagecount)
-                               {
-                                       app->panx = 0;
-                                       app->pany = 0;
diff -r 3a5ee2898c95 -r 31568cc8c45e print/mupdf/patches/patch-source_fitz_load-jpx.c
--- a/print/mupdf/patches/patch-source_fitz_load-jpx.c  Thu May 07 20:21:41 2020 +0000
+++ b/print/mupdf/patches/patch-source_fitz_load-jpx.c  Thu May 07 20:42:56 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-source_fitz_load-jpx.c,v 1.9 2018/10/04 19:02:33 leot Exp $
+$NetBSD: patch-source_fitz_load-jpx.c,v 1.10 2020/05/07 20:42:57 leot Exp $
 
 - MuPDF does some locking around its allocation calls; it overrides openjpeg's
   allocators to do this locking too. However mupdf tries to manually align things
@@ -13,14 +13,14 @@
 
   From OpenBSD ports textproc/mupdf/patch-source_fitz_load-jpx_c,v 1.5.
 
---- source/fitz/load-jpx.c.orig        2018-09-25 12:39:17.000000000 +0000
+--- source/fitz/load-jpx.c.orig        2020-05-05 11:29:09.000000000 +0000
 +++ source/fitz/load-jpx.c
-@@ -577,19 +577,7 @@ void opj_free(void *ptr)
+@@ -584,19 +584,7 @@ void opj_free(void *ptr)
  
  static void * opj_aligned_malloc_n(size_t alignment, size_t size)
  {
 -      uint8_t *ptr;
--      int off;
+-      size_t off;
 -
 -      if (size == 0)
 -              return NULL;
@@ -30,13 +30,13 @@
 -      if (ptr == NULL)
 -              return NULL;
 -      off = alignment-(((int)(intptr_t)ptr) & (alignment - 1));
--      ptr[off-1] = off;
+-      ptr[off-1] = (uint8_t)off;
 -      return ptr + off;
 +      return opj_malloc(size);
  }
  
  void * opj_aligned_malloc(size_t size)
-@@ -604,13 +592,7 @@ void * opj_aligned_32_malloc(size_t size
+@@ -611,13 +599,7 @@ void * opj_aligned_32_malloc(size_t size
  
  void opj_aligned_free(void* ptr_)
  {
diff -r 3a5ee2898c95 -r 31568cc8c45e print/mupdf/patches/patch-thirdparty_mujs_Makefile
--- a/print/mupdf/patches/patch-thirdparty_mujs_Makefile        Thu May 07 20:21:41 2020 +0000
+++ b/print/mupdf/patches/patch-thirdparty_mujs_Makefile        Thu May 07 20:42:56 2020 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-thirdparty_mujs_Makefile,v 1.6 2019/05/12 12:27:02 ryoon Exp $
+$NetBSD: patch-thirdparty_mujs_Makefile,v 1.7 2020/05/07 20:42:57 leot Exp $
 
 - Add libtool support to mujs.
 - Avoid to set (unused) VERSION variable.
 
---- thirdparty/mujs/Makefile.orig      2019-04-04 10:41:04.000000000 +0000
+--- thirdparty/mujs/Makefile.orig      2020-03-17 13:10:18.000000000 +0000
 +++ thirdparty/mujs/Makefile
 @@ -7,12 +7,6 @@ bindir ?= $(prefix)/bin
  incdir ?= $(prefix)/include
@@ -18,6 +18,15 @@
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/clang lang/clang: fix detection of libstdc++
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated print/mupdf to 1.17.0
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/clang lang/clang: fix detection of libstdc++
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated print/mupdf to 1.17.0
Indexes:
Home | Main Index | Thread Index | Old Index