commit 00db753a0e6458b2b3e7689fd8e1cc138591dea2
Author: Miro Hrončok <miro@xxxxxxxxxx>
Date: Sun Nov 24 17:32:54 2013 +0100
Slic3r 1.0.0RC1
slic3r-buildpl.patch | 25 ++++++++++++++
slic3r-datadir.patch | 15 --------
slic3r-english-locale.patch | 35 --------------------
slic3r-load-config-fix.patch | 39 ----------------------
slic3r-nowarn-datadir.patch | 17 +++++++++
slic3r.spec | 74 ++++++++++++++++++++++++++++-------------
6 files changed, 92 insertions(+), 113 deletions(-)
---
diff --git a/slic3r-buildpl.patch b/slic3r-buildpl.patch
new file mode 100644
index 0000000..0e7c51d
--- /dev/null
+++ b/slic3r-buildpl.patch
@@ -0,0 +1,25 @@
+diff --git a/Build.PL b/Build.PL
+index b501025..1abe9fe 100644
+--- a/Build.PL
++++ b/Build.PL
+@@ -9,7 +9,7 @@ use File::Spec;
+ my %prereqs = qw(
+ Boost::Geometry::Utils 0.15
+ Encode::Locale 0
+- ExtUtils::MakeMaker 6.80
++ ExtUtils::MakeMaker 6.70
+ File::Basename 0
+ File::Spec 0
+ Getopt::Long 0
+@@ -142,7 +142,10 @@ if (@missing_prereqs) {
+ exit 1;
+ } elsif (!$gui) {
+ eval "use App::Prove; 1" or die "Failed to load App::Prove";
+- my $res = App::Prove->new->run ? 0 : 1;
++
++ my $app = App::Prove->new;
++ $app->process_args('-Ixs/blib/lib','-Ixs/blib/arch');
++ my $res = $app->run ? 0 : 1;
+ if ($res == 0) {
+ print "If you also want to use the GUI you can now run `perl Build.PL --gui` to install the required modules.\n";
+ } else {
diff --git a/slic3r-nowarn-datadir.patch b/slic3r-nowarn-datadir.patch
new file mode 100644
index 0000000..a265398
--- /dev/null
+++ b/slic3r-nowarn-datadir.patch
@@ -0,0 +1,17 @@
+diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm
+index d317f2e..3ff1f6d 100644
+--- a/lib/Slic3r.pm
++++ b/lib/Slic3r.pm
+@@ -25,11 +25,7 @@ BEGIN {
+ $have_threads = 0 if $Moo::VERSION == 1.003000;
+ }
+
+-warn "Running Slic3r under Perl >= 5.16 is not supported nor recommended\n"
+- if $^V >= v5.16;
+-
+-use FindBin;
+-our $var = "$FindBin::Bin/var";
++our $var = "/usr/share/slic3r";
+
+ use Encode;
+ use Encode::Locale;
diff --git a/slic3r.spec b/slic3r.spec
index 4b3d811..a8bcf98 100644
--- a/slic3r.spec
+++ b/slic3r.spec
@@ -1,40 +1,43 @@
Name: slic3r
-Version: 0.9.10b
-Release: 5%{?dist}
+Version: 1.0.0
+%global rcrc RC1
+%global verrc %{version}%{rcrc}
+Release: 0.1.%{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
Group: Applications/Engineering
URL: http://slic3r.org/
-%global commit d0eac88ff9586b17dcc1766874f69dbd7e8c534f
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Source0: https://github.com/alexrj/Slic3r/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+Source0: https://github.com/alexrj/Slic3r/archive/%{verrc}.tar.gz
-# Use /usr/share to store icons
-Patch0: %{name}-datadir.patch
+# Modify Build.PL so we are able to build this on Fedora
+Patch0: %{name}-buildpl.patch
-# Use English decimal separator for numbers
-# Reasons are a bit complicated and are described in the patch
-Patch1: %{name}-english-locale.patch
-
-# Fix crash when loading a config file
-Patch2: %{name}-load-config-fix.patch
+# Don't warn for Perl >= 5.16
+# Use /usr/share/slic3r as datadir
+# Those two are located at the same place at the code, so the patch is merged
+Patch1: %{name}-nowarn-datadir.patch
Source1: %{name}.desktop
-BuildArch: noarch
-BuildRequires: perl(Boost::Geometry::Utils) >= 0.12
+BuildRequires: perl(Boost::Geometry::Utils) >= 0.15
BuildRequires: perl(Class::XSAccessor)
BuildRequires: perl(Encode::Locale)
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl(ExtUtils::Typemaps::Default) >= 1.03
+BuildRequires: perl(ExtUtils::Typemap)
+BuildRequires: perl(File::Basename)
BuildRequires: perl(File::Spec)
+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)
-BuildRequires: perl(Math::PlanePath)
+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
@@ -42,8 +45,11 @@ BuildRequires: perl(Moo)
%endif
BuildRequires: perl(parent)
BuildRequires: perl(Scalar::Util)
+BuildRequires: perl(Storable)
BuildRequires: perl(SVG)
+BuildRequires: perl(Test::Harness)
BuildRequires: perl(Test::More)
+BuildRequires: perl(Time::HiRes)
BuildRequires: perl(Wx)
BuildRequires: perl(XML::SAX)
BuildRequires: perl(XML::SAX::ExpatXS)
@@ -63,42 +69,62 @@ See the project homepage at slic3r.org and the documentation on the Slic3r wiki
for more information.
%prep
-%setup -qn Slic3r-%{commit}
+%setup -qn Slic3r-%{verrc}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
-SLIC3R_NO_AUTO=1 perl Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS"
+cd xs
+perl ./Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS"
./Build
+cd -
+# Building non XS part only runs test, so skip it and run it in tests
%install
+cd xs
./Build install destdir=%{buildroot} create_packlist=0
+cd -
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
+# I see no way of installing slic3r with it's build script
+# So I copy the files around manually
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{perl_vendorlib}
mkdir -p %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_datadir}/pixmaps
-mv -f %{buildroot}%{_bindir}/%{name}.pl %{buildroot}%{_bindir}/%{name}
+cp -a %{name}.pl %{buildroot}%{_bindir}/%{name}
+cp -ar lib/* %{buildroot}%{perl_vendorlib}
+
cp -a var/* %{buildroot}%{_datadir}/%{name}
ln -s ../%{name}/Slic3r.ico %{buildroot}%{_datadir}/pixmaps/%{name}.ico
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
-%{_fixperms} %{buildroot}/*
+%{_fixperms} %{buildroot}*
%check
+cd xs
./Build test
+cd -
+SLIC3R_NO_AUTO=1 perl Build.PL installdirs=vendor
+# the --gui runs no tests, it only checks requires
%files
-%doc README.markdown
+%doc README.md
%{_bindir}/%{name}
%{perl_vendorlib}/Slic3r*
+%{perl_vendorarch}/Slic3r*
+%{perl_vendorarch}/auto/Slic3r*
%{_datadir}/pixmaps/%{name}.ico
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}
-%{_mandir}/man3/*
%changelog
+* Wed Nov 20 2013 Miro Hrončok <mhroncok@xxxxxxxxxx> - 1.0.0-0.1.RC1
+- 1.0.0RC1 version
+- refactor build and isntall
+- become arched
+
* Fri Oct 18 2013 Miro Hrončok <mhroncok@xxxxxxxxxx> - 0.9.10b-5
- For F20+, require Moo >= 1.003001
--
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
