<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e54eb442c699fe5bdb1ae7c17f6cca55e0503695">https://github.com/macports/macports-ports/commit/e54eb442c699fe5bdb1ae7c17f6cca55e0503695</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e54eb442c699fe5bdb1ae7c17f6cca55e0503695
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Thu Jan 25 14:39:48 2024 -0800
<span style='display:block; white-space:pre;color:#404040;'> texlive-bin: remove luatex's unnecessary zlib version check
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This check is overly strict and has caused problems more than once on
</span><span style='display:block; white-space:pre;color:#404040;'> zlib version upgrades that are otherwise perfectly compatible.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69182
</span>---
tex/texlive-bin/Portfile | 6 +++++-
.../patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff | 17 +++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tex/texlive-bin/Portfile b/tex/texlive-bin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d702ff182b4..4504486831c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tex/texlive-bin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tex/texlive-bin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ PortGroup muniversal 1.1
</span>
name texlive-bin
version 2023.66589
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span>
categories tex
maintainers {dports @drkp}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,6 +96,10 @@ patchfiles-append \
</span> patchfiles-append patch-libs_luajit_configure.diff \
patch-texk_web2c_configure.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# disable luazlib's zlib version check since it is way too specific;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/69182
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
# reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/tl_scripts/Makefile.in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tex/texlive-bin/files/patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff b/tex/texlive-bin/files/patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..309080b0732
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tex/texlive-bin/files/patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- texk/web2c/luatexdir/luazlib/lzlib.c.orig 2024-01-25 14:06:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ texk/web2c/luatexdir/luazlib/lzlib.c 2024-01-25 14:08:00
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -543,14 +543,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ====================================================================== */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* make sure header and library version are consistent */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const char* version = zlibVersion();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (strncmp(version, ZLIB_VERSION, 4))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lua_error(L);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* create new metatable for zlib compression structures */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ luaL_newmetatable(L, ZSTREAMMETA);
</span></pre><pre style='margin:0'>
</pre>