Source: gwyddion Version: 3.10-6 Severity: important Tags: ftbfs patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512
Hi, During a test rebuild of HDF5's reverse dependencies against HDF5 2.1.0 currently in experimental, gwyddion FTBFS because the related m4 macro doesn't support this new major release. The attached patch fixes this issue and supports both HDF5 1.14.6 in unstable and HDF5 2.1.0 in experimental. Best, _g. - -- System Information: Debian Release: 12.0 Architecture: amd64 (x86_64) Kernel: Linux 6.1.0-44-amd64 (SMP w/12 CPU threads; PREEMPT) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEoJObzArDE05WtIyR7+hsbH/+z4MFAmopGEgACgkQ7+hsbH/+ z4NZtQf/SYfQluMI3gWzGvvsYutx/Zp2uU+PdQq7WLhFGaSTotORaxNB191qkQuF zsnJoPzQenus641IHBKhAwU/gHMU8+9hy79/ZzkGJ9vsNr1tyCQf5TIrmioyh7gL OtxPJrzpqqo8fEr6PDQzFhvR4q4oj5qg6SHxRi1dEt1nGOLSxOlr5JukkD+QD9RA vxKX8IDgC80CVnGetAX2wG+AEZ0lrwBBYywxqTdVN2yTfbPHo1bC9Xsc34xjzeQF rtouV7FheMjlHXpuVTeDE55AduJWuFQrEwxnkGgperZyq2Vuy9li1KuovrIXBBtr aYhbpqxCegWvlVJ7NY630RtSfcvfWQ== =M5M4 -----END PGP SIGNATURE-----
diff -Nru gwyddion-3.10/debian/changelog gwyddion-3.10/debian/changelog --- gwyddion-3.10/debian/changelog 2026-05-11 07:24:59.000000000 +0200 +++ gwyddion-3.10/debian/changelog 2026-05-28 15:03:17.000000000 +0200 @@ -1,3 +1,10 @@ +gwyddion (3.10-6.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS against HDF5 2.1.0 + + -- Gilles Filippini <[email protected]> Thu, 28 May 2026 15:03:17 +0200 + gwyddion (3.10-6) unstable; urgency=medium * Rename -dev and -doc package to not use the version number diff -Nru gwyddion-3.10/debian/patches/hdf5-2.1.0.patch gwyddion-3.10/debian/patches/hdf5-2.1.0.patch --- gwyddion-3.10/debian/patches/hdf5-2.1.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ gwyddion-3.10/debian/patches/hdf5-2.1.0.patch 2026-05-28 15:03:17.000000000 +0200 @@ -0,0 +1,87 @@ +Index: gwyddion-3.10/configure +=================================================================== +--- gwyddion-3.10.orig/configure ++++ gwyddion-3.10/configure +@@ -25841,7 +25841,7 @@ esac + esac + done + +- HDF5_LIBS="$HDF5_LIBS -lhdf5" ++ HDF5_LIBS="$HDF5_LIBS -lhdf5_serial" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (version $HDF5_VERSION)" >&5 + printf "%s\n" "yes (version $HDF5_VERSION)" >&6; } + +@@ -25862,14 +25862,14 @@ else case e in #( + esac + fi + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for H5free_memory in -lhdf5" >&5 +-printf %s "checking for H5free_memory in -lhdf5... " >&6; } ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for H5free_memory in -lhdf5_serial" >&5 ++printf %s "checking for H5free_memory in -lhdf5_serial... " >&6; } + if test ${ac_cv_lib_hdf5_H5free_memory+y} + then : + printf %s "(cached) " >&6 + else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +-LIBS="-lhdf5 $LIBS" ++LIBS="-lhdf5_serial $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -25917,14 +25917,14 @@ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Unable to compile HDF5 test program" >&5 + printf "%s\n" "$as_me: WARNING: Unable to compile HDF5 test program" >&2;} + fi +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lhdf5_hl" >&5 +-printf %s "checking for main in -lhdf5_hl... " >&6; } ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lhdf5_serial_hl" >&5 ++printf %s "checking for main in -lhdf5_serial_hl... " >&6; } + if test ${ac_cv_lib_hdf5_hl_main+y} + then : + printf %s "(cached) " >&6 + else case e in #( + e) ac_check_lib_save_LIBS=$LIBS +-LIBS="-lhdf5_hl $LIBS" ++LIBS="-lhdf5_serial_hl $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -25953,7 +25953,7 @@ fi + printf "%s\n" "$ac_cv_lib_hdf5_hl_main" >&6; } + if test "x$ac_cv_lib_hdf5_hl_main" = xyes + then : +- HDF5_LIBS="$HDF5_LIBS -lhdf5_hl" ++ HDF5_LIBS="$HDF5_LIBS -lhdf5_serial_hl" + fi + + ac_cv_lib_hdf5_hl=ac_cv_lib_hdf5_hl_main +Index: gwyddion-3.10/m4/gwy-hdf5.m4 +=================================================================== +--- gwyddion-3.10.orig/m4/gwy-hdf5.m4 ++++ gwyddion-3.10/m4/gwy-hdf5.m4 +@@ -157,7 +157,14 @@ HDF5 support is being disabled (equivale + esac + done + +- HDF5_LIBS="$HDF5_LIBS -lhdf5" ++ HDF5_INFIX= ++ case "$HDF5_LIBS" in ++ -lhdf5_*) ++ HDF5_INFIX="${HDF5_LIBS#-lhdf5_}" ++ HDF5_INFIX="_${HDF5_INFIX%%_*}" ++ ;; ++ esac ++ HDF5_LIBS="$HDF5_LIBS -lhdf5$HDF5_INFIX" + AC_MSG_RESULT([yes (version $[HDF5_VERSION])]) + + dnl See if we can compile +@@ -176,7 +183,7 @@ HDF5 support is being disabled (equivale + AC_MSG_WARN([Unable to compile HDF5 test program]) + fi + dnl Look for HDF5's high level library +- AC_CHECK_LIB([hdf5_hl],[main],[HDF5_LIBS="$HDF5_LIBS -lhdf5_hl"],[],[]) ++ AC_CHECK_LIB([hdf5_hl],[main],[HDF5_LIBS="$HDF5_LIBS -lhdf5${HDF5_INFIX}_hl"],[],[]) + ac_cv_lib_hdf5_hl=ac_cv_lib_hdf5_hl_main + + CC=$gwy_hdf5_save_CC diff -Nru gwyddion-3.10/debian/patches/series gwyddion-3.10/debian/patches/series --- gwyddion-3.10/debian/patches/series 2026-05-11 07:24:59.000000000 +0200 +++ gwyddion-3.10/debian/patches/series 2026-05-28 15:03:17.000000000 +0200 @@ -1,3 +1,4 @@ +hdf5-2.1.0.patch launcher.patch skip_test.patch flaky.patch
