Bug#1139605: libtrexio: diff for NMU version 2.2.3-3.1
Adrian Bunk <[email protected]>
| Newsgroups | gmane.linux.debian.devel.bugs.rc |
|---|---|
| Message-ID | <annEmwCa5MqO8lHI__20105.0401594088$1786365205$gmane$org@localhost> |
Control: tags 1139605 + pending Dear maintainer, I've prepared an NMU for libtrexio (versioned as 2.2.3-3.1) and uploaded it to DELAYED/3. Please feel free to tell me if I should cancel it. cu Adrian
libtrexio-2.2.3-3.1-nmu.diff
(text/x-diff, 3.5 KB)
diffstat for libtrexio-2.2.3 libtrexio-2.2.3 changelog | 9 ++++++++ patches/hdf5-2.1.0.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 3 files changed, 59 insertions(+) diff -Nru libtrexio-2.2.3/debian/changelog libtrexio-2.2.3/debian/changelog --- libtrexio-2.2.3/debian/changelog 2022-10-07 15:07:45.000000000 +0300 +++ libtrexio-2.2.3/debian/changelog 2026-08-10 15:24:36.000000000 +0300 @@ -1,3 +1,12 @@ +libtrexio (2.2.3-3.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Gilles Filippini ] + * Fix FTBFS against HDF5 2.1.0 (Closes: #1139605) + + -- Adrian Bunk <[email protected]> Mon, 10 Aug 2026 15:24:36 +0300 + libtrexio (2.2.3-3) unstable; urgency=medium * Team upload. diff -Nru libtrexio-2.2.3/debian/patches/hdf5-2.1.0.patch libtrexio-2.2.3/debian/patches/hdf5-2.1.0.patch --- libtrexio-2.2.3/debian/patches/hdf5-2.1.0.patch 1970-01-01 02:00:00.000000000 +0200 +++ libtrexio-2.2.3/debian/patches/hdf5-2.1.0.patch 2026-08-10 15:24:34.000000000 +0300 @@ -0,0 +1,49 @@ +Index: libtrexio-2.2.3/m4/ax_lib_hdf5.m4 +=================================================================== +--- libtrexio-2.2.3.orig/m4/ax_lib_hdf5.m4 ++++ libtrexio-2.2.3/m4/ax_lib_hdf5.m4 +@@ -237,7 +237,15 @@ HDF5 support is being disabled (equivale + esac + done + +- HDF5_LIBS="-lhdf5 $HDF5_LIBS" ++ HDF5_INFIX= ++ HDF5_LIBS="${HDF5_LIBS#"${HDF5_LIBS%%[![:space:]]*}"}" ++ case "$HDF5_LIBS" in ++ -lhdf5_*) ++ HDF5_INFIX="${HDF5_LIBS#-lhdf5_}" ++ HDF5_INFIX="_${HDF5_INFIX%%_*}" ++ ;; ++ esac ++ HDF5_LIBS="-lhdf5$HDF5_INFIX $HDF5_LIBS" + AC_MSG_RESULT([yes (version $[HDF5_VERSION])]) + + dnl See if we can compile +@@ -251,13 +259,13 @@ HDF5 support is being disabled (equivale + LIBS=$HDF5_LIBS + LDFLAGS=$HDF5_LDFLAGS + AC_CHECK_HEADER([hdf5.h], [ac_cv_hadf5_h=yes], [ac_cv_hadf5_h=no]) +- AC_CHECK_LIB([hdf5], [H5Fcreate], [ac_cv_libhdf5=yes], ++ AC_CHECK_LIB([hdf5${HDF5_INFIX}], [H5Fcreate], [ac_cv_libhdf5=yes], + [ac_cv_libhdf5=no]) + if test "$ac_cv_hadf5_h" = "no" && test "$ac_cv_libhdf5" = "no" ; then + 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="-lhdf5_hl $HDF5_LIBS"], [], []) ++ AC_CHECK_LIB([hdf5${HDF5_INFIX}_hl], [main],[HDF5_LIBS="-lhdf5${HDF5_INFIX}_hl $HDF5_LIBS"], [], []) + + CC=$ax_lib_hdf5_save_CC + CPPFLAGS=$ax_lib_hdf5_save_CPPFLAGS +@@ -294,9 +302,9 @@ HDF5 support is being disabled (equivale + for arg in $HDF5_LIBS + do + case "$arg" in #( +- -lhdf5_hl) HDF5_FLIBS="$HDF5_FLIBS -lhdf5hl_fortran $arg" ++ -lhdf5_hl) HDF5_FLIBS="$HDF5_FLIBS -lhdf5${HDF5_INFIX}_hl_fortran $arg" + ;; #( +- -lhdf5) HDF5_FLIBS="$HDF5_FLIBS -lhdf5_fortran $arg" ++ -lhdf5) HDF5_FLIBS="$HDF5_FLIBS -lhdf5${HDF5_INFIX}_fortran $arg" + ;; #( + *) HDF5_FLIBS="$HDF5_FLIBS $arg" + ;; diff -Nru libtrexio-2.2.3/debian/patches/series libtrexio-2.2.3/debian/patches/series --- libtrexio-2.2.3/debian/patches/series 2022-10-07 15:07:38.000000000 +0300 +++ libtrexio-2.2.3/debian/patches/series 2026-08-10 15:24:34.000000000 +0300 @@ -1,2 +1,3 @@ fixParallelTests.diff fix32bitBuilds.diff +hdf5-2.1.0.patch