[slic3r/polyclipping620] Unbundle polyclipping 6.2.0

[Miro Hrončok]

commit 3dbabccca74dd7e5d6f0f9b90507cf5cc337917c
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Mon Oct 20 21:00:50 2014 +0200

    Unbundle polyclipping 6.2.0

 slic3r-clipper.patch |   14 +-------------
 slic3r-linker.patch  |    5 +++--
 slic3r.spec          |   25 +++++++------------------
 3 files changed, 11 insertions(+), 33 deletions(-)
---
diff --git a/slic3r-clipper.patch b/slic3r-clipper.patch
index e2e98da..16bb790 100644
--- a/slic3r-clipper.patch
+++ b/slic3r-clipper.patch
@@ -1,15 +1,3 @@
-diff --git a/xs/Build.PL b/xs/Build.PL
-index 5a10ac0..fb0f6a6 100644
---- a/xs/Build.PL
-+++ b/xs/Build.PL
-@@ -41,6 +41,7 @@ my $build = Module::Build::WithXSpp->new(
-         Module::Build::WithXSpp     0.13
-     )},
-     extra_compiler_flags => \@cflags,
-+    extra_linker_flags => [qw(-lpolyclipping)],
-     
-     # Provides extra C typemaps that are auto-merged
-     extra_typemap_modules => {
 diff --git a/xs/src/ClipperUtils.hpp b/xs/src/ClipperUtils.hpp
 index 2ab3ff7..2058f82 100644
 --- a/xs/src/ClipperUtils.hpp
@@ -24,7 +12,7 @@ index 2ab3ff7..2058f82 100644
  #include "Polygon.hpp"
  #include "Surface.hpp"
 diff --git a/xs/src/Geometry.cpp b/xs/src/Geometry.cpp
-index 0295d54..a8cae39 100644
+index 8e08336..606a8e7 100644
 --- a/xs/src/Geometry.cpp
 +++ b/xs/src/Geometry.cpp
 @@ -1,7 +1,7 @@
diff --git a/slic3r-linker.patch b/slic3r-linker.patch
index 99c62de..9af21ef 100644
--- a/slic3r-linker.patch
+++ b/slic3r-linker.patch
@@ -1,14 +1,15 @@
 diff --git a/xs/Build.PL b/xs/Build.PL
-index 5a10ac0..e21df5e 100644
+index 5a10ac0..18d0611 100644
 --- a/xs/Build.PL
 +++ b/xs/Build.PL
-@@ -41,6 +41,10 @@ my $build = Module::Build::WithXSpp->new(
+@@ -41,6 +41,11 @@ my $build = Module::Build::WithXSpp->new(
          Module::Build::WithXSpp     0.13
      )},
      extra_compiler_flags => \@cflags,
 +    extra_linker_flags => [qw(
 +        -ladmesh
 +        -lpoly2tri
++        -lpolyclipping
 +    )],
      
      # Provides extra C typemaps that are auto-merged
diff --git a/slic3r.spec b/slic3r.spec
index 7b71201..6f99957 100644
--- a/slic3r.spec
+++ b/slic3r.spec
@@ -1,6 +1,6 @@
 Name:           slic3r
 Version:        1.1.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
 License:        AGPLv3 and CC-BY
 # Images are CC-BY, code is AGPLv3
@@ -8,9 +8,6 @@ Group:          Applications/Engineering
 URL:            http://slic3r.org/
 Source0:        https://github.com/alexrj/Slic3r/archive/%{version}.tar.gz
 
-# This is waiting for the new release of clipper
-%global         with_clipper 0
-
 # Modify Build.PL so we are able to build this on Fedora
 Patch0:         %{name}-buildpl.patch
 
@@ -22,11 +19,7 @@ Patch2:         %{name}-english-locale.patch
 Patch3:         %{name}-linker.patch
 Patch4:         %{name}-clear-error.patch
 Patch5:         %{name}-test-out-of-memory.patch
-
-%if %with_clipper
-# Unbundle clipper
 Patch6:         %{name}-clipper.patch
-%endif
 
 Source1:        %{name}.desktop
 Source2:        %{name}.appdata.xml
@@ -60,14 +53,11 @@ BuildRequires:  perl(Wx)
 BuildRequires:  perl(XML::SAX)
 BuildRequires:  perl(XML::SAX::ExpatXS)
 
-%if %with_clipper
-BuildRequires:  polyclipping-devel
-%endif
-
 BuildRequires:  admesh-devel >= 0.98.1
 BuildRequires:  boost-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  poly2tri-devel
+BuildRequires:  polyclipping-devel >= 6.2.0
 BuildRequires:  ImageMagick
 
 Requires:       perl(XML::SAX)
@@ -89,15 +79,11 @@ for more information.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-
-%if %with_clipper
 %patch6 -p1
-# Remove bundled clipper
-rm xs/src/clipper.*pp
-%endif
 
-# Remove bundled admesh, poly2tri and boost
+# Remove bundled admesh, clipper, poly2tri and boost
 rm -rf xs/src/admesh
+rm xs/src/clipper.*pp
 rm -rf xs/src/poly2tri
 rm -rf xs/src/boost
 
@@ -188,6 +174,9 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Mon Oct 20 2014 Miro Hrončok <mhroncok at redhat.com> - 1.1.7-2
+- Unbundle polyclipping 6.2.0
+
 * Tue Sep 23 2014 Miro Hrončok <mhroncok at redhat.com> - 1.1.7-1
 - Update to 1.1.7
 - Add patch from Debian to fix debian#757798