Compare commits

...

2 Commits
rawhide ... f23

Author SHA1 Message Date
Miro Hrončok 32eefd5bed Add bundled provide 2016-09-18 12:31:44 +02:00
Miro Hrončok 516515b39e Remove patch for Boost 1.60 2016-08-31 15:58:11 +02:00
2 changed files with 3 additions and 27 deletions

View File

@ -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<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; };

View File

@ -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
@ -74,6 +70,8 @@ BuildRequires: ImageMagick
Requires: perl(XML::SAX)
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: admesh-libs >= 0.98.1
Provides: bundled(polyclipping) = 6.2.9
%description
Slic3r is a G-code generator for 3D printers. It's compatible with RepRaps,
@ -89,7 +87,7 @@ for more information.
%patch2 -p1
%patch3 -p1
#%%patch4 -p1
%patch5 -p1
#%%patch5 -p1
%patch6 -p1
%patch7 -p1
@ -193,7 +191,6 @@ fi
- Perl 5.24 rebuild
* Tue Feb 23 2016 Miro Hrončok <mhroncok@redhat.com> - 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 <releng@fedoraproject.org> - 1.2.9-5