[med-svn] [Git][med-team/gwyddion][master] Fix FTBFS against HDF5 2.1.0 Closes: #1139602

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / gwyddion


Commits:
8ee8fead by Andreas Tille at 2026-07-02T17:07:35+02:00
Fix FTBFS against HDF5 2.1.0 Closes: #1139602

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/hdf5-2.1.0.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+gwyddion (3.10-7) UNRELEASED; urgency=medium
+
+  [ Gilles Filippini ]
+  * Fix FTBFS against HDF5 2.1.0
+    Closes: #1139602
+
+ -- Andreas Tille <tille at debian.org>  Thu, 02 Jul 2026 17:06:33 +0200
+
 gwyddion (3.10-6) unstable; urgency=medium
 
   * Rename -dev and -doc package to not use the version number


=====================================
debian/patches/hdf5-2.1.0.patch
=====================================
@@ -0,0 +1,92 @@
+Author: Gilles Filippini <pini at debian.org>
+Last-Update: 2026-06-10
+Bug-Debian: https://bugs.debian.org/1139602
+Description: Fix FTBFS against HDF5 2.1.0
+
+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


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+hdf5-2.1.0.patch
 launcher.patch
 skip_test.patch
 flaky.patch



View it on GitLab: https://salsa.debian.org/med-team/gwyddion/-/commit/8ee8fead2184760c907f551e7fb173b9668b845a

-- 
View it on GitLab: https://salsa.debian.org/med-team/gwyddion/-/commit/8ee8fead2184760c907f551e7fb173b9668b845a
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260702/7115594f/attachment-0001.htm>