<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a6096d890d263dd71c4f45a0a6d6f2ff412bd20d">https://github.com/macports/macports-ports/commit/a6096d890d263dd71c4f45a0a6d6f2ff412bd20d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a6096d890d263dd71c4f45a0a6d6f2ff412bd20d
</span>Author: Mark Mentovai <mark@mentovai.com>
AuthorDate: Fri Sep 29 15:05:16 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> mupdf: update to 1.23.4
</span>---
graphics/mupdf/Portfile | 20 ++++++++----
.../{patch-Makerules.diff => patch-build.diff} | 36 ++++++++++++----------
2 files changed, 33 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/Portfile b/graphics/mupdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 63f8c4dada5..b8fb3e22616 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mupdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mupdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
name mupdf
# Keep synchronized with port:py-mupdf.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.22.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.23.4
</span>
revision 0
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,21 +35,23 @@ homepage https://www.mupdf.com/
</span> master_sites ${homepage}downloads/archive/
distname ${name}-${version}-source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 53015efda97139e3e3308fd1ed86ade1631d9fbc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 54c66af4e6ef8cea9867cc0320ef925d561b42919ea0d4f89db5c9ef485bbeb7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 57541621
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 63d39c7cfc70ac08beed28d8da6e581bbf09ae6f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 deb0347a3f9ce0967611d479a8a07b57e2c730b0aaf09dce28ee41abb9ac4838 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 55146083
</span>
depends_build port:pkgconfig
depends_lib port:freetype \
port:gumbo-parser \
path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:leptonica \
</span> port:jbig2dec \
path:include/turbojpeg.h:libjpeg-turbo \
port:openjpeg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tesseract \
</span> port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makerules.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-build.diff
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +64,11 @@ build.args-append CC=${configure.cc} \
</span> HAVE_GLUT=yes \
HAVE_X11=no \
USE_SYSTEM_LIBS=yes \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_TESSERACT=yes \
</span> build=release \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ shared=yes \
</span> verbose=yes \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shared-release
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,11 +100,14 @@ post-extract {
</span> delete ${worksrcpath}/thirdparty/curl
delete ${worksrcpath}/thirdparty/freeglut
delete ${worksrcpath}/thirdparty/freetype
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/thirdparty/gumbo-parser
</span> delete ${worksrcpath}/thirdparty/harfbuzz
delete ${worksrcpath}/thirdparty/jbig2dec
delete ${worksrcpath}/thirdparty/jpeg
delete ${worksrcpath}/thirdparty/libjpeg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/thirdparty/leptonica
</span> delete ${worksrcpath}/thirdparty/openjpeg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/thirdparty/tesseract
</span> delete ${worksrcpath}/thirdparty/zlib
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/files/patch-Makerules.diff b/graphics/mupdf/files/patch-build.diff
</span>similarity index 52%
rename from graphics/mupdf/files/patch-Makerules.diff
rename to graphics/mupdf/files/patch-build.diff
<span style='display:block; white-space:pre;color:#808080;'>index 58c032cc3e0..754561680af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mupdf/files/patch-Makerules.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mupdf/files/patch-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makerules.orig 2022-05-03 23:26:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makerules 2022-05-04 00:28:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,7 +57,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Makerules Makerules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f25a8ce0b6de..401f11eac66b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makerules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makerules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +73,7 @@ ifeq ($(shared),yes)
</span> build_prefix += shared-
LIB_CFLAGS = -fPIC
ifeq ($(OS),MACOS)
- LIB_LDFLAGS = -dynamiclib
+ LIB_LDFLAGS = -dynamiclib -Wl,-install_name,$(PREFIX)/lib/libmupdf.dylib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB_LDFLAGS = -shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,10 +140,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else ifeq ($(OS),wasm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_LDFLAGS = -shared -sSIDE_MODULE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXE_LDFLAGS = -sMAIN_MODULE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,10 +162,10 @@ else ifeq ($(OS),MACOS)
</span> HAVE_GLUT := yes
SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,20 +24,20 @@
</span> + LD = ld
+ RANLIB = ranlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq (, $(shell which pkg-config))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(warning "No pkg-config found, install it for proper integration of libcrypto")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,8 +155,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(ARCHFLAGS),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,9 +180,8 @@ else ifeq ($(OS),MACOS)
</span> endif
endif
-else ifeq ($(OS),Linux)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- HAVE_OBJCOPY := yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else ifeq ($(OS),Linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HAVE_OBJCOPY := no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -205,12 +205,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(PYODIDE_ROOT),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HAVE_OBJCOPY := yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ HAVE_OBJCOPY := no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Pyodide's ld does not support -b so we cannot use it to create object
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # files containing font data, so leave HAVE_OBJCOPY unset. And we need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -237,12 +236,6 @@ else ifeq ($(OS),Linux)
</span> SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
endif
</pre><pre style='margin:0'>
</pre>