CVS commit: pkgsrc/archivers/py-zstandard

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue May  4 12:24:33 UTC 2021

Modified Files:
        pkgsrc/archivers/py-zstandard: distinfo
Added Files:
        pkgsrc/archivers/py-zstandard/patches: patch-c-ext_backend__c.c

Log Message:
py-zstandard: fix building with newer zstd


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/archivers/py-zstandard/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/archivers/py-zstandard/patches/patch-c-ext_backend__c.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/py-zstandard/distinfo
diff -u pkgsrc/archivers/py-zstandard/distinfo:1.17 pkgsrc/archivers/py-zstandard/distinfo:1.18
--- pkgsrc/archivers/py-zstandard/distinfo:1.17 Sun Feb 28 18:35:32 2021
+++ pkgsrc/archivers/py-zstandard/distinfo      Tue May  4 12:24:33 2021
@@ -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

Added files:

Index: pkgsrc/archivers/py-zstandard/patches/patch-c-ext_backend__c.c
diff -u /dev/null pkgsrc/archivers/py-zstandard/patches/patch-c-ext_backend__c.c:1.1
--- /dev/null   Tue May  4 12:24:33 2021
+++ pkgsrc/archivers/py-zstandard/patches/patch-c-ext_backend__c.c      Tue May  4 12:24:33 2021
@@ -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;
+     }
+