Add patch to fix build with hdf 4.3

This commit is contained in:
Orion Poplawski 2024-10-02 20:21:37 -06:00
parent dadc1ef4c8
commit cbba04693c
2 changed files with 30 additions and 1 deletions

22
ncl-hdf4.3.patch Normal file
View File

@ -0,0 +1,22 @@
diff -up ncl-6.6.2/ncarview/src/lib/libncarg_ras/hdf.c.hdf4.3 ncl-6.6.2/ncarview/src/lib/libncarg_ras/hdf.c
--- ncl-6.6.2/ncarview/src/lib/libncarg_ras/hdf.c.hdf4.3 2019-02-27 16:44:39.000000000 -0700
+++ ncl-6.6.2/ncarview/src/lib/libncarg_ras/hdf.c 2024-03-01 17:37:19.489279369 -0700
@@ -53,7 +53,6 @@
#include <ncarg/c.h>
#include <hdf.h>
#include <df.h>
-#include <dfgr.h>
#include "ncarg_ras.h"
#include "hdfP.h"
#include "options.h"
diff -up ncl-6.6.2/ni/src/ncl/FileSupport.c.hdf4.3 ncl-6.6.2/ni/src/ncl/FileSupport.c
--- ncl-6.6.2/ni/src/ncl/FileSupport.c.hdf4.3 2019-02-27 16:44:39.000000000 -0700
+++ ncl-6.6.2/ni/src/ncl/FileSupport.c 2024-03-01 18:01:16.326558868 -0700
@@ -39,7 +39,6 @@ short NCLuseAFS;
#include <netcdf.h>
#ifdef BuildHDF4
-#include <dfi.h>
#include <mfhdf.h>
#ifdef BuildHDFEOS
#include <HdfEosDef.h>

View File

@ -9,7 +9,7 @@
Name: ncl
Version: 6.6.2
Release: 44%{?dist}
Release: 45%{?dist}
Summary: NCAR Command Language and NCAR Graphics
# Automatically converted from old format: BSD - review is highly recommended.
@ -50,6 +50,9 @@ Patch5: ncl-boz.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1856959
# https://github.com/OSGeo/gdal/issues/2775
Patch6: ncl-gdal.patch
# Drop unused headers removed from hdf 4.3
# https://github.com/NCAR/ncl/pull/209
Patch7: ncl-hdf4.3.patch
# don't have the installation target depends on the build target since
# for library it implies running ranlib and modifying the library timestamp
Patch10: ncl-5.0.0-no_install_dep.patch
@ -138,6 +141,7 @@ Example programs and data using NCL.
%patch -P4 -p1 -b .format
%patch -P5 -p1 -b .boz
%patch -P6 -p1 -b .gdal
%patch -P7 -p1 -b .hdf
%patch -P10 -p1 -b .no_install_dep
%patch -P11 -p1 -b .build_n_scripts
%patch -P12 -p1 -b .netcdff
@ -362,6 +366,9 @@ done
%changelog
* Wed Oct 02 2024 Orion Poplawski <orion@nwra.com> - 6.6.2-45
- Add patch to fix build with hdf 4.3
* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 6.6.2-44
- convert license to SPDX