diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-10-25 10:20:55 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-10-26 15:57:27 +0000 |
| commit | a9291a28b233dba20a523da679bb446643abf977 (patch) | |
| tree | c09285e27d7eca3af033987710a82b160cbca260 /gnu/packages/patches | |
| parent | 24b233d45c2a04a7a011397234b29fd5d7133110 (diff) | |
gnu: netcdf: Update to 4.7.4.
This will fix an issue building qgis.
* gnu/packages/maths.scm (netcdf): Update to 4.7.4.
[source]: Remove the netcdf-tst_h_par.patch, also change the naming of the
source tarball, as the name seems to have changed for recent releases.
[inputs]: Update hdf5 and add curl.
* gnu/packages/patches/netcdf-tst_h_par.patch: Delete.
* gnu/local.mk (dist_patch_DATA): Remove deleted patch.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/netcdf-date-time.patch | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/netcdf-tst_h_par.patch | 21 |
2 files changed, 3 insertions, 24 deletions
diff --git a/gnu/packages/patches/netcdf-date-time.patch b/gnu/packages/patches/netcdf-date-time.patch index a4e7925aa1..0bdfc55299 100644 --- a/gnu/packages/patches/netcdf-date-time.patch +++ b/gnu/packages/patches/netcdf-date-time.patch @@ -3,9 +3,9 @@ @@ -13,7 +13,7 @@ #endif - /* Tell the user the version of netCDF. */ + /** @internal The version string for the library, used by + * nc_inq_libvers(). */ -static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" $"; -+static const char nc_libvers[] = PACKAGE_VERSION" $"; ++static const char nc_libvers[] = PACKAGE_VERSION " $"; /** - \defgroup lib_version Library Version diff --git a/gnu/packages/patches/netcdf-tst_h_par.patch b/gnu/packages/patches/netcdf-tst_h_par.patch deleted file mode 100644 index ac14a4c0a2..0000000000 --- a/gnu/packages/patches/netcdf-tst_h_par.patch +++ /dev/null @@ -1,21 +0,0 @@ -From a83702834938b23cc2e843589aa223e2024a7e6f Mon Sep 17 00:00:00 2001 -From: Orion Poplawski <orion@cora.nwra.com> -Date: Tue, 29 Nov 2016 11:48:01 -0700 -Subject: [PATCH] Add missing #include "err_macros.h" to tst_h_par.c - ---- - h5_test/tst_h_par.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/h5_test/tst_h_par.c b/h5_test/tst_h_par.c -index c3da7f4..a419d55 100644 ---- a/h5_test/tst_h_par.c -+++ b/h5_test/tst_h_par.c -@@ -11,6 +11,7 @@ - $Id: tst_h_par.c,v 1.15 2010/05/25 13:53:04 ed Exp $ - */ - #include <nc_tests.h> -+#include "err_macros.h" - #include <hdf5.h> - - /* Defining USE_MPE causes the MPE trace library to be used (and you |