diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-22 06:25:20 +0000 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-22 06:25:20 +0000 |
| commit | 0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b (patch) | |
| tree | d9724175476a27a7234140519e035c8d4c79aedc /gnu/packages/patches/vigra-python-compat.patch | |
| parent | 22f7d4bce1e694b7ac38e62410d76a6d46d96c5d (diff) | |
| parent | d58e52b0713648dd30d41b41277854a935d8d15a (diff) | |
| download | guix-0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b.tar guix-0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b.tar.gz | |
Merge remote-tracking branch core-updates-frozen into core-updates
Diffstat (limited to 'gnu/packages/patches/vigra-python-compat.patch')
| -rw-r--r-- | gnu/packages/patches/vigra-python-compat.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/gnu/packages/patches/vigra-python-compat.patch b/gnu/packages/patches/vigra-python-compat.patch deleted file mode 100644 index 63c6abb326..0000000000 --- a/gnu/packages/patches/vigra-python-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix build with Boost + Python 3.7. - -Taken from upstream: -https://github.com/ukoethe/vigra/commit/a6fa62663c6a6b752ed0707e95f643e25867a0f9 - -diff --git a/vigranumpy/src/core/vigranumpycore.cxx b/vigranumpy/src/core/vigranumpycore.cxx -index ec38d3636..c81c6ae52 100644 ---- a/vigranumpy/src/core/vigranumpycore.cxx -+++ b/vigranumpy/src/core/vigranumpycore.cxx -@@ -61,7 +61,7 @@ UInt32 pychecksum(python::str const & s) - return checksum(data, size); - #else - Py_ssize_t size = 0; -- char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size); -+ const char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size); - return checksum(data, size); - #endif - } |