[gmt] 01/02: Add patch to fix FTBFS with glibc 2.23.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gmt.

commit a5933c70e82977d684e45cbc2af811f14f5743f3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jul 7 17:18:55 2016 +0200

    Add patch to fix FTBFS with glibc 2.23.
---
 debian/changelog                      |  7 +++++++
 debian/patches/glibc-2.23-ftbfs.patch | 18 ++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cfa756d..123d5b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gmt (5.2.1+dfsg-7) UNRELEASED; urgency=medium
+
+  * Add patch to fix FTBFS with glibc 2.23.
+    (closes: #818807)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 07 Jul 2016 17:18:27 +0200
+
 gmt (5.2.1+dfsg-6) unstable; urgency=medium
 
   * Add patch to use SOURCE_DATE_EPOCH instead of current date.
diff --git a/debian/patches/glibc-2.23-ftbfs.patch b/debian/patches/glibc-2.23-ftbfs.patch
new file mode 100644
index 0000000..1e219ec
--- /dev/null
+++ b/debian/patches/glibc-2.23-ftbfs.patch
@@ -0,0 +1,18 @@
+Description: Fix FTBFS with glibc 2.23.
+ Fixed bug in setting and reporting n_empty using NaN or proxy
+Author: Paul Wessel
+Origin: https://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/15261
+Bug: https://gmt.soest.hawaii.edu/issues/877
+Bug-Debian: https://bugs.debian.org/818807
+
+--- a/src/xyz2grd.c
++++ b/src/xyz2grd.c
+@@ -749,7 +749,7 @@ int GMT_xyz2grd (void *V_API, int mode,
+ 		if (GMT_is_verbose (GMT, GMT_MSG_VERBOSE)) {
+ 			char line[GMT_BUFSIZ], e_value[GMT_LEN32];
+ 			sprintf (line, "%s\n", GMT->current.setting.format_float_out);
+-			(GMT_is_dnan (GMT->common.d.active[GMT_IN])) ? sprintf (e_value, "NaN") : sprintf (e_value, GMT->current.setting.format_float_out, GMT->common.d.nan_proxy[GMT_IN]);
++			(GMT->common.d.active[GMT_IN]) ? sprintf (e_value, GMT->current.setting.format_float_out, GMT->common.d.nan_proxy[GMT_IN]) : sprintf (e_value, "NaN");
+ 			GMT_Report (API, GMT_MSG_VERBOSE, "Data records read: %" PRIu64 "  used: %" PRIu64 "  nodes filled: %" PRIu64 " nodes empty: %" PRIu64 " [set to %s]\n",
+ 				n_read, n_used, n_filled, n_empty, e_value);
+ 			if (n_bad) GMT_Report (API, GMT_MSG_VERBOSE, "%" PRIu64 " records unreadable\n", n_bad);
diff --git a/debian/patches/series b/debian/patches/series
index 0878164..0274e8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ written-typo.patch
 sparc-sighandler.patch
 spelling-errors.patch
 source_date_epoch.patch
+glibc-2.23-ftbfs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gmt.git