diff --git a/kdegames-4.2.2-ksirk-rh#486380.patch b/kdegames-4.2.2-ksirk-rh#486380.patch new file mode 100644 index 0000000..0e92115 --- /dev/null +++ b/kdegames-4.2.2-ksirk-rh#486380.patch @@ -0,0 +1,12 @@ +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()) + { diff --git a/kdegames.spec b/kdegames.spec index 98015d2..567d00c 100644 --- a/kdegames.spec +++ b/kdegames.spec @@ -3,7 +3,7 @@ Name: kdegames 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 @@ 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 +# 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 @@ game applications for KDE 4. %prep %setup -q -n kdegames-%{version} %patch0 -p1 -b .ksirk-kde#187235 +%patch1 -p1 -b .ksirk-rh#486380 %build @@ -196,6 +199,9 @@ rm -rf %{buildroot} %changelog +* Wed Apr 08 2009 Kevin Kofler - 4.2.2-5 +- fix KsirK crash when starting a 2nd local game with Qt 4.5 (#486380) + * Sat Apr 04 2009 Kevin Kofler - 4.2.2-4 - fix KsirK crash when starting a local game with Qt 4.5 (#486380, kde#187235)