[sfcgal] 01/02: Add patch by Pierre-Eric Pelloux-Prayer to fix FTBFS with CGAL 4.11. (closes: #876521)

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository sfcgal.

commit 10238cf801d0ba6cdc75f29415c8252c46479542
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Nov 13 16:57:43 2017 +0100

    Add patch by Pierre-Eric Pelloux-Prayer to fix FTBFS with CGAL 4.11. (closes: #876521)
---
 debian/changelog                               |  2 ++
 debian/patches/no-matching-function-call.patch | 48 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 86faa99..d78c502 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ sfcgal (1.3.2-1) UNRELEASED; urgency=medium
   * Require at least libcgal-dev 4.10.1.
   * Change priority from extra to optional.
   * Bump Standards-Version to 4.1.0, changes: priority.
+  * Add patch by Pierre-Eric Pelloux-Prayer to fix FTBFS with CGAL 4.11.
+    (closes: #876521)
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 15 Sep 2017 20:49:16 +0200
 
diff --git a/debian/patches/no-matching-function-call.patch b/debian/patches/no-matching-function-call.patch
new file mode 100644
index 0000000..22bf71d
--- /dev/null
+++ b/debian/patches/no-matching-function-call.patch
@@ -0,0 +1,48 @@
+Description: Fix FTBFS with CGAL 4.11.
+Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at oslandia.com>
+Bug-Debian: https://bugs.debian.org/876521
+Bug: https://github.com/Oslandia/SFCGAL/issues/145
+
+--- a/src/Coordinate.cpp
++++ b/src/Coordinate.cpp
+@@ -266,10 +266,17 @@ private:
+ 
+ 
+     Kernel::FT _roundFT( const Kernel::FT& v ) const {
++        #ifdef CGAL_USE_GMPXX
++        return Kernel::FT( ::mpq_class(
++                               SFCGAL::round( v.exact() * _scaleFactor ),
++                               _scaleFactor
++                           ) ) ;
++        #else
+         return Kernel::FT( CGAL::Gmpq(
+                                SFCGAL::round( v.exact() * _scaleFactor ),
+                                _scaleFactor
+                            ) ) ;
++        #endif
+     }
+ 
+ };
+--- a/src/numeric.h
++++ b/src/numeric.h
+@@ -57,6 +57,20 @@ inline double round( const double& v )
+     }
+ }
+ 
++#ifdef CGAL_USE_GMPXX
++/**
++ * @brief floor a rational to an integer
++ */
++SFCGAL_API ::mpz_class floor( const ::mpq_class& v ) ;
++/**
++ * @brief ceil a rational to an integer
++ */
++SFCGAL_API ::mpz_class ceil( const ::mpq_class& v ) ;
++/**
++ * @brief round a rational to an integer
++ */
++SFCGAL_API ::mpz_class round( const ::mpq_class& v ) ;
++#endif
+ 
+ /**
+  * @brief floor a rational to an integer
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bf10af7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no-matching-function-call.patch

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