[gpx2shp] 01/01: Add patch to fix FTBFS with proj 4.9.3.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository gpx2shp.

commit f3e4ff3d296dc9499d74859b0a52446ae7efaa6c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Aug 17 17:56:44 2016 +0200

    Add patch to fix FTBFS with proj 4.9.3.
---
 debian/changelog                |  7 +++++++
 debian/patches/proj-4.9.3.patch | 30 ++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f5d3bea..9238d4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gpx2shp (0.71.0-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add patch to fix FTBFS with proj 4.9.3.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 17 Aug 2016 17:56:26 +0200
+
 gpx2shp (0.71.0-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/proj-4.9.3.patch b/debian/patches/proj-4.9.3.patch
new file mode 100644
index 0000000..32764ad
--- /dev/null
+++ b/debian/patches/proj-4.9.3.patch
@@ -0,0 +1,30 @@
+Description: Add support for proj 4.9.3 which renamed PI constants.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/src/geod_for.c
++++ b/src/geod_for.c
+@@ -4,6 +4,12 @@ static const char SCCSID[] = "@(#)geod_f
+ # include "projects.h"
+ # include "geodesic.h"
+ # define MERI_TOL 1e-9
++#if !defined(HALFPI) && defined(M_HALFPI)
++#define HALFPI M_HALFPI
++#endif
++#if !defined(PI) && defined(M_PI)
++#define PI M_PI
++#endif
+ static double th1, costh1, sinth1, sina12, cosa12, M, N, c1, c2, D, P, s1;
+ static int merid, signS;
+ void geod_pre(void) {
+--- a/src/geod_inv.c
++++ b/src/geod_inv.c
+@@ -4,6 +4,9 @@ static const char SCCSID[] = "@(#)geod_i
+ # include "projects.h"
+ # include "geodesic.h"
+ # define DTOL	1e-12
++#if !defined(TWOPI) && defined(M_TWOPI)
++#define TWOPI M_TWOPI
++#endif
+ void geod_inv(void) {
+ 	double th1, th2, thm, dthm, dlamm, dlam, sindlamm, costhm, sinthm, cosdthm,
+ 			sindthm, L, E, cosd, d, X, Y, T, sind, tandlammp, u, v, D, A, B;
diff --git a/debian/patches/series b/debian/patches/series
index 4f28967..6153467 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 extension-typo.patch
 sourceforge-to-osdn.patch
+proj-4.9.3.patch

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