[sfcgal] 01/04: Add patch by Dimitri John Ledkov to fix FTBFS on i386. (LP: #1610076)
Bas Couwenberg
sebastic at debian.org
Sun Aug 7 13:08:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository sfcgal.
commit df86ab40a634dff539df88f5a93cc28d36ad0376
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Aug 7 13:30:55 2016 +0200
Add patch by Dimitri John Ledkov to fix FTBFS on i386. (LP: #1610076)
---
debian/changelog | 7 +++++++
debian/patches/i386-ftbfs.patch | 16 ++++++++++++++++
debian/patches/series | 1 +
3 files changed, 24 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 393bc26..5a5171a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sfcgal (1.3.0-3) UNRELEASED; urgency=medium
+
+ * Add patch by Dimitri John Ledkov to fix FTBFS on i386.
+ (LP: #1610076)
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 07 Aug 2016 13:02:17 +0200
+
sfcgal (1.3.0-2) unstable; urgency=medium
* Fix hardening flags via DEB_BUILD_MAINT_OPTIONS.
diff --git a/debian/patches/i386-ftbfs.patch b/debian/patches/i386-ftbfs.patch
new file mode 100644
index 0000000..6dba398
--- /dev/null
+++ b/debian/patches/i386-ftbfs.patch
@@ -0,0 +1,16 @@
+Description: Fix build failure on i386.
+Author: Dimitri John Ledkov <xnox at debian.org>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sfcgal/+bug/1610076
+Forwarded: https://github.com/Oslandia/SFCGAL/pull/131
+
+--- a/src/algorithm/connection.h
++++ b/src/algorithm/connection.h
+@@ -44,7 +44,7 @@ public:
+ typedef size_t VertexIndex;
+ typedef size_t FaceIndex;
+ typedef std::map< Coordinate, VertexIndex > CoordinateMap ;
+- static const size_t INVALID_INDEX = size_t( -1 ) ; // would use std::numeric_limits< size_t >::max() if it were constant, or SIZE_MAX if it were easier to find.
++ enum integrals { INVALID_INDEX = size_t( -1 ) } ;
+ // an edge is inserted with vtx ordered by the first polygon we treat,
+ // we search the edge with reverse ordered vtx indexes.
+ // as a result, an inconsistent orientation between polygons can be spotted by
diff --git a/debian/patches/series b/debian/patches/series
index 11f2e7b..ead35f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
openscenegraph.patch
+i386-ftbfs.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.git
More information about the Pkg-grass-devel
mailing list