[slic3r] Added second patch to fix upstream issue 1077

Miro Hrončok churchyard at fedoraproject.org
Tue Apr 23 13:20:02 UTC 2013


commit 0518782a372fc3e3b56e7a7afeb6c27d881f7f6b
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Tue Apr 23 15:19:31 2013 +0200

    Added second patch to fix upstream issue 1077

 slic3r-config-wizard-crash-fix2.patch |   27 +++++++++++++++++++++++++++
 slic3r.spec                           |    7 ++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
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.spec b/slic3r.spec
index f50633d..5bd3e05 100644
--- a/slic3r.spec
+++ b/slic3r.spec
@@ -1,6 +1,6 @@
 Name:           slic3r
 Version:        0.9.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
 License:        AGPLv3 and CC-BY
 # Images are CC-BY, code is AGPLv3
@@ -19,6 +19,7 @@ Patch1:         %{name}-english-locale.patch
 
 # https://github.com/alexrj/Slic3r/issues/1077
 Patch2:         %{name}-config-wizard-crash-fix.patch
+Patch3:         %{name}-config-wizard-crash-fix2.patch
 
 Source1:        %{name}.desktop
 BuildArch:      noarch
@@ -67,6 +68,7 @@ for more information.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 perl Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS"
@@ -99,6 +101,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 23 2013 Miro Hrončok <mhroncok at redhat.com> - 0.9.9-3
+- Added second patch to fix upstream issue 1077
+
 * Tue Apr 23 2013 Miro Hrončok <mhroncok at redhat.com> - 0.9.9-2
 - Added patch to fix upstream issue 1077
 


More information about the scm-commits mailing list