Update to v1.19.1

.ci_support/linux_64_.yaml

@@ -10,6 +10,10 @@ channel_targets:
 - conda-forge main
 curl:
 - '7'
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '10'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 freetype:
@@ -31,5 +35,8 @@ pin_run_as_build:
     max_pin: x.x
 target_platform:
 - linux-64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
 zlib:
 - '1.2'

.ci_support/osx_64_.yaml

@@ -3,13 +3,17 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '13'
+- '14'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 curl:
 - '7'
+cxx_compiler:
+- clangxx
+cxx_compiler_version:
+- '14'
 freetype:
 - '2'
 harfbuzz:
@@ -31,5 +35,8 @@ pin_run_as_build:
     max_pin: x.x
 target_platform:
 - osx-64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
 zlib:
 - '1.2'

recipe/Makefile-shared-libs-linux.patch

@@ -1,39 +1,25 @@
 --- Makefile.orig	2020-03-25 11:02:34.874709800 -0500
-+++ Makefile	2020-04-03 13:06:00.681559332 -0500
++++ Makefile	2020-03-26 15:50:24.164426027 -0500
 @@ -20,7 +20,7 @@
  # 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) -Iinclude
 +CFLAGS += $(XCFLAGS) -Iinclude -fPIC
  LIBS += $(XLIBS) -lm
- 
+
  ifneq ($(threading),no)
-@@ -189,17 +189,21 @@
-
- # --- Library ---
-
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
--THREAD_LIB = $(OUT)/libmupdf-threads.a
--PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-+MUPDF_LIB = $(OUT)/libmupdf.so
-+THIRD_LIB = $(OUT)/libmupdf-third.so
-+THREAD_LIB = $(OUT)/libmupdf-threads.so
-+PKCS7_LIB = $(OUT)/libmupdf-pkcs7.so
-
--$(MUPDF_LIB) : $(MUPDF_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined $(THIRD_LIBS)
- $(THIRD_LIB) : $(THIRD_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so -Wl,--no-undefined
- $(THREAD_LIB) : $(THREAD_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-threads.so -Wl,--no-undefined -lpthread
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-pkcs7.so
-
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
+@@ -415,10 +415,10 @@
+ 	install -m 644 docs/man/*.1 $(DESTDIR)$(mandir)/man1
 
- # --- Main tools and viewers ---
+ 	install -d $(DESTDIR)$(docdir)
+-	install -d $(DESTDIR)$(docdir)/examples
++	#install -d $(DESTDIR)$(docdir)/examples
+ 	install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir)
+-	install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
+-	install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
++	#install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
++	#install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
 
+ tarball:
+ 	bash scripts/archive.sh

recipe/Makefile-shared-libs-osx.patch

@@ -1,6 +1,6 @@
---- Makefile.orig	2020-03-25 11:02:34.874709800 -0500
-+++ Makefile	2020-04-07 09:39:20.576540717 -0500
-@@ -20,7 +20,7 @@
+--- Makefile.ori	2022-08-15 23:32:42.950710308 -0400
++++ Makefile	2022-08-23 22:59:45.599338377 -0400
+@@ -21,7 +21,7 @@
  # 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.
@@ -9,18 +9,49 @@
  LIBS += $(XLIBS) -lm
 
  ifneq ($(threading),no)
-@@ -189,17 +189,21 @@
+@@ -232,46 +232,27 @@
 
  # --- Library ---
 
+-ifeq ($(shared),yes)
+-MUPDF_LIB = $(OUT)/libmupdf.$(SO)
+-ifeq ($(OS),MINGW)
+-MUPDF_LIB_IMPORT = $(OUT)/libmupdf_$(SO).a
+-LIBS_TO_INSTALL_IN_BIN = $(MUPDF_LIB)
+-LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB_IMPORT)
+-else
++MUPDF_LIB = $(OUT)/libmupdf.dylib
+ LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB)
+-endif
+-ifneq ($(USE_SYSTEM_GLUT),yes)
+-THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
+-endif
+-THREAD_LIB = $(OUT)/libmupdf-threads.a
+-PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
+-
+-$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
+-$(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
+-$(THREAD_LIB) : $(THREAD_OBJ)
+-$(PKCS7_LIB) : $(PKCS7_OBJ)
+-else
 -MUPDF_LIB = $(OUT)/libmupdf.a
+-LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB)
 -THIRD_LIB = $(OUT)/libmupdf-third.a
+-ifneq ($(USE_SYSTEM_GLUT),yes)
+-THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
+-endif
 -THREAD_LIB = $(OUT)/libmupdf-threads.a
 -PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-+MUPDF_LIB = $(OUT)/libmupdf.dylib
-+THIRD_LIB = $(OUT)/libmupdf-third.dylib
 +THREAD_LIB = $(OUT)/libmupdf-threads.dylib
 +PKCS7_LIB = $(OUT)/libmupdf-pkcs7.dylib
++THIRD_LIB = $(OUT)/libmupdf-third.dylib
+
+ $(MUPDF_LIB) : $(MUPDF_OBJ)
+ $(THIRD_LIB) : $(THIRD_OBJ)
+-$(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+-endif
 
 -$(MUPDF_LIB) : $(MUPDF_OBJ)
 +$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
@@ -31,9 +62,22 @@
 +	$(LINK_CMD) -shared -Wl,-install_name -Wl,libmupdf-threads.dylib -undefined dynamic_lookup -lpthread
  $(PKCS7_LIB) : $(PKCS7_OBJ)
 +	$(LINK_CMD) -v -shared -Wl,-install_name -Wl,libmupdf-pkcs7.dylib -undefined dynamic_lookup
-
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
++
++LIBS_TO_INSTALL_IN_BIN := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
 
  # --- Main tools and viewers ---
 
+@@ -416,10 +397,10 @@
+ 	install -m 644 docs/man/*.1 $(DESTDIR)$(mandir)/man1
+
+ 	install -d $(DESTDIR)$(docdir)
+-	install -d $(DESTDIR)$(docdir)/examples
++	# install -d $(DESTDIR)$(docdir)/examples
+ 	install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir)
+-	install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
+-	install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
++	# install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
++	# install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
+
+ tarball:
+ 	bash scripts/archive.sh

recipe/Makerules.patch

@@ -1,6 +1,6 @@
 --- Makerules.orig	2020-03-26 15:39:59.725834877 -0500
 +++ Makerules	2020-03-26 15:40:10.141808906 -0500
-@@ -62,7 +62,7 @@
+@@ -115,7 +115,7 @@
  endif
 
  # Default system libraries

recipe/meta.yaml

@@ -1,32 +1,33 @@
 {% set name = "mupdf" %}
-{% set version = "1.17.0" %}
+{% set version = "1.19.1" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   url: https://www.mupdf.com/downloads/archive/mupdf-{{ version }}-source.tar.xz
-  sha256: c935fb2593d9a28d9b56b59dad6e3b0716a6790f8a257a68fa7dcb4430bc6086
+  sha256: b5eac663fe74f33c430eda342f655cf41fa73d71610f0884768a856a82e3803e
   patches:
     # Make shared libs, rather than static
     # https://bugs.ghostscript.com/show_bug.cgi?id=702250
+    # don't install fully rendered docs
     - Makefile-shared-libs-linux.patch  # [linux]
     - Makefile-shared-libs-osx.patch  # [osx]
-    # don't install fully rendered docs
-    - Makefile.patch  # [unix]
     # OSX has libfreetype.a, not libfreetype2.a
     - Makerules.patch  # [osx]
 
 build:
-  number: 3
+  number: 0
+  # TODO: enable again osx when possible
   skip: true  # [win]
   missing_dso_whitelist:   # [osx]
     - /System/Library/Frameworks/GLUT.framework/Versions/A/GLUT  # [osx]
 
 requirements:
   build:
     - {{ compiler('c') }}
+    - {{ compiler('cxx') }}
     - {{ cdt('mesa-libgl-devel') }}  # [linux]
     - {{ cdt('mesa-dri-drivers') }}  # [linux]
     - {{ cdt('libselinux') }}  # [linux]
@@ -40,6 +41,7 @@ requirements:
   host:
     - xorg-libxfixes  # [linux]
     - libglu  # [linux]
+    - libgumbo
     - mesalib  # [unix]
     - freetype
     - jbig2dec