rpms/rafkill/devel rafkill-1.2.2-gcc43.patch, NONE, 1.1 rafkill.spec, 1.7, 1.8

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	rafkill.spec 
Added Files:
	rafkill-1.2.2-gcc43.patch 
Log Message:
* Wed Jan  9 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-6
- Fix building with gcc 4.3


rafkill-1.2.2-gcc43.patch:

--- NEW FILE rafkill-1.2.2-gcc43.patch ---
diff -up rafkill-1.2.2/src/system.cpp~ rafkill-1.2.2/src/system.cpp
--- rafkill-1.2.2/src/system.cpp~	2008-01-09 13:35:04.000000000 +0100
+++ rafkill-1.2.2/src/system.cpp	2008-01-09 13:35:04.000000000 +0100
@@ -1,4 +1,5 @@
 #include "system.h"
+#include <string.h>
 #include <strings.h>
 #include <string>
 
diff -up rafkill-1.2.2/src/drawer.cpp~ rafkill-1.2.2/src/drawer.cpp
--- rafkill-1.2.2/src/drawer.cpp~	2008-01-09 13:29:30.000000000 +0100
+++ rafkill-1.2.2/src/drawer.cpp	2008-01-09 13:29:30.000000000 +0100
@@ -11,6 +11,7 @@
 #include "trigtable.h"
 #include "pck.h"
 #include <iostream>
+#include <cstring>
 
 /* TODO:
  * Add weapon icons to HUD
diff -up rafkill-1.2.2/src/menu.cpp~ rafkill-1.2.2/src/menu.cpp
--- rafkill-1.2.2/src/menu.cpp~	2008-01-09 13:32:10.000000000 +0100
+++ rafkill-1.2.2/src/menu.cpp	2008-01-09 13:32:10.000000000 +0100
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include "defs.h"
 #include "menu.h"
 #include "loadsave.h"
diff -up rafkill-1.2.2/src/loadsave.cpp~ rafkill-1.2.2/src/loadsave.cpp
--- rafkill-1.2.2/src/loadsave.cpp~	2008-01-09 13:30:50.000000000 +0100
+++ rafkill-1.2.2/src/loadsave.cpp	2008-01-09 13:31:17.000000000 +0100
@@ -3,6 +3,8 @@
 
 #include "loadsave.h"
 #include <stdio.h>
+#include <string.h>
+#include <strings.h>
 #include "spaceobj.h"
 #include "strings.h"
 #include <string>
diff -up rafkill-1.2.2/src/guns/gun_saber.cpp~ rafkill-1.2.2/src/guns/gun_saber.cpp
--- rafkill-1.2.2/src/guns/gun_saber.cpp~	2008-01-09 14:36:38.000000000 +0100
+++ rafkill-1.2.2/src/guns/gun_saber.cpp	2008-01-09 14:36:38.000000000 +0100
@@ -6,6 +6,7 @@
 #include "spaceobj.h"
 #include "ebox.h"
 #include <vector>
+#include <stdlib.h>
 
 using namespace std;
 
diff -up rafkill-1.2.2/src/guns/gun_findgun.cpp~ rafkill-1.2.2/src/guns/gun_findgun.cpp
--- rafkill-1.2.2/src/guns/gun_findgun.cpp~	2008-01-09 14:34:44.000000000 +0100
+++ rafkill-1.2.2/src/guns/gun_findgun.cpp	2008-01-09 14:34:44.000000000 +0100
@@ -7,6 +7,7 @@
 #include "spaceobj.h"
 #include <vector>
 #include <math.h>
+#include <stdlib.h>
 
 using namespace std;
 
diff -up rafkill-1.2.2/src/guns/gun_machine_circle.cpp~ rafkill-1.2.2/src/guns/gun_machine_circle.cpp
--- rafkill-1.2.2/src/guns/gun_machine_circle.cpp~	2008-01-09 14:35:20.000000000 +0100
+++ rafkill-1.2.2/src/guns/gun_machine_circle.cpp	2008-01-09 14:35:20.000000000 +0100
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include "gunobj.h"
 #include "gun_machine_circle.h"
 #include "weaponobj.h"
diff -up rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp~ rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp
--- rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp~	2008-01-09 14:37:55.000000000 +0100
+++ rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp	2008-01-09 14:37:55.000000000 +0100
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include "defs.h"
 #include "bitmap.h"
 #include "hull_weapon.h"
diff -up rafkill-1.2.2/src/weapons/weapon_follow.cpp~ rafkill-1.2.2/src/weapons/weapon_follow.cpp
--- rafkill-1.2.2/src/weapons/weapon_follow.cpp~	2008-01-09 13:36:18.000000000 +0100
+++ rafkill-1.2.2/src/weapons/weapon_follow.cpp	2008-01-09 13:36:18.000000000 +0100
@@ -4,6 +4,7 @@
 #include "hulls/hull_weapon_follow.h"
 #include "spaceobj.h"
 #include <vector>
+#include <stdlib.h>
 
 using namespace std;
 


Index: rafkill.spec
===================================================================
RCS file: /cvs/extras/rpms/rafkill/devel/rafkill.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rafkill.spec	15 Aug 2007 09:03:12 -0000	1.7
+++ rafkill.spec	9 Jan 2008 14:41:22 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           rafkill
 Version:        1.2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Top-down shooter with powerups
 Group:          Amusements/Games
 License:        GPL+
@@ -12,6 +12,7 @@
 Patch0:         rafkill-1.2.2-spell.patch
 Patch1:         rafkill-1.2.2-menu.patch
 Patch2:         rafkill-1.2.2-shatter-crash.patch
+Patch3:         rafkill-1.2.2-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel dumb-devel scons desktop-file-utils
 Requires:       hicolor-icon-theme
@@ -27,6 +28,7 @@
 %patch0 -p1 -z .spell
 %patch1 -p1 -z .menu
 %patch2 -p1 -z .shatter
+%patch3 -p1 -z .gcc43
 # sigh hack hack hack
 FLAGS=""
 for i in $RPM_OPT_FLAGS; do
@@ -91,6 +93,9 @@
 
 
 %changelog
+* Wed Jan  9 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-6
+- Fix building with gcc 4.3
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-5
 - Update License tag for new Licensing Guidelines compliance