From 516515b39eed66780b96ff936cfca3c514758c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 31 Aug 2016 15:58:11 +0200 Subject: [PATCH] Remove patch for Boost 1.60 --- slic3r-boost160.patch | 21 --------------------- slic3r.spec | 7 +------ 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 slic3r-boost160.patch diff --git a/slic3r-boost160.patch b/slic3r-boost160.patch deleted file mode 100644 index b71af38..0000000 --- a/slic3r-boost160.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 { typedef coordinate_concept type; }; -- -- template <> -- struct coordinate_traits { -- 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 { typedef point_concept type; }; diff --git a/slic3r.spec b/slic3r.spec index 160662c..d6b81a3 100644 --- a/slic3r.spec +++ b/slic3r.spec @@ -17,10 +17,6 @@ Patch2: %{name}-english-locale.patch Patch3: %{name}-linker.patch #Patch4: %{name}-clipper.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1306668 -# https://github.com/alexrj/Slic3r/issues/3117#issuecomment-187767676 -Patch5: %{name}-boost160.patch - # Patch to manually cast too bool, fix FTBFS # Will report upstream Patch6: %{name}-boolcast.patch @@ -89,7 +85,7 @@ for more information. %patch2 -p1 %patch3 -p1 #%%patch4 -p1 -%patch5 -p1 +#%%patch5 -p1 %patch6 -p1 %patch7 -p1 @@ -193,7 +189,6 @@ fi - Perl 5.24 rebuild * Tue Feb 23 2016 Miro HronĨok - 1.2.9-6 -- Add patch to fix FTBFS with Boost 1.60 (#1306668) - Add patch to manually cast too bool, fix other FTBFS * Fri Feb 05 2016 Fedora Release Engineering - 1.2.9-5