Update to 1.24.0

.ci_support/linux_64_.yaml

@@ -2,6 +2,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -27,5 +31,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - cdt_name
 zlib:
 - '1.2'

.ci_support/osx_64_.yaml

@@ -3,7 +3,11 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '15'
+- '16'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '10.9'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -13,7 +17,7 @@ curl:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 freetype:
 - '2'
 harfbuzz:

recipe/Makefile-shared-libs-linux.patch

@@ -1,25 +1,36 @@
---- Makefile.orig	2020-03-25 11:02:34.874709800 -0500
-+++ Makefile	2020-03-26 15:50:24.164426027 -0500
-@@ -20,7 +20,7 @@
+From 878885071139f3252283d27bc7a35519f00b4962 Mon Sep 17 00:00:00 2001
+From: Jan Janssen <janssen@mpie.de>
+Date: Thu, 28 Mar 2024 15:45:22 -0500
+Subject: [PATCH] Linux patch
+
+---
+ Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 53cf06f..9414928 100644
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,7 @@ include Makethird
  # 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)
-@@ -415,10 +415,10 @@
+@@ -487,10 +487,10 @@ install-docs:
  	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 -d $(DESTDIR)$(docdir)/examples
+ 	install -m 644 README CHANGES $(DESTDIR)$(docdir)
+-	install -m 644 $(wildcard COPYING LICENSE) $(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
++	# install -m 644 $(wildcard COPYING LICENSE) $(DESTDIR)$(docdir)
++	# install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
+
+ install: install-libs install-apps install-docs
 
- tarball:
- 	bash scripts/archive.sh

recipe/Makefile-shared-libs-osx.patch

@@ -1,6 +1,17 @@
---- Makefile.ori	2022-08-15 23:32:42.950710308 -0400
-+++ Makefile	2022-08-26 17:13:29.495341185 -0400
-@@ -21,7 +21,7 @@
+From 2011279b784a4a27334ee8a6740fae9377bd7763 Mon Sep 17 00:00:00 2001
+From: Jan Janssen <janssen@mpie.de>
+Date: Thu, 28 Mar 2024 15:52:14 -0500
+Subject: [PATCH] macOS
+
+---
+ Makefile | 49 +++++++++++++++----------------------------------
+ 1 file changed, 15 insertions(+), 34 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 53cf06f..740b393 100644
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,7 @@ include Makethird
  # 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,12 +20,12 @@
  LIBS += $(XLIBS) -lm
 
  ifneq ($(threading),no)
-@@ -270,46 +270,27 @@
+@@ -293,46 +293,27 @@ generate: source/html/css-properties.h
 
  # --- Library ---
 
 -ifeq ($(shared),yes)
--MUPDF_LIB = $(OUT)/libmupdf.$(SO)
+-MUPDF_LIB = $(OUT)/libmupdf.$(SO)$(SO_VERSION)
 -ifeq ($(SO),dll)
 -MUPDF_LIB_IMPORT = $(OUT)/libmupdf_$(SO).a
 -LIBS_TO_INSTALL_IN_BIN = $(MUPDF_LIB)
@@ -63,23 +74,21 @@
  $(PKCS7_LIB) : $(PKCS7_OBJ)
 +	$(LINK_CMD) -v -shared -Wl,-install_name -Wl,libmupdf-pkcs7.dylib -undefined dynamic_lookup
 +
-+LIBS_TO_INSTALL_IN_LIB := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
++LIBS_TO_INSTALL_IN_LIB := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB) 
 
  # --- Main tools and viewers ---
 
-@@ -457,12 +457,12 @@
+@@ -487,10 +468,10 @@ install-docs:
  	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 README CHANGES $(DESTDIR)$(docdir)
+-	install -m 644 $(wildcard COPYING LICENSE) $(DESTDIR)$(docdir)
 -	install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
-+	# install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
++	# install -m 644 $(wildcard COPYING LICENSE) $(DESTDIR)$(docdir)
 +	# install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
 
  install: install-libs install-apps install-docs
 
- tarball:
- 	bash scripts/archive.sh