[repsnapper] New alpha release, clipper 6.2.0, remove old patches

[Miro Hrončok]

commit 7bf2d707ff4b44fa6a03845bb915d1b18b2a43d4
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Wed Oct 22 11:17:04 2014 +0200

    New alpha release, clipper 6.2.0, remove old patches

 .gitignore                   |    1 +
 repsnapper-clipper613a.patch |  146 ---------------
 repsnapper-clipper620.patch  |   25 +++
 repsnapper-lmfit50.patch     |   19 --
 repsnapper-old-clipper.patch |  399 ------------------------------------------
 repsnapper.spec              |   12 +-
 sources                      |    2 +-
 7 files changed, 35 insertions(+), 569 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3d49d64..92e7a0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /repsnapper-2.2.0-f6f3df0.tar.gz
 /repsnapper-2.3.1-e41fb0b.tar.gz
 /2.3.2a4.tar.gz
+/2.3.2a5.tar.gz
diff --git a/repsnapper-clipper620.patch b/repsnapper-clipper620.patch
new file mode 100644
index 0000000..17e3036
--- /dev/null
+++ b/repsnapper-clipper620.patch
@@ -0,0 +1,25 @@
+From eb3b327c3f8295b363ebcb517496f76b58ae8c36 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
+Date: Wed, 22 Oct 2014 11:08:06 +0200
+Subject: [PATCH] Replace deprecated OffsetPaths function with ClipperOffset
+ class
+
+---
+ src/slicer/clipping.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/slicer/clipping.cpp b/src/slicer/clipping.cpp
+index 4c68b79..0b2484a 100644
+--- a/src/slicer/clipping.cpp
++++ b/src/slicer/clipping.cpp
+@@ -408,7 +408,9 @@ vector<Poly> Clipping::getShrinkedCapped(const vector<Poly> &polys, double dista
+   CL::Paths opolys;
+   if (reverse)
+     CL::ReversePaths(opolys);
+-  CL::OffsetPaths(cpolys, opolys, cldist, cljtype, CL::etClosed, miter_limit);
++  CL::ClipperOffset co;
++  co.AddPaths(cpolys, cljtype, CL::etClosedPolygon);
++  co.Execute(opolys, miter_limit);
+   CL::SimplifyPolygons(opolys);//, CL::pftNonZero);
+   return opolys;
+ }
diff --git a/repsnapper.spec b/repsnapper.spec
index f919940..8f2648e 100644
--- a/repsnapper.spec
+++ b/repsnapper.spec
@@ -1,7 +1,7 @@
 Name:           repsnapper
 Version:        2.3.2
-%global         atag a4
-Release:        0.3.%{atag}%{?dist}
+%global         atag a5
+Release:        0.4.%{atag}%{?dist}
 Summary:        RepRap control software
 
 # repsnapper is GPLv2 as noted in licensing.txt
@@ -21,7 +21,7 @@ URL:            https://github.com/timschmidt/%{name}
 Source0:        https://github.com/timschmidt/%{name}/archive/%{version}%{atag}.tar.gz
 Source1:        %{name}-softsurfer-copyright-email.txt
 Patch0:         %{name}-use-system-libs.patch
-Patch1:         %{name}-clipper613a.patch
+Patch1:         %{name}-clipper620.patch
 BuildRequires:  amftools-devel
 BuildRequires:  cairomm-devel
 BuildRequires:  desktop-file-utils
@@ -38,7 +38,7 @@ BuildRequires:  libxml++-devel
 BuildRequires:  libzip-devel
 BuildRequires:  lmfit-devel
 BuildRequires:  muParser-devel
-BuildRequires:  polyclipping-devel >= 5.1
+BuildRequires:  polyclipping-devel >= 6.1.0
 BuildRequires:  poly2tri-devel
 BuildRequires:  rapidxml-devel
 BuildRequires:  vmmlib-devel
@@ -97,6 +97,10 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %changelog
+* Wed Oct 22 2014 Miro Hrončok <mhroncok at redhat.com> - 2.3.2-0.4.a5
+- New alpha release
+- Patch to support clipper/polyclipping 6.2.0
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-0.3.a4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 157efc0..cdecb2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-27e37f6d0df7a05ee822483d33f7e289  2.3.2a4.tar.gz
+acffc5fc84a34bf0814d6084c3d3a2e7  2.3.2a5.tar.gz