[PR PATCH] python3-zstandard: update to 0.22.0.

[PR PATCH] python3-zstandard: update to 0.22.0.

[unspecd]

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

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

https://github.com/unspecd/void-packages python3-zstandard
https://github.com/void-linux/void-packages/pull/49606

python3-zstandard: update to 0.22.0.
Also: use bundled libzstd instead of the system one: python3-zstandard requires the specific version of libzstd, 1.5.5.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### 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, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-zstandard-49606.patch --]
[-- Type: text/x-diff, Size: 1581 bytes --]

From ae46e563b9ea906d92f9dc73ce87ab529e135cba Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 30 Mar 2024 12:10:42 +1100
Subject: [PATCH] python3-zstandard: update to 0.22.0.

Also: use bundled libzstd instead of the system one:
python3-zstandard requires the specific version of libzstd, 1.5.5.
---
 srcpkgs/python3-zstandard/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-zstandard/template b/srcpkgs/python3-zstandard/template
index d59cbb09b965fc..ff4a8754920d1f 100644
--- a/srcpkgs/python3-zstandard/template
+++ b/srcpkgs/python3-zstandard/template
@@ -1,11 +1,10 @@
 # Template file for 'python3-zstandard'
 pkgname=python3-zstandard
-version=0.21.0
-revision=3
+version=0.22.0
+revision=1
 build_style=python3-module
-make_build_args="--system-zstd"
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libzstd-devel"
+makedepends="python3-devel"
 depends="python3"
 checkdepends="python3-hypothesis"
 short_desc="Python bindings to the Zstandard (zstd) compression library"
@@ -14,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/indygreg/python-zstandard"
 changelog="https://raw.githubusercontent.com/indygreg/python-zstandard/main/docs/news.rst"
 distfiles="https://github.com/indygreg/python-zstandard/archive/${version}.tar.gz"
-checksum=15adc6bfa629d48b0bb658e9eae94c484adb66a28738fa780478eebeb41599a5
+checksum=34ce7ef020afca1344c538a778e2a2e30dc43b11509aa4cb5cf076228d959ca7
 
 pre_check() {
 	# The skipped test ignored due to failure, see:

Re: python3-zstandard: update to 0.22.0.

[unspecd]

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

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/49606#issuecomment-2028053379

Comment:
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2027841133

Re: python3-zstandard: update to 0.22.0.

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/49606#issuecomment-2028488184

Comment:
Thanks @howtologinquickwiththirtyninecharacters 
I'm a bit unsure about the vendored zstd. Have you tried it with the system 1.5.6?

What do you think about the following patch:
```
--- a/c-ext/backend_c.c	2023-11-01 02:58:34.000000000 -0300
+++ b/c-ext/backend_c.c	2024-03-29 21:32:40.694372789 -0300
@@ -152,7 +152,7 @@
     PyObject *features = NULL;
     PyObject *feature = NULL;
     unsigned zstd_ver_no = ZSTD_versionNumber();
-    unsigned our_hardcoded_version = 10505;
+    unsigned our_hardcoded_version = ZSTD_VERSION_NUMBER;
     if (ZSTD_VERSION_NUMBER != our_hardcoded_version ||
         zstd_ver_no != our_hardcoded_version) {
         PyErr_Format(
```
This eliminates the hardcoded version; it will still check that the build-time version matches the runtime version, so if zstd is updated then python3-zstandard will need to be rebuilt (and @leahneukirchen placed a note in zstd template to that effect).

Re: python3-zstandard: update to 0.22.0.

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/49606#issuecomment-2028488184

Comment:
Thanks @unspecd 

I'm a bit unsure about the vendored zstd. Have you tried it with the system 1.5.6?

What do you think about the following patch:
```
--- a/c-ext/backend_c.c	2023-11-01 02:58:34.000000000 -0300
+++ b/c-ext/backend_c.c	2024-03-29 21:32:40.694372789 -0300
@@ -152,7 +152,7 @@
     PyObject *features = NULL;
     PyObject *feature = NULL;
     unsigned zstd_ver_no = ZSTD_versionNumber();
-    unsigned our_hardcoded_version = 10505;
+    unsigned our_hardcoded_version = ZSTD_VERSION_NUMBER;
     if (ZSTD_VERSION_NUMBER != our_hardcoded_version ||
         zstd_ver_no != our_hardcoded_version) {
         PyErr_Format(
```
This eliminates the hardcoded version; it will still check that the build-time version matches the runtime version, so if zstd is updated then python3-zstandard will need to be rebuilt (and @leahneukirchen placed a note in zstd template to that effect).

Re: python3-zstandard: update to 0.22.0.

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/49606#issuecomment-2028948702

Comment:
I'm against this PR, I don't want vendored copies of core libs. I don't
mind updating the packages in sync, I just didn't know this.

> Message ID: ***@***.***>
>

Re: [PR PATCH] [Updated] python3-zstandard: update to 0.22.0.

[unspecd]

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

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

https://github.com/unspecd/void-packages python3-zstandard
https://github.com/void-linux/void-packages/pull/49606

python3-zstandard: update to 0.22.0.
Also: use bundled libzstd instead of the system one: python3-zstandard requires the specific version of libzstd, 1.5.5.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### 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, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-zstandard-49606.patch --]
[-- Type: text/x-diff, Size: 2253 bytes --]

From b2bd4431c6f7a55beb625149d6de15754ee9b0e7 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 30 Mar 2024 12:10:42 +1100
Subject: [PATCH] python3-zstandard: update to 0.22.0.

---
 .../patches/fix-hardcoded-version-number.patch        | 11 +++++++++++
 srcpkgs/python3-zstandard/template                    |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/python3-zstandard/patches/fix-hardcoded-version-number.patch

diff --git a/srcpkgs/python3-zstandard/patches/fix-hardcoded-version-number.patch b/srcpkgs/python3-zstandard/patches/fix-hardcoded-version-number.patch
new file mode 100644
index 00000000000000..3b72fa20c73a9e
--- /dev/null
+++ b/srcpkgs/python3-zstandard/patches/fix-hardcoded-version-number.patch
@@ -0,0 +1,11 @@
+--- a/c-ext/backend_c.c	2023-11-01 02:58:34.000000000 -0300
++++ b/c-ext/backend_c.c	2024-03-29 21:32:40.694372789 -0300
+@@ -152,7 +152,7 @@
+     PyObject *features = NULL;
+     PyObject *feature = NULL;
+     unsigned zstd_ver_no = ZSTD_versionNumber();
+-    unsigned our_hardcoded_version = 10505;
++    unsigned our_hardcoded_version = ZSTD_VERSION_NUMBER;
+     if (ZSTD_VERSION_NUMBER != our_hardcoded_version ||
+         zstd_ver_no != our_hardcoded_version) {
+         PyErr_Format(
diff --git a/srcpkgs/python3-zstandard/template b/srcpkgs/python3-zstandard/template
index d59cbb09b965fc..36907f76c111c1 100644
--- a/srcpkgs/python3-zstandard/template
+++ b/srcpkgs/python3-zstandard/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zstandard'
 pkgname=python3-zstandard
-version=0.21.0
-revision=3
+version=0.22.0
+revision=1
 build_style=python3-module
 make_build_args="--system-zstd"
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/indygreg/python-zstandard"
 changelog="https://raw.githubusercontent.com/indygreg/python-zstandard/main/docs/news.rst"
 distfiles="https://github.com/indygreg/python-zstandard/archive/${version}.tar.gz"
-checksum=15adc6bfa629d48b0bb658e9eae94c484adb66a28738fa780478eebeb41599a5
+checksum=34ce7ef020afca1344c538a778e2a2e30dc43b11509aa4cb5cf076228d959ca7
 
 pre_check() {
 	# The skipped test ignored due to failure, see:

Re: python3-zstandard: update to 0.22.0.

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/49606#issuecomment-2094963772

Comment:
@leahneukirchen this looks ok now, it seems it would fix #49743, and allows the update in #49348 (the commit here is identical to the second commit in #49348 except for the patch filename).

Note that `python3-zstandard` will still need to be rebuilt when `zstd` is updated, there's already a note to that effect in `zstd` template.

Re: [PR PATCH] [Merged]: python3-zstandard: update to 0.22.0.

[leahneukirchen]

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

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

python3-zstandard: update to 0.22.0.
https://github.com/void-linux/void-packages/pull/49606

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### 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, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):

Re: python3-zstandard: update to 0.22.0

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/49636#issuecomment-2028911613

Comment:
Dupe of #49606.