01/04: gnu: netcdf: Upgrade to 4.4.1.1.

[Eric Bavier]

bavier pushed a commit to branch master
in repository guix.

commit a4b0bfb1952a33b04cf2f2282633e7b342c16fb8
Author: Eric Bavier <address@hidden>
Date:   Wed Nov 30 21:26:01 2016 -0600

    gnu: netcdf: Upgrade to 4.4.1.1.
    
    * gnu/packages/maths.scm (netcdf, netcdf-parallel-openmpi): Upgrade to
    4.4.1.1.
    [source]: Adjust patch name, add netcdf-tst_h_par.patch
    * gnu/packages/patches/netcdf-config.date.patch: Rename to...
    * gnu/packages/patches/netcdf-date-time.patch: ...this.  Adjust for
    latest source.
    * gnu/packages/patches/netcdf-tst_h_par.patch: New patch.
    * gnu/local.mk (dist_patch_DATA): Adjust patches.
---
 gnu/local.mk                                  |    3 +-
 gnu/packages/maths.scm                        |    7 ++--
 gnu/packages/patches/netcdf-config-date.patch |   47 -------------------------
 gnu/packages/patches/netcdf-date-time.patch   |   11 ++++++
 gnu/packages/patches/netcdf-tst_h_par.patch   |   21 +++++++++++
 5 files changed, 38 insertions(+), 51 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 0d019f7..6f128ed 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -745,7 +745,8 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/musl-CVE-2016-8859.patch                        \
   %D%/packages/patches/mutt-store-references.patch             \
   %D%/packages/patches/net-tools-bitrot.patch                  \
-  %D%/packages/patches/netcdf-config-date.patch                        \
+  %D%/packages/patches/netcdf-date-time.patch                  \
+  %D%/packages/patches/netcdf-tst_h_par.patch                  \
   %D%/packages/patches/netsurf-about.patch                     \
   %D%/packages/patches/ngircd-handle-zombies.patch             \
   %D%/packages/patches/ngircd-no-dns-in-tests.patch            \
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 0ee5735..fc98eae 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -714,7 +714,7 @@ HDF5 file is encoded according to the HDF File Format 
Specification.")
 (define-public netcdf
   (package
     (name "netcdf")
-    (version "4.4.0")
+    (version "4.4.1.1")
     (source
      (origin
        (method url-fetch)
@@ -722,8 +722,9 @@ HDF5 file is encoded according to the HDF File Format 
Specification.")
                            "netcdf-" version ".tar.gz"))
        (sha256
         (base32
-         "0y6gdcplarwqqnrav2xg1xd6ih732rzzbmdw78v3rl5b8mwcnh0d"))
-       (patches (list (search-patch "netcdf-config-date.patch")))))
+         "1blc7ik5yin7i0ls2kag0a9xjk12m0dzx6v1x88az3ras3scci2d"))
+       (patches (search-patches "netcdf-date-time.patch"
+                                "netcdf-tst_h_par.patch"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("m4" ,m4)
diff --git a/gnu/packages/patches/netcdf-config-date.patch 
b/gnu/packages/patches/netcdf-config-date.patch
deleted file mode 100644
index 5054612..0000000
--- a/gnu/packages/patches/netcdf-config-date.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Honor SOURCE_DATE_EPOCH when exporting configuration date.
-Autoconf-level patch submitted upstream on Fri Apr 15 23:07:42 UTC 2016
-
---- a/configure
-+++ b/configure
-@@ -2866,7 +2866,17 @@
- 
- 
- # Configuration Date
-- CONFIG_DATE="`date`"
-+ CONFIG_DATE="`date -u`"
-+if test -n "$SOURCE_DATE_EPOCH"; then
-+  CONFIG_DATE=`date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null \
-+               || date -u -r "$SOURCE_DATE_EPOCH" 2>/dev/null`
-+  if test -z "$CONFIG_DATE"; then
-+    as_fn_error $? "malformed SOURCE_DATE_EPOCH" "$LINENO" 5
-+  fi
-+fi
-+cat >>confdefs.h <<_ACEOF
-+#define CONFIG_DATE "$CONFIG_DATE"
-+_ACEOF
- 
- # Find out about the host we're building on.
- ac_aux_dir=
---- a/libdispatch/derror.c
-+++ b/libdispatch/derror.c
-@@ -13,7 +13,7 @@
- #endif
- 
- /* Tell the user the version of netCDF. */
--static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" 
$";
-+static const char nc_libvers[] = PACKAGE_VERSION " of "CONFIG_DATE" $";
- 
- /**
- \defgroup lib_version Library Version
---- a/config.h.in
-+++ b/config.h.in
-@@ -393,6 +393,9 @@
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
- 
-+/* Define to the configuration date */
-+#undef CONFIG_DATE
-+
- /* The size of `double', as computed by sizeof. */
- #undef SIZEOF_DOUBLE
- 
diff --git a/gnu/packages/patches/netcdf-date-time.patch 
b/gnu/packages/patches/netcdf-date-time.patch
new file mode 100644
index 0000000..a4e7925
--- /dev/null
+++ b/gnu/packages/patches/netcdf-date-time.patch
@@ -0,0 +1,11 @@
+--- a/libdispatch/derror.c
++++ b/libdispatch/derror.c
+@@ -13,7 +13,7 @@
+ #endif
+ 
+ /* Tell the user the version of netCDF. */
+-static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" 
$";
++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
new file mode 100644
index 0000000..ac14a4c
--- /dev/null
+++ b/gnu/packages/patches/netcdf-tst_h_par.patch
@@ -0,0 +1,21 @@
+From a83702834938b23cc2e843589aa223e2024a7e6f Mon Sep 17 00:00:00 2001
+From: Orion Poplawski <address@hidden>
+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