<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6150c5ae23321a85e0fa84063acbe08bac6933ef">https://github.com/macports/macports-ports/commit/6150c5ae23321a85e0fa84063acbe08bac6933ef</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6150c5ae23321a85e0fa84063acbe08bac6933ef
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sun May 26 17:06:08 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> mupdf: update to 1.24.2
</span>---
graphics/mupdf/Portfile | 36 +++++++++++++++++----
graphics/mupdf/files/patch-Makethird.diff | 54 +++++++++++++++++++++++++++++++
graphics/mupdf/files/patch-build.diff | 51 ++++++++++++++++++-----------
3 files changed, 116 insertions(+), 25 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 f0394593aaf..e0bc9895930 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;'>@@ -6,9 +6,9 @@ PortGroup openssl 1.0
</span> name mupdf
# Keep synchronized with port:py-mupdf.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.23.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.24.2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics
platforms darwin
maintainers {gmail.com:starkhalo @harciga} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,16 +35,19 @@ 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 63d39c7cfc70ac08beed28d8da6e581bbf09ae6f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 deb0347a3f9ce0967611d479a8a07b57e2c730b0aaf09dce28ee41abb9ac4838 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 55146083
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e19bad3ca13762fe5b238093d62e5ce292b69df4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7fbced6d6024608661d773b93990119db7eb2483f0d3e28855eadef9ca9a8686 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 55313640
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span> port:gumbo-parser \
path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
port:leptonica \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libarchive \
</span> port:jbig2dec \
path:include/turbojpeg.h:libjpeg-turbo \
port:openjpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,16 +56,35 @@ depends_lib port:freetype \
</span>
patchfiles patch-build.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The following patch addresses two issues:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 1. Broken linking: build uses C compiler to link C++ code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and also hardcodes libstdc++:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Undefined symbols: "__Unwind_Resume" etc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 2. A silly parsing error for a warning which we do not need anyway:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Makethird:57: *** missing separator. Stop.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-Makethird.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Unfortunately, this is still needed,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# otherwise something goes wrong with fonts processing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and build may fail.
</span> use_parallel_build no
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Undefined symbols:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "__ZN9tesseract11TessBaseAPI4InitEPKciS2_NS_13OcrEngineModeEPPciPKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaISC_EESG_bPFbS2_PS6_IcSB_EE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D_GLIBCXX_USE_CXX11_ABI=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.args PREFIX=${prefix}
build.args-append CC=${configure.cc} \
CXX=${configure.cxx} \
CPP=${configure.cpp} \
XCFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ XCXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span> XLIBS="${configure.ldflags} [get_canonical_archflags ld]" \
HAVE_GLUT=yes \
HAVE_X11=no \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/files/patch-Makethird.diff b/graphics/mupdf/files/patch-Makethird.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1ecb215009b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mupdf/files/patch-Makethird.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makethird 2024-05-08 18:53:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makethird 2024-05-25 06:25:49.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,12 +52,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(USE_TESSERACT),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifneq ($(HAVE_LEPTONICA),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "Build will fail! Tesseract requires LEPTONICA"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # --- Include source file lists ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include Makelists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -240,7 +234,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ THIRD_CFLAGS += -DHAVE_TESSERACT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(USE_SYSTEM_TESSERACT),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ THIRD_CFLAGS += $(SYS_TESSERACT_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- THIRD_LIBS += $(SYS_TESSERACT_LIBS) -lstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ THIRD_LIBS += $(SYS_TESSERACT_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ THIRD_CFLAGS += $(TESSERACT_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ THIRD_LIBS += $(TESSERACT_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -290,7 +284,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ THIRD_CFLAGS += -DHAVE_LIBARCHIVE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(USE_SYSTEM_LIBARCHIVE),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ THIRD_CFLAGS += $(SYS_LIBARCHIVE_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- THIRD_LIBS += $(SYS_LIBARCHIVE_LIBS) -lstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ THIRD_LIBS += $(SYS_LIBARCHIVE_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ THIRD_CFLAGS += $(LIBARCHIVE_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ THIRD_LIBS += $(LIBARCHIVE_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile 2024-05-08 18:53:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2024-05-25 05:51:49.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +73,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef RANLIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RANLIB_CMD = $(QUIET_RANLIB) $(RANLIB) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TAGS_CMD = $(QUIET_TAGS) ctags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -z noexecstack -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +81,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DLLTOOL_CMD = $(QUIET_DLLTOOL) dlltool -d $< -D $(notdir $(^:%.def=%.dll)) -l $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(shared),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CXX) $(LDFLAGS) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(filter-out %.$(SO)$(SO_VERSION),$^) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(sort $(patsubst %,-L%,$(dir $(filter %.$(SO)$(SO_VERSION),$^)))) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(patsubst lib%.$(SO)$(SO_VERSION),-l%,$(notdir $(filter %.$(SO)$(SO_VERSION),$^))) \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mupdf/files/patch-build.diff b/graphics/mupdf/files/patch-build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 754561680af..a5d1c32f313 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mupdf/files/patch-build.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,9 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Makerules Makerules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f25a8ce0b6de..401f11eac66b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makerules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makerules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +73,7 @@ ifeq ($(shared),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build_prefix += shared-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makerules 2024-05-08 18:53:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makerules 2024-05-25 05:14:11.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +81,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span> LIB_CFLAGS = -fPIC
ifeq ($(OS),MACOS)
- LIB_LDFLAGS = -dynamiclib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +9,7 @@ index f25a8ce0b6de..401f11eac66b 100644
</span> else ifeq ($(OS),wasm)
LIB_LDFLAGS = -shared -sSIDE_MODULE
EXE_LDFLAGS = -sMAIN_MODULE
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,10 +162,10 @@ else ifeq ($(OS),MACOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,10 +186,10 @@
</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;'>@@ -26,27 +24,44 @@ index f25a8ce0b6de..401f11eac66b 100644
</span>
ifneq ($(ARCHFLAGS),)
$(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,9 +180,8 @@ else ifeq ($(OS),MACOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -204,8 +204,6 @@
</span> endif
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--else ifeq ($(OS),Linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(PYODIDE_ROOT),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- HAVE_OBJCOPY := yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HAVE_OBJCOPY := no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Pyodide's ld does not support -b so we cannot use it to create object
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # files containing font data, so leave HAVE_OBJCOPY unset. And we need
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -237,12 +236,6 @@ else ifeq ($(OS),Linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else ifeq ($(LINUX_OR_OPENBSD),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(OS),Linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_OBJCOPY := yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -263,31 +261,12 @@
</span> SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
endif
- HAVE_GLUT := yes
- ifeq ($(HAVE_GLUT),yes)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- SYS_GLUT_CFLAGS :=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SYS_GLUT_LIBS := -lglut -lGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifeq ($(OS),OpenBSD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SYS_GLUT_CFLAGS := $(shell pkg-config --cflags glut gl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SYS_GLUT_LIBS := $(shell pkg-config --libs glut gl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SYS_GLUT_CFLAGS :=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SYS_GLUT_LIBS := -lglut -lGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif
</span> - endif
-
HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
ifeq ($(HAVE_X11),yes)
X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ X11_LIBS := $(shell pkg-config --libs x11 xext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifeq ($(HAVE_LIBCRYPTO),)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifeq ($(HAVE_LIBCRYPTO),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_PTHREAD := yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(HAVE_PTHREAD),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PTHREAD_CFLAGS :=
</span></pre><pre style='margin:0'>
</pre>