[Git][debian-gis-team/sfcgal][master] 2 commits: Add patch by Pierre-Eric Pelloux-Prayer to fix FTBFS with CGAL 4.11. (closes: #876521)

[Sebastiaan Couwenberg]

Sebastiaan Couwenberg pushed to branch master at Debian GIS Project / sfcgal


Commits:
10238cf8 by Bas Couwenberg at 2017-11-13T16:57:43+01:00
Add patch by Pierre-Eric Pelloux-Prayer to fix FTBFS with CGAL 4.11. (closes: #876521)

- - - - -
33060f1f by Bas Couwenberg at 2018-01-21T10:50:26+01:00
Update copyright-format URL to use HTTPS.

- - - - -


4 changed files:

- debian/changelog
- debian/copyright
- + debian/patches/no-matching-function-call.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ 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)
+  * Update copyright-format URL to use HTTPS.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 15 Sep 2017 20:49:16 +0200
 


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: SFCGAL
 Upstream-Contact: infos at oslandia.com
 Source: http://www.sfcgal.org/


=====================================
debian/patches/no-matching-function-call.patch
=====================================
--- /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


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no-matching-function-call.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/compare/8691e8e8d4c0f46b1852dbb09f81d57740f537b3...33060f1fe055c566d1268a45951b4521b05bbd07

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/compare/8691e8e8d4c0f46b1852dbb09f81d57740f537b3...33060f1fe055c566d1268a45951b4521b05bbd07
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180121/27820b21/attachment-0001.html>