rpms/kdegames/devel kdegames-4.2.2-ksirk-kde#187235.patch, NONE, 1.1 kdegames.spec, 1.123, 1.124

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13575/devel

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.2.2-ksirk-kde#187235.patch 
Log Message:
* Sat Apr 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-4
- fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)

kdegames-4.2.2-ksirk-kde#187235.patch:

--- NEW FILE kdegames-4.2.2-ksirk-kde#187235.patch ---
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);


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- kdegames.spec	2 Apr 2009 16:58:32 -0000	1.123
+++ kdegames.spec	4 Apr 2009 16:01:11 -0000	1.124
@@ -3,12 +3,14 @@
 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 @@
 
 %prep
 %setup -q -n kdegames-%{version}
+%patch0 -p1 -b .ksirk-kde#187235
 
 %build
 
@@ -193,6 +196,9 @@
 
 
 %changelog
+* Sat Apr 04 2009 Kevin Kofler <Kevin at 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 at fedoraproject.org> - 4.2.2-3
 - fix ggz scriptlet logic