[gentoo-commits] proj/tex-patches:main commit in: /

["Florian Schmaus" <flow@gentoo.org>]

commit:     7c8ed9f4d52244f8c6c1c3a91c3316130bb8847a
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 20:49:26 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 20:49:26 2024 +0000
URL:        https://gitweb.gentoo.org/proj/tex-patches.git/commit/?id=7c8ed9f4

replace zlib version check patch with upstream's version

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 ...check-to-just-major-version-following-deb.patch | 26 ++++++++++++++++
 remove-luazlib-zlib-header-check.patch             | 35 ----------------------
 2 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/relax-zlib-check-to-just-major-version-following-deb.patch b/relax-zlib-check-to-just-major-version-following-deb.patch
new file mode 100644
index 0000000..ae6da9f
--- /dev/null
+++ b/relax-zlib-check-to-just-major-version-following-deb.patch
@@ -0,0 +1,26 @@
+From 7fb47babef2c947ad937d9e8e36842122459342c Mon Sep 17 00:00:00 2001
+From: Karl Berry <karl@freefriends.org>
+Date: Mon, 20 Nov 2023 23:05:35 +0000
+Subject: [PATCH] relax zlib check to just major version, following debian
+
+git-svn-id: svn://tug.org/texlive/trunk/Build/source@68922 c570f23f-e606-0410-a88d-b1316a301751
+---
+ 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 e61f92d580e2..ea123e54126f 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);
+-- 
+2.41.0
+

diff --git a/remove-luazlib-zlib-header-check.patch b/remove-luazlib-zlib-header-check.patch
deleted file mode 100644
index f6c1fd3..0000000
--- a/remove-luazlib-zlib-header-check.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 47ca872d418772a227f143ec17fe4341a7afaf75 Mon Sep 17 00:00:00 2001
-From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Sun, 2 Jun 2019 14:16:09 +0300
-Subject: [PATCH 4/6] remove luazlib zlib header check
-
-https://bugs.gentoo.org/show_bug.cgi?id=310487
-https://bugs.gentoo.org/show_bug.cgi?id=605766
-
-Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
----
- texk/web2c/luatexdir/luazlib/lzlib.c | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/texk/web2c/luatexdir/luazlib/lzlib.c b/texk/web2c/luatexdir/luazlib/lzlib.c
-index e61f92d5..b03e14d4 100644
---- a/texk/web2c/luatexdir/luazlib/lzlib.c
-+++ b/texk/web2c/luatexdir/luazlib/lzlib.c
-@@ -544,14 +544,6 @@ 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))
--    {
--        lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version);
--        lua_error(L);
--    }
--
-     /* create new metatable for zlib compression structures */
-     luaL_newmetatable(L, ZSTREAMMETA);
-     lua_pushliteral(L, "__index");
--- 
-2.21.0
-