From: lemmi <lemmi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] texlive: rebuild vor zlib-1.3.1
Date: Mon, 05 Feb 2024 13:38:03 +0100 [thread overview]
Message-ID: <20240205123803.170E42BB12@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48540@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2024-02-05 12:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-05 12:19 [PR PATCH] " lemmi
2024-02-05 12:30 ` meator
2024-02-05 12:38 ` lemmi [this message]
2024-02-05 12:41 ` lemmi
2024-02-05 16:50 ` classabbyamp
2024-02-05 16:53 ` [PR PATCH] [Merged]: " lemmi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240205123803.170E42BB12@inbox.vuxu.org \
--to=lemmi@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).