Fix to build with python 3.7, bugs #1606645 #1597394

This commit is contained in:
Bruno Postle 2018-08-23 08:05:08 +01:00
parent 8a81162994
commit e771848e2a
2 changed files with 18 additions and 1 deletions

12
vigra-1.11.1.py37.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ur vigra-1.11.1/vigranumpy/src/core/vigranumpycore.cxx vigra-1.11.1.new/vigranumpy/src/core/vigranumpycore.cxx
--- vigra-1.11.1/vigranumpy/src/core/vigranumpycore.cxx 2017-05-19 16:01:08.000000000 +0100
+++ vigra-1.11.1.new/vigranumpy/src/core/vigranumpycore.cxx 2018-08-23 00:08:42.980416247 +0100
@@ -61,7 +61,7 @@
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
}

View File

@ -10,7 +10,7 @@
Summary: Generic Programming for Computer Vision
Name: vigra
Version: 1.11.1
Release: 9%{?dist}
Release: 10%{?dist}
License: MIT
Group: Development/Libraries
# The "Lenna" files are non-free, we need to remove them from the source tarball.
@ -26,6 +26,8 @@ Patch0: https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d
# Avoid attempt to install non-free 'lenna' files
Patch1: vigra-1.10.0-no-lenna.patch
Patch2: vigra-1.11.1.docdir.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1597394
Patch3: vigra-1.11.1.py37.patch
URL: http://ukoethe.github.io/vigra/
BuildRequires: gcc-c++ zlib-devel libjpeg-devel libpng-devel libtiff-devel fftw-devel >= 3
BuildRequires: cmake boost-devel doxygen
@ -174,6 +176,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config
%endif
%changelog
* Wed Aug 22 2018 Bruno Postle <bruno@postle.net> - 1.11.1-10
- Patched for python 3.7
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild