[PR PATCH] texlive: rebuild vor zlib-1.3.1

[PR PATCH] texlive: rebuild vor zlib-1.3.1

[lemmi]

[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]

There is a new pull request by lemmi against master on the void-packages repository

https://github.com/lemmi/void-packages texlive-zlib
https://github.com/void-linux/void-packages/pull/48540

texlive: rebuild vor zlib-1.3.1
Bump for `zlib-1.3.1`: 
```bash
lualatex
```
```
PANIC: unprotected error in call to Lua API (zlib library version does not match - header: 1.3, library: 1.3.1)
```
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48540.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-texlive-zlib-48540.patch --]
[-- Type: text/x-diff, Size: 634 bytes --]

From ddff53e94e2a574a8892a3347948c33aa41d9397 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 5 Feb 2024 12:59:51 +0100
Subject: [PATCH] texlive: rebuild vor zlib-1.3.1

---
 srcpkgs/texlive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"

Re: texlive: rebuild vor zlib-1.3.1

[meator]

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/48540#issuecomment-1926889330

Comment:
This is a duplicate of my PR #48522

Re: [PR PATCH] [Updated] texlive: rebuild vor zlib-1.3.1

[lemmi]

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

There is an updated pull request by lemmi against master on the void-packages repository

https://github.com/lemmi/void-packages texlive-zlib
https://github.com/void-linux/void-packages/pull/48540

texlive: rebuild vor zlib-1.3.1
Bump for `zlib-1.3.1`: 
```bash
lualatex
```
```
PANIC: unprotected error in call to Lua API (zlib library version does not match - header: 1.3, library: 1.3.1)
```
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48540.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-texlive-zlib-48540.patch --]
[-- Type: text/x-diff, Size: 2268 bytes --]

From 770cb16bb5c5203ed55fe72983516edbd3ce7040 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
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 <luigi.scarso@gmail.com>
+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"

Re: texlive: rebuild vor zlib-1.3.1

[lemmi]

[-- Attachment #1: Type: text/plain, Size: 451 bytes --]

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/48540#issuecomment-1926910907

Comment:
@meator oh, didn't see that.
@leahneukirchen suggested adding a patch that relaxes the version check from https://gitlab.lisn.upsaclay.fr/texlive/luatex/-/commit/3f53490d88387bbfe6c7d482089d9a597b257cf0
The patch doesn't apply cleanly as-is, but I removed the unnecessary parts and that seems to work for now.

Re: texlive: rebuild vor zlib-1.3.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/48540#issuecomment-1927456944

Comment:
that patch lgtm if it applies

Re: [PR PATCH] [Merged]: texlive: rebuild vor zlib-1.3.1

[lemmi]

[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]

There's a merged pull request on the void-packages repository

texlive: rebuild vor zlib-1.3.1
https://github.com/void-linux/void-packages/pull/48540

Description:
Bump for `zlib-1.3.1`: 
```bash
lualatex
```
```
PANIC: unprotected error in call to Lua API (zlib library version does not match - header: 1.3, library: 1.3.1)
```
#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->