diff --git a/scorched3d-41.1-gcc43.patch b/scorched3d-41.1-gcc43.patch new file mode 100644 index 0000000..8b70f1e --- /dev/null +++ b/scorched3d-41.1-gcc43.patch @@ -0,0 +1,53 @@ +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 + #include ++#include + #include + #include + #include +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 + #endif ++#include + + 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 ¶ms) +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 ++#include + #include + + // 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 + #include ++#include + + LoggerInfo::LoggerInfo( + const char *message, diff --git a/scorched3d.spec b/scorched3d.spec index 65c7b57..153bed3 100644 --- a/scorched3d.spec +++ b/scorched3d.spec @@ -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 @@ Patch1: %{name}-syslibs.patch 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 @@ rm `find src/XML ! -name "X*"` %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 @@ fi %changelog +* Fri Jan 11 2008 Hans de Goede 41.1-2 +- Fix compilation with gcc 4.3 + * Tue Nov 6 2007 Hans de Goede 41.1-1 - New upstream release 41.1