From 770cb16bb5c5203ed55fe72983516edbd3ce7040 Mon Sep 17 00:00:00 2001 From: lemmi Date: Mon, 5 Feb 2024 12:59:51 +0100 Subject: [PATCH] texlive: rebuild vor zlib-1.3.1 additionally relax zlib version check --- .../patches/relax-zlib-version-check.patch | 26 +++++++++++++++++++ srcpkgs/texlive/template | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/texlive/patches/relax-zlib-version-check.patch diff --git a/srcpkgs/texlive/patches/relax-zlib-version-check.patch b/srcpkgs/texlive/patches/relax-zlib-version-check.patch new file mode 100644 index 0000000000000..b5973c103c756 --- /dev/null +++ b/srcpkgs/texlive/patches/relax-zlib-version-check.patch @@ -0,0 +1,26 @@ +From 3f53490d88387bbfe6c7d482089d9a597b257cf0 Mon Sep 17 00:00:00 2001 +From: Luigi Scarso +Date: Tue, 21 Nov 2023 11:17:29 +0100 +Subject: [PATCH] relax zlib version check to just checking the major version, + since (it turns out) zlib 1.3 is compatible with 1.2 (K. Berry). + +--- + texk/web2c/luatexdir/ChangeLog | 9 +++++++++ + texk/web2c/luatexdir/luatex_svnversion.h | 2 +- + texk/web2c/luatexdir/luazlib/lzlib.c | 2 +- + 3 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/texk/web2c/luatexdir/luazlib/lzlib.c b/texk/web2c/luatexdir/luazlib/lzlib.c +index e61f92d58..ea123e541 100644 +--- a/texk/web2c/luatexdir/luazlib/lzlib.c ++++ b/texk/web2c/luatexdir/luazlib/lzlib.c +@@ -546,7 +546,7 @@ LUALIB_API int luaopen_zlib(lua_State *L) + + /* make sure header and library version are consistent */ + const char* version = zlibVersion(); +- if (strncmp(version, ZLIB_VERSION, 4)) ++ if (strncmp(version, ZLIB_VERSION, 2)) + { + lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version); + lua_error(L); +-- diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template index 247c762d3755b..5d519c2d27401 100644 --- a/srcpkgs/texlive/template +++ b/srcpkgs/texlive/template @@ -1,7 +1,7 @@ # Template file for 'texlive' pkgname=texlive version=20210325 -revision=7 +revision=8 build_wrksrc="build" build_style=gnu-configure configure_script="../configure"