[pkgsrc/trunk]: pkgsrc/archivers/py-zstandard py-zstandard: fix building with...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a42884aa1131
branches:  trunk
changeset: 451959:a42884aa1131
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue May 04 12:24:33 2021 +0000

description:
py-zstandard: fix building with newer zstd

diffstat:

 archivers/py-zstandard/distinfo                         |   3 +-
 archivers/py-zstandard/patches/patch-c-ext_backend__c.c |  25 +++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)

diffs (41 lines):

diff -r 007936c7379d -r a42884aa1131 archivers/py-zstandard/distinfo
--- a/archivers/py-zstandard/distinfo   Tue May 04 09:27:21 2021 +0000
+++ b/archivers/py-zstandard/distinfo   Tue May 04 12:24:33 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.17 2021/02/28 18:35:32 adam Exp $
+$NetBSD: distinfo,v 1.18 2021/05/04 12:24:33 adam Exp $
 
 SHA1 (zstandard-0.15.2.tar.gz) = 66ffb728d478d94a0d0f16bdfff23373b3b536bc
 RMD160 (zstandard-0.15.2.tar.gz) = 90309af02d82c8524c4d2b6eabdb5fb2cac46c27
 SHA512 (zstandard-0.15.2.tar.gz) = 0102f3522145c80ec096e9dfac34a5bdd2a98b43b50b8c1e99bcfb0057904c551ababeeb82ced5f8b65945d42b39479cbc29472058679af1f8f91b68ae79f70f
 Size (zstandard-0.15.2.tar.gz) = 1012864 bytes
+SHA1 (patch-c-ext_backend__c.c) = 0f8d95683b857bc1960d06a818bc6bee665354ab
diff -r 007936c7379d -r a42884aa1131 archivers/py-zstandard/patches/patch-c-ext_backend__c.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/py-zstandard/patches/patch-c-ext_backend__c.c   Tue May 04 12:24:33 2021 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-c-ext_backend__c.c,v 1.1 2021/05/04 12:24:33 adam Exp $
+
+Do not use hardcoded version number.
+
+--- c-ext/backend_c.c.orig     2021-02-27 19:38:19.000000000 +0000
++++ c-ext/backend_c.c
+@@ -152,15 +152,13 @@ void zstd_module_init(PyObject *m) {
+     PyObject *features = NULL;
+     PyObject *feature = NULL;
+     unsigned zstd_ver_no = ZSTD_versionNumber();
+-    unsigned our_hardcoded_version = 10408;
+-    if (ZSTD_VERSION_NUMBER != our_hardcoded_version ||
+-        zstd_ver_no != our_hardcoded_version) {
++    if (ZSTD_VERSION_NUMBER != zstd_ver_no) {
+         PyErr_Format(
+             PyExc_ImportError,
+             "zstd C API versions mismatch; Python bindings were not "
+             "compiled/linked against expected zstd version (%u returned by the "
+-            "lib, %u hardcoded in zstd headers, %u hardcoded in the cext)",
+-            zstd_ver_no, ZSTD_VERSION_NUMBER, our_hardcoded_version);
++            "lib, %u hardcoded in zstd headers)",
++            zstd_ver_no, ZSTD_VERSION_NUMBER);
+         return;
+     }
+