[slic3r] 1.0.0RC2

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



commit 228bba06b76a879081eb106d8c744cfeebe746ef
Author: Miro Hrončok <miro@xxxxxxxxxx>
Date:   Fri Jan 3 15:50:05 2014 +0100

    1.0.0RC2

 .gitignore             |    1 +
 slic3r-1543.patch      |  104 -------------------------------------------
 slic3r-1545.patch      |  116 ------------------------------------------------
 slic3r-1547.patch      |   47 -------------------
 slic3r-1552.patch      |   28 ------------
 slic3r-1582-1541.patch |  105 -------------------------------------------
 slic3r-buildpl.patch   |   14 +++++-
 slic3r-clipper.patch   |   39 ++++++++++++++++
 slic3r.spec            |   42 ++++++++++++-----
 sources                |    2 +-
 10 files changed, 81 insertions(+), 417 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fef49c5..59bb3ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /slic3r-0.9.10b-f13c611.tar.gz
 /slic3r-0.9.10b-d0eac88.tar.gz
 /1.0.0RC1.tar.gz
+/1.0.0RC2.tar.gz
diff --git a/slic3r-buildpl.patch b/slic3r-buildpl.patch
index 0e7c51d..56501ea 100644
--- a/slic3r-buildpl.patch
+++ b/slic3r-buildpl.patch
@@ -1,8 +1,8 @@
 diff --git a/Build.PL b/Build.PL
-index b501025..1abe9fe 100644
+index f7117e6..0d2abb6 100644
 --- a/Build.PL
 +++ b/Build.PL
-@@ -9,7 +9,7 @@ use File::Spec;
+@@ -9,14 +9,14 @@ use File::Spec;
  my %prereqs = qw(
      Boost::Geometry::Utils          0.15
      Encode::Locale                  0
@@ -11,7 +11,15 @@ index b501025..1abe9fe 100644
      File::Basename                  0
      File::Spec                      0
      Getopt::Long                    0
-@@ -142,7 +142,10 @@ if (@missing_prereqs) {
+     Math::ConvexHull::MonotoneChain 0.01
+     Math::Geometry::Voronoi         1.3
+     Math::PlanePath                 53
+-    Module::Build::WithXSpp         0.14
++    Module::Build::WithXSpp         0.13
+     Moo                             1.003001
+     Scalar::Util                    0
+     Storable                        0
+@@ -149,7 +149,10 @@ if (@missing_prereqs) {
      exit 1;
  } elsif (!$gui) {
      eval "use App::Prove; 1" or die "Failed to load App::Prove";
diff --git a/slic3r-clipper.patch b/slic3r-clipper.patch
new file mode 100644
index 0000000..27c44e0
--- /dev/null
+++ b/slic3r-clipper.patch
@@ -0,0 +1,39 @@
+diff --git a/xs/Build.PL b/xs/Build.PL
+index b358623..90a2cc2 100644
+--- a/xs/Build.PL
++++ b/xs/Build.PL
+@@ -25,7 +25,7 @@ my $build = Module::Build::WithXSpp->new(
+     # HAS_BOOL         : stops Perl/lib/CORE/handy.h from doing "#  define bool char" for MSVC
+     # NOGDI            : prevents inclusion of wingdi.h which defines functions Polygon() and Polyline() in global namespace
+     extra_compiler_flags => [qw(-D_GLIBCXX_USE_C99 -DHAS_BOOL -DNOGDI -DSLIC3RXS), ($ENV{SLIC3R_DEBUG} ? ' -DSLIC3R_DEBUG -g' : '')],
+-    
++    extra_linker_flags => [qw(-lpolyclipping)],
+     # Provides extra C typemaps that are auto-merged
+     extra_typemap_modules => {
+         'ExtUtils::Typemaps::Default' => '1.03',
+diff --git a/xs/src/ClipperUtils.hpp b/xs/src/ClipperUtils.hpp
+index 8f0974d..ab8f46d 100644
+--- a/xs/src/ClipperUtils.hpp
++++ b/xs/src/ClipperUtils.hpp
+@@ -2,7 +2,7 @@
+ #define slic3r_ClipperUtils_hpp_
+ 
+ #include <myinit.h>
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include "ExPolygon.hpp"
+ #include "Polygon.hpp"
+ 
+diff --git a/xs/xsp/Clipper.xsp b/xs/xsp/Clipper.xsp
+index 2e63afb..61910e6 100644
+--- a/xs/xsp/Clipper.xsp
++++ b/xs/xsp/Clipper.xsp
+@@ -2,7 +2,7 @@
+ 
+ %{
+ #include <myinit.h>
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include "ClipperUtils.hpp"
+ %}
+ 
diff --git a/slic3r.spec b/slic3r.spec
index f507ec4..88e9cd3 100644
--- a/slic3r.spec
+++ b/slic3r.spec
@@ -1,8 +1,8 @@
 Name:           slic3r
 Version:        1.0.0
-%global rcrc    RC1
+%global rcrc    RC2
 %global verrc   %{version}%{rcrc}
-Release:        0.2.%{rcrc}%{?dist}
+Release:        0.3.%{rcrc}%{?dist}
 Summary:        G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
 License:        AGPLv3 and CC-BY
 # Images are CC-BY, code is AGPLv3
@@ -10,6 +10,9 @@ Group:          Applications/Engineering
 URL:            http://slic3r.org/
 Source0:        https://github.com/alexrj/Slic3r/archive/%{verrc}.tar.gz
 
+# This is blocked by https://bugzilla.redhat.com/show_bug.cgi?id=1047914
+%global         with_clipper 0
+
 # Modify Build.PL so we are able to build this on Fedora
 Patch0:         %{name}-buildpl.patch
 
@@ -18,11 +21,10 @@ Patch0:         %{name}-buildpl.patch
 # Those two are located at the same place at the code, so the patch is merged
 Patch1:         %{name}-nowarn-datadir.patch
 
-Patch11:        %{name}-1543.patch
-Patch12:        %{name}-1545.patch
-Patch13:        %{name}-1547.patch
-Patch14:        %{name}-1552.patch
-Patch15:        %{name}-1582-1541.patch
+%if %with_clipper
+# Unbundle clipper
+Patch2:         %{name}-clipper.patch
+%endif
 
 Source1:        %{name}.desktop
 BuildRequires:  perl(Boost::Geometry::Utils) >= 0.15
@@ -37,18 +39,19 @@ BuildRequires:  perl(Getopt::Long)
 BuildRequires:  perl(Growl::GNTP)
 BuildRequires:  perl(IO::Scalar)
 BuildRequires:  perl(List::Util)
-BuildRequires:  perl(Math::Clipper) >= 1.22
 BuildRequires:  perl(Math::ConvexHull::MonotoneChain)
 BuildRequires:  perl(Math::ConvexHull) >= 1.0.4
 BuildRequires:  perl(Math::Geometry::Voronoi) >= 1.3
 BuildRequires:  perl(Math::PlanePath) >= 53
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Module::Build::WithXSpp)
+
 %if 0%{?fedora} > 19
 BuildRequires:  perl(Moo) >= 1.003001
 %else
 BuildRequires:  perl(Moo)
 %endif
+
 BuildRequires:  perl(parent)
 BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Storable)
@@ -59,12 +62,19 @@ BuildRequires:  perl(Time::HiRes)
 BuildRequires:  perl(Wx)
 BuildRequires:  perl(XML::SAX)
 BuildRequires:  perl(XML::SAX::ExpatXS)
+
+%if %with_clipper
+BuildRequires:  polyclipping-devel
+%endif
+
 BuildRequires:  desktop-file-utils
 Requires:       perl(Class::XSAccessor)
 Requires:       perl(Growl::GNTP)
+
 %if 0%{?fedora} > 19
 Requires:       perl(Moo) >= 1.003001
 %endif
+
 Requires:       perl(XML::SAX)
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
@@ -79,14 +89,15 @@ for more information.
 
 %prep
 %setup -qn Slic3r-%{verrc}
+
 %patch0 -p1
 %patch1 -p1
 
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
+%if %with_clipper
+%patch2 -p1
+# Remove bundled clipper
+rm xs/src/clipper.*pp
+%endif
 
 %build
 cd xs
@@ -135,6 +146,11 @@ SLIC3R_NO_AUTO=1 perl Build.PL installdirs=vendor
 %{_datadir}/%{name}
 
 %changelog
+* Thu Jan 02 2014 Miro Hrončok <mhroncok@xxxxxxxxxx> - 1.0.0-0.3.RC2
+- New RC version
+- Remove already merged patches
+- Only require Module::Build::WithXSpp 0.13 in Build.PL
+
 * Fri Dec 13 2013 Miro Hrončok <mhroncok@xxxxxxxxxx> - 1.0.0-0.2.RC1
 - Backported several bugfixes
 
diff --git a/sources b/sources
index adbc0ce..e3f1091 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f720fbbaeb15c3048db880dc85955927  1.0.0RC1.tar.gz
+4d17d404ec09b71d75f92ccca8c7ee6d  1.0.0RC2.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel





[Index of Archives]     [Fedora Announce]     [Fedora Kernel]     [Fedora Testing]     [Fedora Legacy Announce]     [Fedora PHP Devel]     [Kernel Devel]     [Fedora Legacy]     [Fedora Maintainers]     [Fedora Desktop]     [PAM]     [Red Hat Development]     [Big List of Linux Books]     [Gimp]     [Yosemite Information]
  Powered by Linux