Bug#1108648: grads: Don't use hdf4-alt packages (removed in HDF 4.3.1)

[Bas Couwenberg]

Source: grads
Version: 3:2.2.1-9
Severity: important
Tags: patch
Control: tags -1 forky sid
User: debian-gis at lists.debian.org
Usertags: hdf4-4.3.1

Dear Maintainer,

Your package depends on the hdf4-alt package which are removed in HDF 4.3.1.

The attached patch resolves this, but cannot be used for the package in unstable until libhdf4 has been updated there sometime after the trixie release.

Note that while your package doesn't FTBFS without this patch, it does disable the HDF4 support because it unconditionally searches for the alt libraries.

Kind Regards,

Bas
-------------- next part --------------
diff -Nru grads-2.2.1/debian/changelog grads-2.2.1/debian/changelog
--- grads-2.2.1/debian/changelog	2024-12-11 11:21:17.000000000 +0100
+++ grads-2.2.1/debian/changelog	2025-07-02 10:24:48.000000000 +0200
@@ -1,3 +1,10 @@
+grads (3:2.2.1-9.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Rebuild with HDF 4.3.1.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 02 Jul 2025 10:24:48 +0200
+
 grads (3:2.2.1-9) unstable; urgency=medium
 
   [ Giles Filippini ]
diff -Nru grads-2.2.1/debian/control grads-2.2.1/debian/control
--- grads-2.2.1/debian/control	2024-12-11 11:21:17.000000000 +0100
+++ grads-2.2.1/debian/control	2025-07-02 10:24:48.000000000 +0200
@@ -19,7 +19,7 @@
  libxmu-headers, 
  libgd-dev, 
  libshp-dev, 
- libhdf4-alt-dev, 
+ libhdf4-dev (>= 4.3.1),
  libgadap-dev (>= 2.0-11), 
  libaec-dev,
  libcairo2-dev
diff -Nru grads-2.2.1/debian/patches/hdf4-alt.patch grads-2.2.1/debian/patches/hdf4-alt.patch
--- grads-2.2.1/debian/patches/hdf4-alt.patch	2024-12-11 11:21:17.000000000 +0100
+++ grads-2.2.1/debian/patches/hdf4-alt.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-Description: Build against HDF4ALT on Debian.
-Origin: http://bugs.debian.orf/655869
-Forwarded: not-needed
-Last-UpdatedL: 2012-09-19
-
-Index: grads-2.2.1/configure.ac
-===================================================================
---- grads-2.2.1.orig/configure.ac
-+++ grads-2.2.1/configure.ac
-@@ -675,11 +675,11 @@ if test "Z$ga_supplib_dir" != "Z" ; then
-     echo looking in $ga_supplib_dir 
-     GA_SET_FLAGS([])
-     AC_CHECK_HEADER([mfhdf.h],
--    [ AC_CHECK_LIB([df], [main], 
--      [ AC_CHECK_LIB([mfhdf], [main],
-+    [ AC_CHECK_LIB([dfalt], [main], 
-+      [ AC_CHECK_LIB([mfhdfalt -ldfalt], [main],
-         [ use_hdf=yes 
- #          GA_SET_LIB_VAR([hdf_libs], [mfhdf df jpeg z udunits])
--          GA_SET_DYNLIB_VAR([hdf_libs], [mfhdf df jpeg z udunits])
-+          GA_SET_DYNLIB_VAR([hdf_libs], [mfhdfalt dfalt jpeg z udunits])
-         ])
-       ])
-     ])
-Index: grads-2.2.1/m4/hdf4.m4
-===================================================================
---- grads-2.2.1.orig/m4/hdf4.m4
-+++ grads-2.2.1/m4/hdf4.m4
-@@ -189,11 +189,11 @@ dnl nor required everywhere
-   ac_hdf4_lib='no'
-   AC_CHECK_LIB_NOCACHE_HDF4([z],[deflate],
-   [ AC_CHECK_LIB_NOCACHE_HDF4([jpeg],[jpeg_start_compress],
--    [ AC_CHECK_LIB_NOCACHE_HDF4([df],[Hopen],
--      [ AC_CHECK_LIB_NOCACHE_HDF4([mfhdf],[SDstart],
-+    [ AC_CHECK_LIB_NOCACHE_HDF4([dfalt],[Hopen],
-+      [ AC_CHECK_LIB_NOCACHE_HDF4([mfhdfalt],[SDstart],
-         [ ac_hdf4_lib="yes"
--          HDF4_LIBS="-lmfhdf -ldf -ljpeg -lz $HDF4_LIBS"
--        ],[],[-ldf -ljpeg -lz])
-+          HDF4_LIBS="-lmfhdfalt -ldfalt -ljpeg -lz $HDF4_LIBS"
-+        ],[],[-ldfalt -ljpeg -lz])
-       ],[],[-ljpeg -lz])
-     ])
-   ])
diff -Nru grads-2.2.1/debian/patches/series grads-2.2.1/debian/patches/series
--- grads-2.2.1/debian/patches/series	2024-12-11 11:21:17.000000000 +0100
+++ grads-2.2.1/debian/patches/series	2025-07-02 10:24:48.000000000 +0200
@@ -1,6 +1,5 @@
 privacy-include-icon.patch
 nc-config.patch
-hdf4-alt.patch
 supplibs.patch
 paths.patch
 udunits2.patch