rpms/kdegames/devel kdegames-4.2.2-ksirk-rh#486380.patch, NONE, 1.1 kdegames.spec, 1.124, 1.125

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.2.2-ksirk-rh#486380.patch 
Log Message:
* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
- fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)

kdegames-4.2.2-ksirk-rh#486380.patch:

--- NEW FILE kdegames-4.2.2-ksirk-rh#486380.patch ---
diff -ur kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp
--- kdegames-4.2.2/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-02-26 15:27:37.000000000 +0100
+++ kdegames-4.2.2-ksirk-rh#486380/ksirk/ksirk/GameLogic/gameautomaton.cpp	2009-04-08 20:37:33.000000000 +0200
@@ -2676,6 +2676,8 @@
 void GameAutomaton::removeAllPlayers()
 {
   kDebug();
+  // reset all countries or they will refer to nonexistent players => crash
+  m_game->theWorld()->reset();
   m_currentPlayer = "";
   foreach (KPlayer*p, *playerList())
   {


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- kdegames.spec	4 Apr 2009 16:01:11 -0000	1.124
+++ kdegames.spec	8 Apr 2009 18:42:04 -0000	1.125
@@ -3,7 +3,7 @@
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -11,6 +11,8 @@
 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
+# Fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
+Patch1:  kdegames-4.2.2-ksirk-rh#486380.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -92,6 +94,7 @@
 %prep
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .ksirk-kde#187235
+%patch1 -p1 -b .ksirk-rh#486380
 
 %build
 
@@ -196,6 +199,9 @@
 
 
 %changelog
+* Wed Apr 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
+- fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380)
+
 * 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)