[Git][debian-gis-team/gmtsar][master] Improve patch for HDF5 2.1.0 (closes: #1139600)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / gmtsar


Commits:
dae36b4d by Bas Couwenberg at 2026-06-22T10:51:15+02:00
Improve patch for HDF5 2.1.0 (closes: #1139600)

- - - - -


2 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+gmtsar (6.6+ds-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Improve patch for HDF5 2.1.0 (closes: #1139600)
+
+ -- Gilles Filippini <pini at debian.org>  Mon, 22 Jun 2026 10:11:56 +0200
+
 gmtsar (6.6+ds-2) unstable; urgency=medium
 
   [ Bas Couwenberg ]


=====================================
debian/patches/hdf5-2.1.0.patch
=====================================
@@ -6,23 +6,26 @@ Applied-Upstream: https://github.com/gmtsar/gmtsar/commit/564cdfc789192337c70f6f
 
 --- a/ax_lib_hdf5.m4
 +++ b/ax_lib_hdf5.m4
-@@ -226,7 +226,14 @@ HDF5 support is being disabled (equivale
+@@ -226,7 +226,17 @@ HDF5 support is being disabled (equivale
            esac
          done
  
 -        HDF5_LIBS="$HDF5_LIBS -lhdf5"
 +        HDF5_INFIX=
-+        case "$HDF5_LIBS" in
++        for lib in $HDF5_LIBS; do
++          case "$lib" in
 +            -lhdf5_*)
-+                HDF5_INFIX="${HDF5_LIBS#-lhdf5_}"
++                HDF5_INFIX="${lib#-lhdf5_}"
 +                HDF5_INFIX="_${HDF5_INFIX%%_*}"
++                break
 +                ;;
-+        esac
++          esac
++        done
 +        HDF5_LIBS="$HDF5_LIBS -lhdf5$HDF5_INFIX"
          AC_MSG_RESULT([yes (version $[HDF5_VERSION])])
  
          dnl See if we can compile
-@@ -245,7 +252,7 @@ HDF5 support is being disabled (equivale
+@@ -245,7 +255,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
@@ -31,7 +34,7 @@ Applied-Upstream: https://github.com/gmtsar/gmtsar/commit/564cdfc789192337c70f6f
  
          CC=$ax_lib_hdf5_save_CC
          CPPFLAGS=$ax_lib_hdf5_save_CPPFLAGS
-@@ -281,9 +288,9 @@ HDF5 support is being disabled (equivale
+@@ -281,9 +291,9 @@ HDF5 support is being disabled (equivale
              for arg in $HDF5_LIBS
              do
                case "$arg" in #(



View it on GitLab: https://salsa.debian.org/debian-gis-team/gmtsar/-/commit/dae36b4ddcfe568dd10279b115a4ff02f50aa330

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gmtsar/-/commit/dae36b4ddcfe568dd10279b115a4ff02f50aa330
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/pkg-grass-devel/attachments/20260622/2b7639a7/attachment-0001.htm>