[slic3r] Removed (optional) Net::DBus usage, that causes crashes

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


commit bcade0bb414c23cfa0a69e506f66dbd05fce3287
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Tue Apr 23 22:27:09 2013 +0200

    Removed (optional) Net::DBus usage, that causes crashes

 slic3r-remove-net-dbus.patch |   21 +++++++++++++++++++++
 slic3r.spec                  |    9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/slic3r-remove-net-dbus.patch b/slic3r-remove-net-dbus.patch
new file mode 100644
index 0000000..05e344a
--- /dev/null
+++ b/slic3r-remove-net-dbus.patch
@@ -0,0 +1,21 @@
+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 5bd3e05..308c96a 100644
--- a/slic3r.spec
+++ b/slic3r.spec
@@ -1,6 +1,6 @@
 Name:           slic3r
 Version:        0.9.9
-Release:        3%{?dist}
+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
@@ -21,6 +21,9 @@ Patch1:         %{name}-english-locale.patch
 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.06
@@ -69,6 +72,7 @@ for more information.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 perl Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS"
@@ -101,6 +105,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-4
+- Removed (optional) Net::DBus usage, that causes crashes
+
 * Tue Apr 23 2013 Miro Hrončok <mhroncok at redhat.com> - 0.9.9-3
 - Added second patch to fix upstream issue 1077
 


More information about the scm-commits mailing list