commit 7e6ad55132830d6029785d026cb5abc73e635890
Author: Miro Hrončok <miro@xxxxxxxxxx>
Date: Fri Mar 29 18:48:22 2013 +0100
Downgraded Slic3r to 0.9.7
Slic3r 0.9.8 needs perl-Match-Clipper >= 1.17,
but that is not available in Fedora 17.
slic3r-datadir.patch | 27 +++++++++++++++++----------
slic3r-english-locale.patch | 25 +++++++------------------
slic3r.spec | 20 ++++++--------------
3 files changed, 30 insertions(+), 42 deletions(-)
---
diff --git a/slic3r-datadir.patch b/slic3r-datadir.patch
index 1456dfe..c0cdca7 100644
--- a/slic3r-datadir.patch
+++ b/slic3r-datadir.patch
@@ -1,15 +1,22 @@
-Search for icons and such in /usr/share/slic3r.
-
-diff -ru a/lib/Slic3r.pm c/lib/Slic3r.pm
---- a/lib/Slic3r.pm 2013-01-17 15:50:45.000000000 +0100
-+++ c/lib/Slic3r.pm 2013-01-22 00:15:56.797243399 +0100
-@@ -24,8 +24,7 @@
- warn "Running Slic3r under Perl >= 5.16 is not supported nor recommended\n"
+diff -ruN a/.gitignore b/.gitignore
+--- a/.gitignore 2012-11-23 18:38:50.000000000 +0100
++++ b/.gitignore 1970-01-01 01:00:00.000000000 +0100
+@@ -1,6 +0,0 @@
+-Build
+-Build.bat
+-MYMETA.json
+-MYMETA.yml
+-_build
+-blib
+diff -ruN a/lib/Slic3r.pm b/lib/Slic3r.pm
+--- a/lib/Slic3r.pm 2012-11-23 18:38:50.000000000 +0100
++++ b/lib/Slic3r.pm 2013-03-29 18:45:49.274139014 +0100
+@@ -25,7 +25,7 @@
if $^V >= v5.16;
--use FindBin;
+ use FindBin;
-our $var = "$FindBin::Bin/var";
+our $var = "/usr/share/slic3r";
- use Encode;
- use Encode::Locale;
+ use Moo 0.091009;
+ use Slic3r::Config;
diff --git a/slic3r-english-locale.patch b/slic3r-english-locale.patch
index 69bde5d..777d64b 100644
--- a/slic3r-english-locale.patch
+++ b/slic3r-english-locale.patch
@@ -1,17 +1,6 @@
-Upstream constantly refuses to support Perl >= 5.16.
-They say it handles locales incorrectly, but it might be caused by bad code
-design. Running Slic3r with locales using other char than point as a decimal
-separator causes crashes. This patch removes the warning about unsupported
-Perl version (it is very annoying) and forces Slic3r to use English decimal
-separator by setting the LC_NUMERIC environment variable. Setting it in more
-Perl way doesn't work and is overwritten in some of imported modules.
-https://github.com/alexrj/Slic3r/issues/935
-https://github.com/alexrj/Slic3r/pull/936#issuecomment-12544383
-https://github.com/alexrj/Slic3r/issues/538#issuecomment-14560494
-
-diff -ru a/lib/Slic3r.pm b/lib/Slic3r.pm
---- a/lib/Slic3r.pm 2013-01-22 00:15:56.797243399 +0100
-+++ b/lib/Slic3r.pm 2013-01-22 00:29:55.519336602 +0100
+diff -ruN b/lib/Slic3r.pm c/lib/Slic3r.pm
+--- b/lib/Slic3r.pm 2013-03-29 18:45:49.274139014 +0100
++++ c/lib/Slic3r.pm 2013-03-29 18:47:04.673085095 +0100
@@ -21,9 +21,6 @@
$have_threads = $Config{useithreads} && eval "use threads; use Thread::Queue; 1";
}
@@ -19,12 +8,12 @@ diff -ru a/lib/Slic3r.pm b/lib/Slic3r.pm
-warn "Running Slic3r under Perl >= 5.16 is not supported nor recommended\n"
- if $^V >= v5.16;
-
+ use FindBin;
our $var = "/usr/share/slic3r";
- use Encode;
-diff -ru a/slic3r.pl b/slic3r.pl
---- a/slic3r.pl 2013-01-17 15:50:45.000000000 +0100
-+++ b/slic3r.pl 2013-01-22 00:30:19.327252847 +0100
+diff -ruN b/slic3r.pl c/slic3r.pl
+--- b/slic3r.pl 2012-11-23 18:38:50.000000000 +0100
++++ c/slic3r.pl 2013-03-29 18:47:34.680063686 +0100
@@ -10,6 +10,7 @@
use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/slic3r.spec b/slic3r.spec
index c5ebce7..9221b51 100644
--- a/slic3r.spec
+++ b/slic3r.spec
@@ -1,12 +1,12 @@
Name: slic3r
-Version: 0.9.8
+Version: 0.9.7
Release: 4%{?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 71052433de0ff1f3da04471ccbb572babafc3cae
+%global commit 452b62e53d449ebfca00922f7cc3319f291f0afb
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Source0: https://github.com/alexrj/Slic3r/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
@@ -43,7 +43,7 @@ BuildRequires: desktop-file-utils
Requires: perl(XML::SAX)
Requires: perl(Growl::GNTP)
Requires: perl(Net::DBus)
-Requires: perl(Math::Clipper) >= 1.17
+Requires: perl(Math::Clipper) >= 1.14
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%if 0%{?fedora} < 18
@@ -94,13 +94,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%{_mandir}/man3/*
%changelog
-* Wed Mar 20 2013 Miro Hrončok <mhroncok@xxxxxxxxxx> - 0.9.8-4
-- Comments added about patches
-
-* Mon Mar 11 2013 Miro Hrončok <mhroncok@xxxxxxxxxx> - 0.9.8-3
-- In-file justification provided for patches
-
-* Mon Jan 21 2013 Miro Hrončok <mhroncok@xxxxxxxxxx> - 0.9.8-2
+* Fri Mar 29 2013 Miro Hrončok <mhroncok@xxxxxxxxxx> - 0.9.7-4
- Added patch to grab icons from %%{datadir}/%%{name}
- Added patch to avoid bad locales behavior
- Removed no longer needed filtering perl(Wx::Dialog) from Requires
@@ -108,10 +102,8 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
- Removed Perl default filter
- Removed bash launcher
- Renamed slic3r.pl to slic3r
-
-* Thu Jan 17 2013 Miro Hrončok <mhroncok@xxxxxxxxxx> - 0.9.8-1
-- New version
-- (Build)Requires Math::Clipper 1.17
+- In-file justification provided for patches
+- Comments added about patches
* Thu Jan 17 2013 Miro Hrončok <mhroncok@xxxxxxxxxx> - 0.9.7-3
- Updated source to respect GitHub rule
--
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
