From 0fe13f514666f503c4c1b1350c646081fd04809e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <m...@hroncok.cz>
Date: Wed, 31 Aug 2016 15:33:13 +0200
Subject: Fix bug that crashes slic3r when about dialog is opened (#1285807)
---
slic3r-wxclose.patch | 13 +++++++++++++
slic3r.spec | 10 +++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
create mode 100644 slic3r-wxclose.patch
diff --git a/slic3r-wxclose.patch b/slic3r-wxclose.patch
new file mode 100644
index 0000000..cffe02e
--- /dev/null
+++ b/slic3r-wxclose.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/Slic3r/GUI/AboutDialog.pm b/lib/Slic3r/GUI/AboutDialog.pm
+index 6fc83b6..78f89ef 100644
+--- a/lib/Slic3r/GUI/AboutDialog.pm
++++ b/lib/Slic3r/GUI/AboutDialog.pm
+@@ -66,7 +66,7 @@ sub new {
+ $vsizer->Add($html, 1, wxEXPAND | wxALIGN_LEFT | wxRIGHT | wxBOTTOM, 20);
+ EVT_HTML_LINK_CLICKED($self, $html, \&link_clicked);
+
+- my $buttons = $self->CreateStdDialogButtonSizer(wxCLOSE);
++ my $buttons = $self->CreateStdDialogButtonSizer(wxOK);
+ $self->SetEscapeId(wxID_CLOSE);
+ EVT_BUTTON($self, wxID_CLOSE, sub {
+ $self->EndModal(wxID_CLOSE);
diff --git a/slic3r.spec b/slic3r.spec
index a555492..160662c 100644
--- a/slic3r.spec
+++ b/slic3r.spec
@@ -1,6 +1,6 @@
Name: slic3r
Version: 1.2.9
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: G-code generator for 3D printers (RepRap, Makerbot, Ultimaker
etc.)
License: AGPLv3 and CC-BY
# Images are CC-BY, code is AGPLv3
@@ -25,6 +25,10 @@ Patch5: %{name}-boost160.patch
# Will report upstream
Patch6: %{name}-boolcast.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1285807
+#
https://github.com/alexrj/Slic3r/commit/1a09ae81db06602050ae83620268efa33ed14da1
+Patch7: %{name}-wxclose.patch
+
Source1: %{name}.desktop
Source2: %{name}.appdata.xml
@@ -87,6 +91,7 @@ for more information.
#%%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# Remove bundled admesh, clipper, poly2tri and boost
rm -rf xs/src/admesh
@@ -181,6 +186,9 @@ fi
%{_datadir}/%{name}
%changelog
+* Wed Aug 31 2016 Miro Hrončok <mhron...@redhat.com> - 1.2.9-8
+- Fix bug that crashes slic3r when about dialog is opened (#1285807)
+
* Mon May 16 2016 Jitka Plesnikova <jples...@redhat.com> - 1.2.9-7
- Perl 5.24 rebuild
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/slic3r.git/commit/?h=master&id=0fe13f514666f503c4c1b1350c646081fd04809e
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org
