[proj] 01/02: Add upstream patch to fix gie test failures for missing grids.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository proj.

commit 3d39849b60c315d3d216e1d88eb73ca404a6343e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 23 21:25:33 2018 +0100

    Add upstream patch to fix gie test failures for missing grids.
---
 debian/changelog                                      |  1 +
 .../Dont-reset-errno-when-skipping-tests.patch        | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 196eaa5..3199f0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ proj (5.0.0~rc5-1) UNRELEASED; urgency=medium
   * New upstream release candidate.
   * Drop install-nad-gtx.patch, applied upstream.
   * Update copyright years for Charles Karney.
+  * Add upstream patch to fix gie test failures for missing grids.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 23 Feb 2018 20:40:32 +0100
 
diff --git a/debian/patches/Dont-reset-errno-when-skipping-tests.patch b/debian/patches/Dont-reset-errno-when-skipping-tests.patch
new file mode 100644
index 0000000..824888d
--- /dev/null
+++ b/debian/patches/Dont-reset-errno-when-skipping-tests.patch
@@ -0,0 +1,19 @@
+Description: Don't reset errno when skipping tests.
+ The error number should not be reset until a new instance of "operation
+ ..." is reached. The ignore-feature initially worked by accident since
+ pj_errno was not being reset when calling proj_errno_reset. This was
+ fixed in #808, which subsequently caused ignored tests to fail.
+Author: Kristian Evers <kristianevers at gmail.com>
+Origin: https://github.com/OSGeo/proj.4/pull/820/commits/ad4b6e12f137817217058f60c36ad51a4d29e417
+Bug: https://github.com/OSGeo/proj.4/issues/819
+
+--- a/src/gie.c
++++ b/src/gie.c
+@@ -332,7 +332,6 @@ static int another_failure (void) {
+ static int another_skip (void) {
+     T.op_skip++;
+     T.total_skip++;
+-    proj_errno_reset (T.P);
+     return 0;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0f450f6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Dont-reset-errno-when-skipping-tests.patch

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