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

[Bas Couwenberg]

Source: dx
Version: 1:4.4.4-18
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.

Kind Regards,

Bas
-------------- next part --------------
diff -Nru dx-4.4.4/debian/control dx-4.4.4/debian/control
--- dx-4.4.4/debian/control	2024-11-24 12:02:44.000000000 +0100
+++ dx-4.4.4/debian/control	2025-07-02 08:59:50.000000000 +0200
@@ -10,7 +10,7 @@
                flex,
                libbz2-dev,
                libglu-dev,
-               libhdf4-alt-dev | libhdf4-dev,
+               libhdf4-dev,
                libjpeg-dev,
                libmotif-dev,
                libnetcdf-dev,
@@ -72,7 +72,7 @@
 Depends: libdx4t64 (= ${binary:Version}), ${misc:Depends}
 Suggests: libbz2-dev,
           libglu-dev,
-          libhdf4-alt-dev | libhdf4-dev,
+          libhdf4-dev,
           libjpeg-dev,
           liblcms1-dev,
           libmotif-dev,
diff -Nru dx-4.4.4/debian/patches/40-hdfalt-support.patch dx-4.4.4/debian/patches/40-hdfalt-support.patch
--- dx-4.4.4/debian/patches/40-hdfalt-support.patch	2024-05-03 10:55:40.000000000 +0200
+++ dx-4.4.4/debian/patches/40-hdfalt-support.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-From: Daniel Kobras <kobras at debian.org>
-Subject: Add support for Debian-specific library hdf4-alt that provides an
- alternative ABI suitable for linking both libhdf4 and netcdf into the
- same binary without namespace clashes.
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dx~/configure.ac dx/configure.ac
---- dx~/configure.ac	2010-03-25 19:27:17.000000000 +0100
-+++ dx/configure.ac	2010-03-25 19:29:17.000000000 +0100
-@@ -680,7 +680,16 @@
-     fi
- dnl -- check for unix
- else
--    AC_CHECK_LIB(df,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -lz -ljpeg ])
-+    for libname in df dfalt
-+    do
-+        AC_CHECK_LIB($libname,Hopen,[found=1; break],found=0,[ -lz -ljpeg ])
-+    done
-+    if test $found -eq 1
-+    then
-+        passed=`expr $passed + 1`
-+    else
-+        failed=`expr $failed + 1`
-+    fi
-     AC_MSG_CHECKING(if HDF package is complete)
-     if test $passed -gt 0
-     then
-@@ -689,9 +698,9 @@
- 	AC_MSG_RESULT(no -- some components failed test)
-         have_hdf='no (failed tests)'
-     else
--	LIB_HDF='-ldf'
-+	LIB_HDF="-l$libname"
- 	LIBS="$LIB_HDF $LIBS"
--	FMT_LIBS="$FMT_LIBS libdf.a"
-+	FMT_LIBS="$FMT_LIBS lib${libname}.a"
- 	AC_DEFINE(HAVE_LIBDF, 1, [Define to 1 if you have the HDF libraries])
- 	AC_MSG_RESULT(yes)
- 	have_hdf='yes'
diff -Nru dx-4.4.4/debian/patches/series dx-4.4.4/debian/patches/series
--- dx-4.4.4/debian/patches/series	2024-08-25 11:46:20.000000000 +0200
+++ dx-4.4.4/debian/patches/series	2025-07-02 08:59:50.000000000 +0200
@@ -8,7 +8,6 @@
 10-autoreconf-fix.patch
 20-magick-pkgconfig.patch
 30-no-shell-override.patch
-40-hdfalt-support.patch
 90-usr-local-cleanup.patch
 50-dxgeterror-fix.patch
 50-disable-libxp.patch