[grass] 01/04: Add patch to only link to GEOS C library.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository grass.

commit 6c48806c4d6f77daf5e5544fb8784cd0387ff8a5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 6 11:17:09 2017 +0200

    Add patch to only link to GEOS C library.
---
 debian/changelog            |  6 ++++++
 debian/patches/geos-c.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c8e49a6..9e853a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grass (7.2.2-2) UNRELEASED; urgency=medium
+
+  * Add patch to only link to GEOS C library.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 06 Oct 2017 11:16:50 +0200
+
 grass (7.2.2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/geos-c.patch b/debian/patches/geos-c.patch
new file mode 100644
index 0000000..502919e
--- /dev/null
+++ b/debian/patches/geos-c.patch
@@ -0,0 +1,26 @@
+Description: Get geos_c library from geos-config.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://trac.osgeo.org/grass/ticket/3421
+
+--- a/configure.in
++++ b/configure.in
+@@ -1002,7 +1002,7 @@ else
+   fi
+   
+   if test "$GEOS_CONFIG" != "" ; then
+-    GEOS_LIBS=`"$GEOS_CONFIG" --libs`
++    GEOS_LIBS=`"$GEOS_CONFIG" --clibs`
+     GEOS_CFLAGS=`"$GEOS_CONFIG" --cflags`
+     USE_GEOS=1
+   fi
+--- a/configure
++++ b/configure
+@@ -6827,7 +6827,7 @@ fi
+   fi
+   
+   if test "$GEOS_CONFIG" != "" ; then
+-    GEOS_LIBS=`"$GEOS_CONFIG" --libs`
++    GEOS_LIBS=`"$GEOS_CONFIG" --clibs`
+     GEOS_CFLAGS=`"$GEOS_CONFIG" --cflags`
+     USE_GEOS=1
+   fi
diff --git a/debian/patches/series b/debian/patches/series
index 74dbebd..390af5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ no-fail-html.patch
 appstream.patch
 jquery.patch
 spelling-errors.patch
+geos-c.patch

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