rpms/ksirk/devel ksirk-1.7-gcc43.patch,NONE,1.1 ksirk.spec,1.3,1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/ksirk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24911

Modified Files:
	ksirk.spec 
Added Files:
	ksirk-1.7-gcc43.patch 
Log Message:
* Tue Jan  8 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-5
- Fix building with gcc 4.3


ksirk-1.7-gcc43.patch:

--- NEW FILE ksirk-1.7-gcc43.patch ---
diff -up ksirk-1.7/ksirk/Dialogs/kplayersetupdialog.cpp~ ksirk-1.7/ksirk/Dialogs/kplayersetupdialog.cpp
--- ksirk-1.7/ksirk/Dialogs/kplayersetupdialog.cpp~	2008-01-08 22:59:20.000000000 +0100
+++ ksirk-1.7/ksirk/Dialogs/kplayersetupdialog.cpp	2008-01-08 22:59:20.000000000 +0100
@@ -23,6 +23,7 @@
 #include "GameLogic/onu.h"
 #include "Sprites/skinSpritesData.h"
 
+#include <stdlib.h>
 #include <qstring.h>
 #include <qlabel.h>
 #include <qlineedit.h>
diff -up ksirk-1.7/ksirk/Dialogs/newGameDialogImpl.cpp~ ksirk-1.7/ksirk/Dialogs/newGameDialogImpl.cpp
--- ksirk-1.7/ksirk/Dialogs/newGameDialogImpl.cpp~	2008-01-08 22:58:50.000000000 +0100
+++ ksirk-1.7/ksirk/Dialogs/newGameDialogImpl.cpp	2008-01-08 22:58:50.000000000 +0100
@@ -2,6 +2,7 @@
 
 #include "GameLogic/onu.h"
 
+#include <stdlib.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
diff -up ksirk-1.7/ksirk/GameLogic/onu.cpp~ ksirk-1.7/ksirk/GameLogic/onu.cpp
--- ksirk-1.7/ksirk/GameLogic/onu.cpp~	2008-01-08 23:01:52.000000000 +0100
+++ ksirk-1.7/ksirk/GameLogic/onu.cpp	2008-01-08 23:01:52.000000000 +0100
@@ -15,6 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 #define KDE_NO_COMPAT
+#include <stdlib.h>
 #include <qfile.h>
 #include <qdom.h>
 #include <qpainter.h>
diff -up ksirk-1.7/ksirk/GameLogic/aiColsonPlayer.cpp~ ksirk-1.7/ksirk/GameLogic/aiColsonPlayer.cpp
--- ksirk-1.7/ksirk/GameLogic/aiColsonPlayer.cpp~	2008-01-08 22:58:00.000000000 +0100
+++ ksirk-1.7/ksirk/GameLogic/aiColsonPlayer.cpp	2008-01-08 22:58:00.000000000 +0100
@@ -19,6 +19,7 @@
 #include "aiplayerio.h"
 
 #include <assert.h>
+#include <limits>
 
 namespace Ksirk
 {
diff -up ksirk-1.7/ksirk/GameLogic/aiplayer.cpp~ ksirk-1.7/ksirk/GameLogic/aiplayer.cpp
--- ksirk-1.7/ksirk/GameLogic/aiplayer.cpp~	2008-01-08 23:00:02.000000000 +0100
+++ ksirk-1.7/ksirk/GameLogic/aiplayer.cpp	2008-01-08 23:00:02.000000000 +0100
@@ -37,6 +37,7 @@
 
 
 /* Includes for the STL */
+#include <limits>
 #include <utility>
 #include <map>
 
diff -up ksirk-1.7/ksirk/Sprites/skinSpritesData.cpp~ ksirk-1.7/ksirk/Sprites/skinSpritesData.cpp
--- ksirk-1.7/ksirk/Sprites/skinSpritesData.cpp~	2008-01-08 23:02:24.000000000 +0100
+++ ksirk-1.7/ksirk/Sprites/skinSpritesData.cpp	2008-01-08 23:02:38.000000000 +0100
@@ -12,6 +12,7 @@
 #include "skinSpritesData.h"
 #include "kdebug.h"
 
+#include <stdlib.h>
 #include <qmessagebox.h>
 
 #include <klocale.h>


Index: ksirk.spec
===================================================================
RCS file: /cvs/extras/rpms/ksirk/devel/ksirk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ksirk.spec	2 Dec 2007 16:01:34 -0000	1.3
+++ ksirk.spec	8 Jan 2008 22:04:39 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           ksirk
 Version:        1.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Turnbased multiplayer board strategy game (conquer the world!)
 Group:          Amusements/Games
 License:        GPLv2
 URL:            http://home.gna.org/ksirk/index.shtml
 Source0:        http://download.gna.org/ksirk/%{name}-%{version}.tar.bz2
 Patch0:         ksirk-1.7-desktop.patch
+Patch1:         ksirk-1.7-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  kdelibs3-devel kdegames3-devel python gettext
 Requires:       hicolor-icon-theme
@@ -21,6 +22,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -80,6 +82,9 @@
 
 
 %changelog
+* Tue Jan  8 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-5
+- Fix building with gcc 4.3
+
 * Sun Dec  2 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.7-4
 - BuildRequire kdegames3-devel instead of kdegames-devel as that now is
   kde4 based, and we need kde 3