Bug#1087738: hkl: FTBFS against HDF5 1.14: Module ‘Bindings.HDF5.Raw’ does not export ‘H5L_info_t’

[pini]

Control: tags -1 + patch

Le 2024-11-17 22:22, Gilles Filippini a écrit :

The khl package fails to build from source in a test rebuild against
hdf5 1.14.5 currentyl in experimental:



src/Hkl/H5.hs:100:51: error:
    Module ‘Bindings.HDF5.Raw’ does not export ‘H5L_info_t’
    |

    |                                                   ^^^^^^^^^^

src/Hkl/H5.hs:101:66: error:
    Module ‘Bindings.HDF5.Raw’ does not export ‘h5l_iterate’
    |



Note: I previously rebuilt the haskell-hdf5 package.

[18 of 35] Compiling Hkl.H5 ( src/Hkl/H5.hs, /build/hkl-v9xamY/hkl-5.1.2/binoculars-ng/dist-newstyle/build/x86_64-linux/ghc-9.6.6/hkl-0.1.0.2/build/Hkl/H5.o, /build/hkl-v9xamY/hkl-5.1.2/binoculars-ng/dist-newstyle/build/x86_64-linux/ghc-9.6.6/hkl-0.1.0.2/build/Hkl/H5.dyn_o ) 100 | import Bindings.HDF5.Raw (H5L_info_t, HErr_t (HErr_t), 101 | HId_t (HId_t), h5l_iterate) | ^^^^^^^^^^^

Please find attached a patch proposal.

Best,
_g.
diff -Nru hkl-5.1.2/debian/changelog hkl-5.1.2/debian/changelog
--- hkl-5.1.2/debian/changelog	2024-10-16 13:59:25.000000000 +0200
+++ hkl-5.1.2/debian/changelog	2024-12-09 22:11:14.000000000 +0100
@@ -1,3 +1,10 @@
+hkl (5.1.2-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Support for HDF5 1.14
+
+ -- Gilles Filippini <p...@debian.org>  Mon, 09 Dec 2024 22:11:14 +0100
+
 hkl (5.1.2-2) unstable; urgency=medium
 
   * fix i386 FTBFS by removing hardcoded -N4 ghc-options
diff -Nru hkl-5.1.2/debian/rules hkl-5.1.2/debian/rules
--- hkl-5.1.2/debian/rules	2024-10-16 13:59:25.000000000 +0200
+++ hkl-5.1.2/debian/rules	2024-12-09 22:11:14.000000000 +0100
@@ -6,14 +6,21 @@
 export MPLCONFIGDIR=$(CURDIR)
 export DESTDIR=$(CURDIR)/debian/tmp
 
+HDF5_VERSION = $(shell h5cc -showconfig | grep 'HDF5 Version' | awk '{print $$3}')
+
 %:
 	dh $@ --with=gir
 
 override_dh_clean:
+	set -x; [ ! -f binoculars-ng/src/Hkl/H5.hs.orig ] || mv binoculars-ng/src/Hkl/H5.hs.orig binoculars-ng/src/Hkl/H5.hs
 	rm -f Documentation/api/hkl-docs.sgml
 	dh_clean
 
 override_dh_autoreconf:
+	# Support for HDF5 1.14
+	set -x; [ -f binoculars-ng/src/Hkl/H5.hs.orig ] || \
+	  dpkg --compare-versions '$(HDF5_VERSION)' '<<' 1.12.0 || \
+	  sed -i.orig 's/H5L_info_t/H5L_info1_t/g;s/h5l_iterate/h5l_iterate1/g' binoculars-ng/src/Hkl/H5.hs
 	dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure-indep: docflags = \

signature.asc
Description: OpenPGP digital signature