diff options
| author | Marius Bakke <marius@gnu.org> | 2020-05-26 22:30:51 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-26 22:30:51 +0200 |
| commit | 9edb3f66fd807b096b48283debdcddccfea34bad (patch) | |
| tree | cfd86f44ad51df4341a0d48cf4978117e11d7f59 /gnu/packages/patches/vigra-python-compat.patch | |
| parent | e5f95fd897ad32c93bb48ceae30021976a917979 (diff) | |
| parent | b6d18fbdf6ab4a8821a58aa16587676e835001f2 (diff) | |
| download | guix-9edb3f66fd807b096b48283debdcddccfea34bad.tar guix-9edb3f66fd807b096b48283debdcddccfea34bad.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/vigra-python-compat.patch')
| -rw-r--r-- | gnu/packages/patches/vigra-python-compat.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/gnu/packages/patches/vigra-python-compat.patch b/gnu/packages/patches/vigra-python-compat.patch new file mode 100644 index 0000000000..63c6abb326 --- /dev/null +++ b/gnu/packages/patches/vigra-python-compat.patch @@ -0,0 +1,18 @@ +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 + } |