From 109f780e7e08c55dbab9d0765ef57d891bd5c4f7 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Apr 26 2017 19:17:47 +0000
Subject: Fix crash on startup


---

diff --git a/sugar-paint-PR19.patch b/sugar-paint-PR19.patch
new file mode 100644
index 0000000..17b7057
--- /dev/null
+++ b/sugar-paint-PR19.patch
@@ -0,0 +1,11 @@
+--- Paint-65/Area.py.orig	2017-04-26 20:13:48.802360411 +0100
++++ Paint-65/Area.py	2017-04-26 20:15:25.452174318 +0100
+@@ -1772,7 +1772,7 @@
+ 
+                 cursor = Gdk.Cursor.new_from_pixbuf(display, pixbuf,
+                                                     hotspot_x, hotspot_y)
+-        except GObject.GError:
++        except (GObject.GError):
+             cursor = None
+         if self.get_window() is not None:
+             self.get_window().set_cursor(cursor)
diff --git a/sugar-paint.spec b/sugar-paint.spec
index 7613aa2..2ac5d79 100644
--- a/sugar-paint.spec
+++ b/sugar-paint.spec
@@ -2,7 +2,7 @@
 
 Name:          sugar-paint
 Version:       65
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Paint activity for Sugar
 
 Group:         Sugar/Activities
@@ -10,6 +10,7 @@ License:       GPLv2
 URL:           http://wiki.sugarlabs.org/go/Activities/Paint
 Source0:       http://download.sugarlabs.org/sources/honey/Paint/Paint-%{version}.tar.bz2
 Patch0:        sugar-paint-Fedora.patch
+Patch1:        sugar-paint-PR19.patch
 
 BuildRequires: gettext
 BuildRequires: gobject-introspection-devel
@@ -24,6 +25,7 @@ to express themselves creatively through drawing.
 %prep
 %setup -q -n Paint-%{version}
 %patch0 -p1 -b .fedora
+%patch1 -p1 -b .pr19
 
 # make sure to grab blob from the right location and remove prebuilt ones
 rm -rf fill/linux* fill/arm*
@@ -39,6 +41,7 @@ install -Dm 0644 fill/lib/__init__.py %{buildroot}%{python_sitearch}/fill/
 
 python ./setup.py install --prefix=%{buildroot}/%{_prefix}
 rm -rf %{buildroot}%{sugaractivitydir}Paint.activity/fill
+rm %{buildroot}%{_prefix}/share/applications/*.desktop || true
 
 %find_lang org.laptop.Oficina
 
@@ -49,6 +52,9 @@ rm -rf %{buildroot}%{sugaractivitydir}Paint.activity/fill
 
 
 %changelog
+* Wed Apr 26 2017 Peter Robinson <pbrobinson@fedoraproject.org> 65-5
+- Fix crash on startup
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 65-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild