[slic3r/f18] Go back to version 9.9.9 that works in F18
Miro Hrončok
churchyard at fedoraproject.org
Fri Oct 18 11:51:15 UTC 2013
commit cf2034f718738d1d99072d79edc3ec29fe096cad
Author: Miro Hrončok <miro at hroncok.cz>
Date: Fri Oct 18 13:50:51 2013 +0200
Go back to version 9.9.9 that works in F18
.gitignore | 2 -
slic3r-config-wizard-crash-fix.patch | 28 ++++++++++++++++++++
slic3r-config-wizard-crash-fix2.patch | 27 +++++++++++++++++++
slic3r-remove-net-dbus.patch | 33 ++++++++++++++++++++++++
slic3r.spec | 45 +++++++++++++++-----------------
sources | 2 +-
6 files changed, 110 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ca72b15..cb87c0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
/slic3r-0.9.8-7105243.tar.gz
/slic3r-0.9.9-01e86c2.tar.gz
-/slic3r-0.9.10b-f13c611.tar.gz
-/slic3r-0.9.10b-d0eac88.tar.gz
diff --git a/slic3r-config-wizard-crash-fix.patch b/slic3r-config-wizard-crash-fix.patch
new file mode 100644
index 0000000..dae1db7
--- /dev/null
+++ b/slic3r-config-wizard-crash-fix.patch
@@ -0,0 +1,28 @@
+From b725847a5131f5dc7e82a7eeda1783e9287580ea Mon Sep 17 00:00:00 2001
+From: Alessandro Ranellucci <aar at cpan.org>
+Date: Wed, 3 Apr 2013 19:26:59 +0200
+Subject: [PATCH] Bugfix: configuration wizard led to crash with simple mode.
+ #1077
+
+---
+ lib/Slic3r/GUI/SkeinPanel.pm | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/Slic3r/GUI/SkeinPanel.pm b/lib/Slic3r/GUI/SkeinPanel.pm
+index ef74033..1bcaa4d 100644
+--- a/lib/Slic3r/GUI/SkeinPanel.pm
++++ b/lib/Slic3r/GUI/SkeinPanel.pm
+@@ -243,7 +243,9 @@ sub config_wizard {
+
+ return unless $self->check_unsaved_changes;
+ if (my $config = Slic3r::GUI::ConfigWizard->new($self)->run) {
+- $_->select_default_preset for values %{$self->{options_tabs}};
++ if ($self->{mode} eq 'expert') {
++ $_->select_default_preset for values %{$self->{options_tabs}};
++ }
+ $self->load_config($config);
+ }
+ }
+--
+1.8.1.6
+
diff --git a/slic3r-config-wizard-crash-fix2.patch b/slic3r-config-wizard-crash-fix2.patch
new file mode 100644
index 0000000..2ea90bf
--- /dev/null
+++ b/slic3r-config-wizard-crash-fix2.patch
@@ -0,0 +1,27 @@
+From 55c413627f8545fb5d2b75efb157d30689985d53 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
+Date: Tue, 23 Apr 2013 16:17:43 +0300
+Subject: [PATCH] Bugfix: configuration wizard crash 2 #1077
+
+---
+ lib/Slic3r/GUI/SkeinPanel.pm | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/Slic3r/GUI/SkeinPanel.pm b/lib/Slic3r/GUI/SkeinPanel.pm
+index 1bcaa4d..1a822a0 100644
+--- a/lib/Slic3r/GUI/SkeinPanel.pm
++++ b/lib/Slic3r/GUI/SkeinPanel.pm
+@@ -234,7 +234,9 @@ sub load_config {
+ my ($config) = @_;
+
+ foreach my $tab (values %{$self->{options_tabs}}) {
+- $tab->set_value($_, $config->$_) for keys %$config;
++ if ($self->{mode} eq 'expert') {
++ $tab->set_value($_, $config->$_) for keys %$config;
++ }
+ }
+ }
+
+--
+1.8.1.6
+
diff --git a/slic3r-remove-net-dbus.patch b/slic3r-remove-net-dbus.patch
new file mode 100644
index 0000000..a6ed4b2
--- /dev/null
+++ b/slic3r-remove-net-dbus.patch
@@ -0,0 +1,33 @@
+diff --git a/Build.PL b/Build.PL
+index b8921a8..70d542c 100644
+--- a/Build.PL
++++ b/Build.PL
+@@ -28,7 +28,6 @@ my $build = Module::Build->new(
+ recommends => {
+ 'Class::XSAccessor' => '0',
+ 'Growl::GNTP' => '0.15',
+- 'Net::DBus' => '0',
+ 'XML::SAX::ExpatXS' => '0',
+ 'Wx' => '0.9901',
+ },
+diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm
+index ceb6adb..48dd662 100644
+--- a/lib/Slic3r/GUI.pm
++++ b/lib/Slic3r/GUI.pm
+@@ -424,16 +424,6 @@ sub notify {
+ $self->{growler}->notify(Event => 'SKEIN_DONE', Title => $title, Message => $message)
+ if $self->{growler};
+ };
+- if (eval 'use Net::DBus; 1') {
+- eval {
+- my $session = Net::DBus->session;
+- my $serv = $session->get_service('org.freedesktop.Notifications');
+- my $notifier = $serv->get_object('/org/freedesktop/Notifications',
+- 'org.freedesktop.Notifications');
+- $notifier->Notify('Slic3r', 0, $self->{icon}, $title, $message, [], {}, -1);
+- undef $Net::DBus::bus_session;
+- };
+- }
+ }
+
+ 1;
diff --git a/slic3r.spec b/slic3r.spec
index 2295fb5..cab3380 100644
--- a/slic3r.spec
+++ b/slic3r.spec
@@ -1,12 +1,12 @@
Name: slic3r
-Version: 0.9.10b
-Release: 4%{?dist}
+Version: 0.9.9
+Release: 5%{?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 commit 01e86c26159c5ff0570613831b82f638daf74450
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Source0: https://github.com/alexrj/Slic3r/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
@@ -17,19 +17,23 @@ Patch0: %{name}-datadir.patch
# 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
+# https://github.com/alexrj/Slic3r/issues/1077
+Patch2: %{name}-config-wizard-crash-fix.patch
+Patch3: %{name}-config-wizard-crash-fix2.patch
+
+# Removed (optional) Net::DBus usage, that causes crashes
+Patch4: %{name}-remove-net-dbus.patch
Source1: %{name}.desktop
BuildArch: noarch
-BuildRequires: perl(Boost::Geometry::Utils) >= 0.12
+BuildRequires: perl(Boost::Geometry::Utils) >= 0.06
BuildRequires: perl(Class::XSAccessor)
BuildRequires: perl(Encode::Locale)
BuildRequires: perl(File::Spec)
BuildRequires: perl(Growl::GNTP)
BuildRequires: perl(IO::Scalar)
BuildRequires: perl(List::Util)
-BuildRequires: perl(Math::Clipper) >= 1.22
+BuildRequires: perl(Math::Clipper) >= 1.17
BuildRequires: perl(Math::ConvexHull::MonotoneChain)
BuildRequires: perl(Math::ConvexHull) >= 1.0.4
BuildRequires: perl(Math::Geometry::Voronoi)
@@ -49,6 +53,12 @@ Requires: perl(Growl::GNTP)
Requires: perl(XML::SAX)
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+%if 0%{?fedora} < 18
+# This is provided by XML::SAX (but not stated there)
+%filter_from_requires /perl(XML::SAX::PurePerl)/d
+%filter_setup
+%endif
+
%description
Slic3r is a G-code generator for 3D printers. It's compatible with RepRaps,
Makerbots, Ultimakers and many more machines.
@@ -60,9 +70,11 @@ for more information.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
-SLIC3R_NO_AUTO=1 perl Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS"
+perl Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS"
./Build
%install
@@ -83,7 +95,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
./Build test
%files
-%doc README.markdown
+%doc MANIFEST README.markdown
%{_bindir}/%{name}
%{perl_vendorlib}/Slic3r*
%{_datadir}/pixmaps/%{name}.ico
@@ -92,21 +104,6 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%{_mandir}/man3/*
%changelog
-* Fri Oct 18 2013 Miro Hrončok <mhroncok at redhat.com> - 0.9.10b-4
-- Remove all filtering from provides, it is not needed anymore
-- Don't add MANIFEST to %%doc
-- Fix crash when loading config (#1020802)
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.10b-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue Jun 25 2013 Miro Hrončok <mhroncok at redhat.com> - 0.9.10b-2
-- Filter perl(Wx::GLCanvas) from requires, it's optional and not yet in Fedora
-
-* Mon Jun 24 2013 Miro Hrončok <mhroncok at redhat.com> - 0.9.10b-1
-- New upstream release
-- Removed some already merged patches
-
* Tue Apr 23 2013 Miro Hrončok <mhroncok at redhat.com> - 0.9.9-5
- Added BR perl(Encode::Locale)
diff --git a/sources b/sources
index f7f1094..1101ced 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b0ae2b74a93d643f0945e152457b605 slic3r-0.9.10b-d0eac88.tar.gz
+5fbe7a813e12fdc37cc1d4b913240556 slic3r-0.9.9-01e86c2.tar.gz
More information about the scm-commits
mailing list