From f45434665857cb60d26f9d594545ac90d5079ad4 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Apr 04 2009 16:01:11 +0000
Subject: - fix KsirK crash when starting a local game with Qt 4.5 (#486380,

    kde#187235)

---

diff --git a/kdegames-4.2.2-ksirk-kde#187235.patch b/kdegames-4.2.2-ksirk-kde#187235.patch
new file mode 100644
index 0000000..65a84f6
--- /dev/null
+++ b/kdegames-4.2.2-ksirk-kde#187235.patch
@@ -0,0 +1,15 @@
+diff -ur kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp kdegames-4.2.2-ksirk-kde#187235/ksirk/ksirk/kgamewinslots.cpp
+--- kdegames-4.2.2/ksirk/ksirk/kgamewinslots.cpp	2009-02-26 15:27:43.000000000 +0100
++++ kdegames-4.2.2-ksirk-kde#187235/ksirk/ksirk/kgamewinslots.cpp	2009-04-04 17:58:43.000000000 +0200
+@@ -132,6 +132,11 @@
+           && (mousePos.x() >= 0) && (mousePos.x() <= m_frame-> viewport()->width()))
+     )
+   )
++  // safety check for NULL arrow pointers, can happen with Qt 4.5
++  if (m_uparrow == 0 || m_downarrow == 0 || m_leftarrow == 0 || m_rightarrow == 0)
++  {
++    return;
++  }
+   if (currentWidget() != 0)
+   {
+     m_timer.start(200);
diff --git a/kdegames.spec b/kdegames.spec
index 26a04e3..98015d2 100644
--- a/kdegames.spec
+++ b/kdegames.spec
@@ -3,12 +3,14 @@ Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
 Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2
+# Fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
+Patch0:  kdegames-4.2.2-ksirk-kde#187235.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -89,6 +91,7 @@ game applications for KDE 4.
 
 %prep
 %setup -q -n kdegames-%{version}
+%patch0 -p1 -b .ksirk-kde#187235
 
 %build
 
@@ -193,6 +196,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Apr 04 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.2-4
+- fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)
+
 * Thu Apr 02 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.2-3
 - fix ggz scriptlet logic