[packages/vigra] - build fix for hdf5 1.12+, gcc 14 still unhappy

[baggins]

commit ce48d3c3144c2188a37abca39e6c37d5c01a82be
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Dec 18 00:11:14 2024 +0100

    - build fix for hdf5 1.12+, gcc 14 still unhappy

 hdf5-1.12.patch | 25 +++++++++++++++++++++++++
 vigra.spec      | 10 ++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)
---
diff --git a/vigra.spec b/vigra.spec
index baa1671..e7c2fd2 100644
--- a/vigra.spec
+++ b/vigra.spec
@@ -15,6 +15,7 @@ Patch1:		boost-python.patch
 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
 URL:		http://ukoethe.github.io/vigra/
 BuildRequires:	OpenEXR-devel
 BuildRequires:	boost-python-devel >= 1.40.0
@@ -114,10 +115,11 @@ Dokumentacja programisty do biblioteki vigra.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' config/vigra-config.in
 
diff --git a/hdf5-1.12.patch b/hdf5-1.12.patch
new file mode 100644
index 0000000..85a3288
--- /dev/null
+++ b/hdf5-1.12.patch
@@ -0,0 +1,25 @@
+From 4c70103d215bb70d4820cd4569321361d0baade7 Mon Sep 17 00:00:00 2001
+From: Mark Harfouche <mark.harfouche at gmail.com>
+Date: Tue, 28 Sep 2021 09:45:08 -0400
+Subject: [PATCH] Add compatibility for HDF5 1.12
+
+---
+ src/impex/hdf5impex.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/impex/hdf5impex.cxx b/src/impex/hdf5impex.cxx
+index 2c68342ea..b202b2fb5 100644
+--- a/src/impex/hdf5impex.cxx
++++ b/src/impex/hdf5impex.cxx
+@@ -190,7 +190,11 @@ H5O_type_t HDF5_get_type(hid_t loc_id, const char* name)
+ {
+     // get information about object
+     H5O_info_t infobuf;
++#if H5Oget_info_by_name_vers >= 3
++    H5Oget_info_by_name(loc_id, name, &infobuf, H5O_INFO_BASIC, H5P_DEFAULT);
++#else
+     H5Oget_info_by_name(loc_id, name, &infobuf, H5P_DEFAULT);
++#endif
+     return infobuf.type;
+ }
+ 
================================================================

---- gitweb:

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