[packages/vigra] - rel 15, fix building with gcc 14

baggins baggins at pld-linux.org
Wed Dec 18 11:54:37 CET 2024


commit 12bf54e4cd148a43d1bffc878a134b195e510022
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Dec 18 10:53:14 2024 +0100

    - rel 15, fix building with gcc 14

 gcc14.patch | 11 +++++++++++
 vigra.spec  |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/vigra.spec b/vigra.spec
index e7c2fd2..116096f 100644
--- a/vigra.spec
+++ b/vigra.spec
@@ -3,7 +3,7 @@ Summary:	Generic Programming for Computer Vision
 Summary(pl.UTF-8):	Ogólne programowanie obrazu komputerowego
 Name:		vigra
 Version:	1.11.1
-Release:	14
+Release:	15
 License:	MIT
 Group:		Libraries
 #Source0Download: http://ukoethe.github.io/vigra/#download
@@ -16,6 +16,7 @@ Patch2:		%{name}-multi_convolution.patch
 # https://src.fedoraproject.org/rpms/vigra/raw/rawhide/f/vigra-openexr3.patch
 Patch3:		%{name}-openexr3.patch
 Patch4:		hdf5-1.12.patch
+Patch5:		gcc14.patch
 URL:		http://ukoethe.github.io/vigra/
 BuildRequires:	OpenEXR-devel
 BuildRequires:	boost-python-devel >= 1.40.0
@@ -120,6 +121,7 @@ Dokumentacja programisty do biblioteki vigra.
 %patch -P 2 -p1
 %patch -P 3 -p1
 %patch -P 4 -p1
+%patch -P 5 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' config/vigra-config.in
 
diff --git a/gcc14.patch b/gcc14.patch
new file mode 100644
index 0000000..237b2a6
--- /dev/null
+++ b/gcc14.patch
@@ -0,0 +1,11 @@
+--- vigra-1.11.1/vigranumpy/src/core/vigranumpycore.cxx~	2017-05-19 17:01:08.000000000 +0200
++++ vigra-1.11.1/vigranumpy/src/core/vigranumpycore.cxx	2024-12-18 10:51:25.553019663 +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
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vigra.git/commitdiff/12bf54e4cd148a43d1bffc878a134b195e510022



More information about the pld-cvs-commit mailing list