diffstat for gnudatalanguage-1.1.3 gnudatalanguage-1.1.3

 changelog                                                               |    8 
 patches/0001-fix-HDF4-detection-in-CMake-for-newer-versions-of-HD.patch |   96 ++++++++++
 patches/series                                                          |    1 
 3 files changed, 105 insertions(+)

diff -Nru gnudatalanguage-1.1.3/debian/changelog gnudatalanguage-1.1.3/debian/changelog
--- gnudatalanguage-1.1.3/debian/changelog	2026-02-28 12:40:06.000000000 +0200
+++ gnudatalanguage-1.1.3/debian/changelog	2026-10-17 20:13:22.000000000 +0300
@@ -1,3 +1,11 @@
+gnudatalanguage (1.1.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with HDF4 4.4.
+    (Closes: #1146651)
+
+ -- Adrian Bunk <bunk@debian.org>  Sat, 17 Oct 2026 20:13:22 +0300
+
 gnudatalanguage (1.1.3-1) unstable; urgency=medium
 
   [ Alexandre Detiste ]
diff -Nru gnudatalanguage-1.1.3/debian/patches/0001-fix-HDF4-detection-in-CMake-for-newer-versions-of-HD.patch gnudatalanguage-1.1.3/debian/patches/0001-fix-HDF4-detection-in-CMake-for-newer-versions-of-HD.patch
--- gnudatalanguage-1.1.3/debian/patches/0001-fix-HDF4-detection-in-CMake-for-newer-versions-of-HD.patch	1970-01-01 02:00:00.000000000 +0200
+++ gnudatalanguage-1.1.3/debian/patches/0001-fix-HDF4-detection-in-CMake-for-newer-versions-of-HD.patch	2026-10-17 20:13:22.000000000 +0300
@@ -0,0 +1,96 @@
+From ec08fdfc7585d6cad30ccbe02726b567f48ac944 Mon Sep 17 00:00:00 2001
+From: martinjotte <martinjotte@gmail.com>
+Date: Sat, 17 Oct 2026 08:20:01 -0400
+Subject: fix HDF4 detection in CMake (for newer versions of HDF4). closes
+ #2230 (#2269)
+
+Many thanks, I merge this first since another waiting PR concerns CMakeLists.txt too.
+---
+ CMakeLists.txt  |  6 +++---
+ src/hdf_pro.cpp | 21 +++++++++++++++++++++
+ 2 files changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9da75fec..cb5edcc1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -620,11 +620,11 @@ if(HDF)
+     if(HDF_FOUND)
+         if(NETCDF)
+             set(CMAKE_REQUIRED_LIBRARIES ${HDF_EXTRA_LIBRARIES})
+-                        check_library_exists("${HDF_LIBRARIES};${RPC_LIBRARIES}" sd_nccreate "" SD_NCCREATE)
+-            if(NOT SD_NCCREATE)
++                        check_library_exists("${HDF_LIBRARIES};${RPC_LIBRARIES}" nccreate "" HDF_NCCREATE)
++            if(HDF_NCCREATE)
+                 message(FATAL_ERROR "HDF4 needs to be configured with the --disable-netcdf option "
+                 "in order to be used with the original netCDF library.")
+-            endif(NOT SD_NCCREATE)
++            endif(HDF_NCCREATE)
+             set(CMAKE_REQUIRED_LIBRARIES)
+         endif(NETCDF)
+         set(HDF_LIBRARIES ${HDF_LIBRARIES} ${HDF_EXTRA_LIBRARIES})
+diff --git a/src/hdf_pro.cpp b/src/hdf_pro.cpp
+index e36685e9..187fe2ac 100644
+--- a/src/hdf_pro.cpp
++++ b/src/hdf_pro.cpp
+@@ -28,6 +28,7 @@
+ 
+ #include "mfhdf.h"
+ #include "hdf_pro.hpp"
++#include "hfile.h"
+ 
+ namespace lib {
+ 
+@@ -481,21 +482,36 @@ namespace lib {
+     e->AssureScalarPar<DLongGDL>( 0, vg_id);
+ 
+     if( e->WriteableKeywordPresent( 0)) {
++#if LIBVER_MAJOR == 4 && LIBVER_MINOR >= 4
++      size_t sz = sizeof(groupclass);
++      Vgetclass(vg_id, groupclass, &sz);
++#else
+       Vgetclass(vg_id, groupclass);
++#endif
+       BaseGDL** classKW = &e->GetTheKW( 0);
+       delete(*classKW);
+       *classKW = new DStringGDL( groupclass);
+     }
+ 
+     if( e->WriteableKeywordPresent( 1)) {
++#if LIBVER_MAJOR == 4 && LIBVER_MINOR >= 4
++      size_t sz = sizeof(groupname);
++      Vgetname(vg_id, groupname, &sz);
++#else
+       Vgetname(vg_id, groupname);
++#endif
+       BaseGDL** nameKW = &e->GetTheKW( 1);
+       delete(*nameKW);
+       *nameKW = new DStringGDL( groupname);
+     }
+ 
+     if( e->WriteableKeywordPresent( 2)) {
++#if LIBVER_MAJOR == 4 && LIBVER_MINOR >= 4
++      size_t sz = sizeof(groupname);
++      Vinquire(vg_id, &nentries, groupname, &sz);
++#else
+       Vinquire(vg_id, &nentries, groupname);
++#endif
+       BaseGDL** nentriesKW = &e->GetTheKW( 2);
+       GDLDelete((*nentriesKW)); 
+       *nentriesKW = new DLongGDL( nentries);
+@@ -545,7 +561,12 @@ namespace lib {
+     DLong vg_id;
+     e->AssureScalarPar<DLongGDL>( 0, vg_id);
+ 
++#if LIBVER_MAJOR == 4 && LIBVER_MINOR >= 4
++    size_t sz = sizeof(groupname);
++    Vinquire(vg_id, &nentries, groupname, &sz);
++#else
+     Vinquire(vg_id, &nentries, groupname);
++#endif
+ 
+     dimension dim((DLong *) &nentries, (SizeT) 1);
+ 
+-- 
+2.47.3
+
diff -Nru gnudatalanguage-1.1.3/debian/patches/series gnudatalanguage-1.1.3/debian/patches/series
--- gnudatalanguage-1.1.3/debian/patches/series	2026-02-28 12:38:47.000000000 +0200
+++ gnudatalanguage-1.1.3/debian/patches/series	2026-10-17 20:13:22.000000000 +0300
@@ -5,3 +5,4 @@
 Dont-error-if-git-submodule-was-not-called.patch
 Use-external-whereami-library-instead-of-local-copy.patch
 Push-CMake-minversion-to-3.16.patch
+0001-fix-HDF4-detection-in-CMake-for-newer-versions-of-HD.patch