[sfcgal] 01/04: Drop i386-ftbfs.patch, did not fix FTBFS on i386.

[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 365ebcb7baa6d27e04e1acbc6c8497d8a49e94bf
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Aug 7 16:00:35 2016 +0200

    Drop i386-ftbfs.patch, did not fix FTBFS on i386.
    
    This reverts commit df86ab40a634dff539df88f5a93cc28d36ad0376.
---
 debian/changelog                |  6 ++++++
 debian/patches/i386-ftbfs.patch | 16 ----------------
 debian/patches/series           |  1 -
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 96f119a..ae4a351 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sfcgal (1.3.0-4) UNRELEASED; urgency=medium
+
+  * Drop i386-ftbfs.patch, did not fix FTBFS on i386.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 07 Aug 2016 15:59:47 +0200
+
 sfcgal (1.3.0-3) unstable; urgency=medium
 
   * Add patch by Dimitri John Ledkov to fix FTBFS on i386.
diff --git a/debian/patches/i386-ftbfs.patch b/debian/patches/i386-ftbfs.patch
deleted file mode 100644
index 6dba398..0000000
--- a/debian/patches/i386-ftbfs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 ead35f9..11f2e7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 openscenegraph.patch
-i386-ftbfs.patch

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