[packages/slic3r] - actually we want the other poly2tri

[arekm]

commit 29d09fc9284ca946091f1fd7b5e051d1392b4a61
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Jul 5 13:35:34 2015 +0200

    - actually we want the other poly2tri

 slic3r-linker.patch     |  4 ++--
 slic3r-poly2tri-c.patch | 12 ------------
 slic3r.spec             |  6 ++----
 3 files changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/slic3r.spec b/slic3r.spec
index 40e23ae..2fcfe4a 100644
--- a/slic3r.spec
+++ b/slic3r.spec
@@ -6,7 +6,7 @@
 # to turn on system libs is to make sure test suite works
 # with them, too.
 %bcond_without	system_admesh
-%bcond_with	system_poly2tri
+%bcond_without	system_poly2tri
 %bcond_with	system_polyclipping
 #
 %define		admesh_ver		0.98.1
@@ -34,7 +34,6 @@ Patch1:		%{name}-nowarn-datadir.patch
 Patch2:		%{name}-english-locale.patch
 Patch3:		%{name}-linker.patch
 Patch4:		%{name}-clipper.patch
-Patch5:		%{name}-poly2tri-c.patch
 URL:		http://slic3r.org/
 BuildRequires:	ImageMagick
 BuildRequires:	boost-devel
@@ -60,7 +59,7 @@ BuildRequires:	perl-XML-SAX-ExpatXS
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	perl-modules
 BuildRequires:	perl-threads >= %{perl_threads_ver}
-%{?with_system_poly2tri:BuildRequires:	poly2tri-c-devel}
+%{?with_system_poly2tri:BuildRequires:	poly2tri-devel}
 %{?with_system_polyclipping:BuildRequires:	polyclipping-devel >= 6.2.9}
 BuildRequires:	rpm-perlprov >= 4.1-13
 %if %{with system_admesh}
@@ -91,7 +90,6 @@ Slic3r.
 %patch2 -p1
 %patch3 -p1
 %{?with_system_polyclipping:%patch4 -p1}
-%{?with_system_poly2tri:%patch5 -p1}
 
 # Remove bundled admesh, clipper, poly2tri and boost
 %{?with_system_admesh:%{__rm} -r xs/src/admesh}
diff --git a/slic3r-linker.patch b/slic3r-linker.patch
index 4ca6306..706c310 100644
--- a/slic3r-linker.patch
+++ b/slic3r-linker.patch
@@ -13,8 +13,8 @@ diff -urN Slic3r-1.2.9.org/xs/Build.PL Slic3r-1.2.9/xs/Build.PL
 +    push @libs, qw(-polyclipping);
 +}
 +if ($ENV{SYSTEM_POLY2TRI}) {
-+    push @cflags, `pkg-config --cflags poly2tri-c`;
-+    push @libs, `pkg-config --libs poly2tri-c`;
++    push @cflags, qw(-I/usr/include/poly2tri);
++    push @libs, qw(-lpoly2tri);
 +}
 +
  if (ExtUtils::CppGuess->new->is_gcc) {
diff --git a/slic3r-poly2tri-c.patch b/slic3r-poly2tri-c.patch
deleted file mode 100644
index 7d067e9..0000000
--- a/slic3r-poly2tri-c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Slic3r-1.2.7/xs/src/libslic3r/ExPolygon.cpp~	2015-05-24 17:39:27.000000000 +0200
-+++ Slic3r-1.2.7/xs/src/libslic3r/ExPolygon.cpp	2015-06-09 23:27:31.805045989 +0200
-@@ -5,7 +5,7 @@
- #include "Line.hpp"
- #include "ClipperUtils.hpp"
- #include "polypartition.h"
--#include "poly2tri/poly2tri.h"
-+#include <poly2tri-c/p2t/poly2tri.h>
- 
- #include <algorithm>
- #include <list>
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/slic3r.git/commitdiff/29d09fc9284ca946091f1fd7b5e051d1392b4a61