rpms/scorched3d/devel scorched3d-41.1-gcc43.patch, NONE, 1.1 scorched3d.spec, 1.27, 1.28

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	scorched3d.spec 
Added Files:
	scorched3d-41.1-gcc43.patch 
Log Message:
* Fri Jan 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 41.1-2
- Fix compilation with gcc 4.3


scorched3d-41.1-gcc43.patch:

--- NEW FILE scorched3d-41.1-gcc43.patch ---
diff -up scorched/src/common/DefinesFile.cpp~ scorched/src/common/DefinesFile.cpp
--- scorched/src/common/DefinesFile.cpp~	2008-01-11 22:13:08.000000000 +0100
+++ scorched/src/common/DefinesFile.cpp	2008-01-11 22:13:08.000000000 +0100
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <string>
 #include <common/DefinesFile.h>
 #include <sys/types.h>
diff -up scorched/src/common/main.h~ scorched/src/common/main.h
--- scorched/src/common/main.h~	2008-01-11 22:06:02.000000000 +0100
+++ scorched/src/common/main.h	2008-01-11 22:06:02.000000000 +0100
@@ -25,6 +25,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include <stdlib.h>
 
 static ARGParser aParser;
 char scorched3dAppName[128];
@@ -40,7 +41,7 @@ int _matherr(struct _exception  *e)
 void _no_storage()
 {
 	printf("Failed to allocate memory!!");
-	std::exit(1);
+	exit(1);
 }
 
 void run_main(int argc, char *argv[], OptionsParameters &params)
diff -up scorched/src/common/sha2.h~ scorched/src/common/sha2.h
--- scorched/src/common/sha2.h~	2008-01-11 22:15:38.000000000 +0100
+++ scorched/src/common/sha2.h	2008-01-11 22:15:38.000000000 +0100
@@ -45,6 +45,7 @@
 #define __SHA2C_H__
 
 #include <string>
+#include <cstring>
 #include <stdexcept>
 
 // NOTE: You may need to define things by hand for your system: 
diff -up scorched/src/common/LoggerI.cpp~ scorched/src/common/LoggerI.cpp
--- scorched/src/common/LoggerI.cpp~	2008-01-11 22:13:48.000000000 +0100
+++ scorched/src/common/LoggerI.cpp	2008-01-11 22:13:48.000000000 +0100
@@ -20,6 +20,7 @@
 
 #include <common/LoggerI.h>
 #include <time.h>
+#include <string.h>
 
 LoggerInfo::LoggerInfo(
 	const char *message, 


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- scorched3d.spec	7 Nov 2007 08:11:05 -0000	1.27
+++ scorched3d.spec	11 Jan 2008 21:28:34 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        41.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -16,6 +16,7 @@
 Patch2:         %{name}-help.patch
 # From upstream CVS
 Patch3:         %{name}-41.1-64bit.patch
+Patch4:         %{name}-41.1-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel
 BuildRequires:  expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel
@@ -46,6 +47,7 @@
 %patch1 -p1 -z .syslibs
 %patch2 -p1 -z .help
 %patch3 -p1 -z .64bit
+%patch4 -p1 -z .gcc43
 iconv -f ISO-8859-1 -t UTF8 AUTHORS > AUTHORS.tmp
 mv AUTHORS.tmp AUTHORS
 # make rpmlint happy with debuginfo package
@@ -107,6 +109,9 @@
 
 
 %changelog
+* Fri Jan 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 41.1-2
+- Fix compilation with gcc 4.3
+
 * Tue Nov  6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 41.1-1
 - New upstream release 41.1