[packages/slic3r] - fix building with boost 1.60+ - rel 4

[baggins]

commit 9308dc06e69f4a4f9c6ffd801f366c63eb76ac22
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Oct 31 09:24:14 2016 +0100

    - fix building with boost 1.60+
    - rel 4

 boost-1.60.patch | 21 +++++++++++++++++++++
 slic3r.spec      |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/slic3r.spec b/slic3r.spec
index 5cea1f7..2f817e1 100644
--- a/slic3r.spec
+++ b/slic3r.spec
@@ -18,7 +18,7 @@ Summary:	G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
 Summary(pl.UTF-8):	Generator G-code dla drukarek 3D (RepRap, Makerbot, Ultimaker itp.)
 Name:		slic3r
 Version:	1.2.9
-Release:	3
+Release:	4
 License:	AGPL v3 (code), CC-BY (images)
 Group:		Applications/Engineering
 Source0:	https://github.com/alexrj/Slic3r/archive/%{version}.tar.gz
@@ -34,6 +34,7 @@ Patch1:		%{name}-nowarn-datadir.patch
 Patch2:		%{name}-english-locale.patch
 Patch3:		%{name}-linker.patch
 Patch4:		%{name}-clipper.patch
+Patch5:		boost-1.60.patch
 URL:		http://slic3r.org/
 BuildRequires:	ImageMagick
 BuildRequires:	boost-devel
@@ -90,6 +91,7 @@ Slic3r.
 %patch2 -p1
 %patch3 -p1
 %{?with_system_polyclipping:%patch4 -p1}
+%patch5 -p1
 
 # Remove bundled admesh, clipper, poly2tri and boost
 %{?with_system_admesh:%{__rm} -r xs/src/admesh}
diff --git a/boost-1.60.patch b/boost-1.60.patch
new file mode 100644
index 0000000..b71af38
--- /dev/null
+++ b/boost-1.60.patch
@@ -0,0 +1,21 @@
+diff --git a/xs/src/libslic3r/Point.hpp b/xs/src/libslic3r/Point.hpp
+index f9850c7..9a52f3f 100644
+--- a/xs/src/libslic3r/Point.hpp
++++ b/xs/src/libslic3r/Point.hpp
+@@ -128,16 +128,6 @@ class Pointf3 : public Pointf
+ namespace boost { namespace polygon {
+     template <>
+     struct geometry_concept<coord_t> { typedef coordinate_concept type; };
+-    
+-    template <>
+-    struct coordinate_traits<coord_t> {
+-        typedef coord_t coordinate_type;
+-        typedef long double area_type;
+-        typedef long long manhattan_area_type;
+-        typedef unsigned long long unsigned_area_type;
+-        typedef long long coordinate_difference;
+-        typedef long double coordinate_distance;
+-    };
+ 
+     template <>
+     struct geometry_concept<Point> { typedef point_concept type; };
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/slic3r.git/commitdiff/9308dc06e69f4a4f9c6ffd801f366c63eb76ac22