diff --git a/bzflag-2.0.10-gcc-4.3.patch b/bzflag-2.0.10-gcc-4.3.patch deleted file mode 100644 index 28855e3..0000000 --- a/bzflag-2.0.10-gcc-4.3.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff -up bzflag-2.0.10/include/common.h.gcc-4.3 bzflag-2.0.10/include/common.h ---- bzflag-2.0.10/include/common.h.gcc-4.3 2007-11-15 23:11:33.000000000 +0100 -+++ bzflag-2.0.10/include/common.h 2008-02-22 17:51:08.000000000 +0100 -@@ -33,9 +33,12 @@ - - #include - #include /* needed for bzfrand */ --#include - #ifdef __cplusplus - # include -+# include -+#else -+# include -+# include - #endif - - -diff -up bzflag-2.0.10/plugins/logDetail/logDetail.cpp.gcc-4.3 bzflag-2.0.10/plugins/logDetail/logDetail.cpp ---- bzflag-2.0.10/plugins/logDetail/logDetail.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100 -+++ bzflag-2.0.10/plugins/logDetail/logDetail.cpp 2008-02-22 18:11:32.000000000 +0100 -@@ -13,6 +13,7 @@ - // logDetail.cpp : Plugin module for logging server events to stdout - // - -+#include - #include - #include - #include "bzfsAPI.h" -diff -up bzflag-2.0.10/plugins/rabidRabbit/rabidRabbit.cpp.gcc-4.3 bzflag-2.0.10/plugins/rabidRabbit/rabidRabbit.cpp ---- bzflag-2.0.10/plugins/rabidRabbit/rabidRabbit.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100 -+++ bzflag-2.0.10/plugins/rabidRabbit/rabidRabbit.cpp 2008-02-22 20:55:32.000000000 +0100 -@@ -4,7 +4,8 @@ - #include - #include - #include --#include -+#include -+#include - - BZ_GET_PLUGIN_VERSION - -diff -up bzflag-2.0.10/plugins/teamflagreset/teamflagreset.cpp.gcc-4.3 bzflag-2.0.10/plugins/teamflagreset/teamflagreset.cpp ---- bzflag-2.0.10/plugins/teamflagreset/teamflagreset.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100 -+++ bzflag-2.0.10/plugins/teamflagreset/teamflagreset.cpp 2008-02-22 20:57:02.000000000 +0100 -@@ -1,6 +1,7 @@ - // teamflagreset.cpp : Defines the entry point for the DLL application. - - #include "bzfsAPI.h" -+#include - - BZ_GET_PLUGIN_VERSION - -diff -up bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp.gcc-4.3 bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp ---- bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100 -+++ bzflag-2.0.10/plugins/HoldTheFlag/HoldTheFlag.cpp 2008-02-22 17:51:08.000000000 +0100 -@@ -5,6 +5,8 @@ - - #include "bzfsAPI.h" - #include -+#include -+#include - #include - - BZ_GET_PLUGIN_VERSION -diff -up bzflag-2.0.10/plugins/keepaway/keepaway.cpp.gcc-4.3 bzflag-2.0.10/plugins/keepaway/keepaway.cpp ---- bzflag-2.0.10/plugins/keepaway/keepaway.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100 -+++ bzflag-2.0.10/plugins/keepaway/keepaway.cpp 2008-02-22 18:09:18.000000000 +0100 -@@ -1,6 +1,7 @@ - // keepaway.cpp : Defines the entry point for the DLL application. - - #include "bzfsAPI.h" -+#include - #include - #include - #include -diff -up bzflag-2.0.10/plugins/rabbitTimer/rabbitTimer.cpp.gcc-4.3 bzflag-2.0.10/plugins/rabbitTimer/rabbitTimer.cpp ---- bzflag-2.0.10/plugins/rabbitTimer/rabbitTimer.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100 -+++ bzflag-2.0.10/plugins/rabbitTimer/rabbitTimer.cpp 2008-02-22 20:59:59.000000000 +0100 -@@ -2,6 +2,7 @@ - // - - #include "bzfsAPI.h" -+#include - - BZ_GET_PLUGIN_VERSION - -diff -up bzflag-2.0.10/plugins/timedctf/timedctf.cpp.gcc-4.3 bzflag-2.0.10/plugins/timedctf/timedctf.cpp ---- bzflag-2.0.10/plugins/timedctf/timedctf.cpp.gcc-4.3 2008-02-22 20:58:31.000000000 +0100 -+++ bzflag-2.0.10/plugins/timedctf/timedctf.cpp 2008-02-22 20:58:05.000000000 +0100 -@@ -1,6 +1,7 @@ - // timedctf.cpp : Defines the entry point for the DLL application. - - #include "bzfsAPI.h" -+#include - - BZ_GET_PLUGIN_VERSION - -diff -up bzflag-2.0.10/plugins/wwzones/wwzones.cpp.gcc-4.3 bzflag-2.0.10/plugins/wwzones/wwzones.cpp ---- bzflag-2.0.10/plugins/wwzones/wwzones.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100 -+++ bzflag-2.0.10/plugins/wwzones/wwzones.cpp 2008-02-22 21:01:47.000000000 +0100 -@@ -1,6 +1,7 @@ - // wwzones.cpp : Defines the entry point for the DLL application. - - #include "bzfsAPI.h" -+#include - #include - #include - #include -diff -up bzflag-2.0.10/plugins/airspawn/airspawn.cpp.gcc-4.3 bzflag-2.0.10/plugins/airspawn/airspawn.cpp ---- bzflag-2.0.10/plugins/airspawn/airspawn.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100 -+++ bzflag-2.0.10/plugins/airspawn/airspawn.cpp 2008-02-22 18:07:27.000000000 +0100 -@@ -3,6 +3,7 @@ - - - #include "bzfsAPI.h" -+#include - #include - #include - -diff -up bzflag-2.0.10/plugins/nagware/nagware.cpp.gcc-4.3 bzflag-2.0.10/plugins/nagware/nagware.cpp ---- bzflag-2.0.10/plugins/nagware/nagware.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100 -+++ bzflag-2.0.10/plugins/nagware/nagware.cpp 2008-02-22 18:12:17.000000000 +0100 -@@ -3,6 +3,8 @@ - // $Id: nagware.cpp 16200 2007-11-15 17:31:43Z JeffM2501 $ - - #include "bzfsAPI.h" -+#include -+#include - #include - - BZ_GET_PLUGIN_VERSION -diff -up bzflag-2.0.10/plugins/flagStay/flagStay.cpp.gcc-4.3 bzflag-2.0.10/plugins/flagStay/flagStay.cpp ---- bzflag-2.0.10/plugins/flagStay/flagStay.cpp.gcc-4.3 2007-11-15 23:11:31.000000000 +0100 -+++ bzflag-2.0.10/plugins/flagStay/flagStay.cpp 2008-02-22 18:08:30.000000000 +0100 -@@ -2,6 +2,7 @@ - // - - #include "bzfsAPI.h" -+#include - #include - #include - #include -diff -up bzflag-2.0.10/plugins/koth/koth.cpp.gcc-4.3 bzflag-2.0.10/plugins/koth/koth.cpp ---- bzflag-2.0.10/plugins/koth/koth.cpp.gcc-4.3 2007-11-15 23:11:30.000000000 +0100 -+++ bzflag-2.0.10/plugins/koth/koth.cpp 2008-02-22 18:10:10.000000000 +0100 -@@ -1,6 +1,7 @@ - // koth.cpp : Defines the entry point for the DLL application. - - #include "bzfsAPI.h" -+#include - #include - #include - #include -diff -up bzflag-2.0.10/plugins/torBlock/torBlock.cpp.gcc-4.3 bzflag-2.0.10/plugins/torBlock/torBlock.cpp ---- bzflag-2.0.10/plugins/torBlock/torBlock.cpp.gcc-4.3 2008-02-22 21:01:08.000000000 +0100 -+++ bzflag-2.0.10/plugins/torBlock/torBlock.cpp 2008-02-22 21:00:52.000000000 +0100 -@@ -2,6 +2,7 @@ - // - - #include "bzfsAPI.h" -+#include - #include - #include - #include diff --git a/bzflag-2.0.12-gcc-4.4.patch b/bzflag-2.0.12-gcc-4.4.patch new file mode 100644 index 0000000..231a838 --- /dev/null +++ b/bzflag-2.0.12-gcc-4.4.patch @@ -0,0 +1,221 @@ +diff -up bzflag-2.0.12/include/common.h.gcc-4.4 bzflag-2.0.12/include/common.h +--- bzflag-2.0.12/include/common.h.gcc-4.4 2008-04-06 07:30:59.000000000 +0200 ++++ bzflag-2.0.12/include/common.h 2008-12-22 17:28:01.000000000 +0100 +@@ -33,9 +33,12 @@ + + #include + #include /* needed for bzfrand */ +-#include + #ifdef __cplusplus + # include ++# include ++#else ++# include ++# include + #endif + + +diff -up bzflag-2.0.12/plugins/airspawn/airspawn.cpp.gcc-4.4 bzflag-2.0.12/plugins/airspawn/airspawn.cpp +--- bzflag-2.0.12/plugins/airspawn/airspawn.cpp.gcc-4.4 2007-09-11 00:13:24.000000000 +0200 ++++ bzflag-2.0.12/plugins/airspawn/airspawn.cpp 2008-12-22 17:28:01.000000000 +0100 +@@ -3,6 +3,7 @@ + + + #include "bzfsAPI.h" ++#include + #include + #include + +diff -up bzflag-2.0.12/plugins/flagStay/flagStay.cpp.gcc-4.4 bzflag-2.0.12/plugins/flagStay/flagStay.cpp +--- bzflag-2.0.12/plugins/flagStay/flagStay.cpp.gcc-4.4 2007-09-11 00:13:24.000000000 +0200 ++++ bzflag-2.0.12/plugins/flagStay/flagStay.cpp 2008-12-22 17:28:01.000000000 +0100 +@@ -2,6 +2,7 @@ + // + + #include "bzfsAPI.h" ++#include + #include + #include + #include +diff -up bzflag-2.0.12/plugins/HoldTheFlag/HoldTheFlag.cpp.gcc-4.4 bzflag-2.0.12/plugins/HoldTheFlag/HoldTheFlag.cpp +--- bzflag-2.0.12/plugins/HoldTheFlag/HoldTheFlag.cpp.gcc-4.4 2007-10-27 10:53:51.000000000 +0200 ++++ bzflag-2.0.12/plugins/HoldTheFlag/HoldTheFlag.cpp 2009-03-02 15:34:07.141548486 +0100 +@@ -5,6 +5,9 @@ + + #include "bzfsAPI.h" + #include ++#include ++#include ++#include + #include + + BZ_GET_PLUGIN_VERSION +diff -up bzflag-2.0.12/plugins/keepaway/keepaway.cpp.gcc-4.4 bzflag-2.0.12/plugins/keepaway/keepaway.cpp +--- bzflag-2.0.12/plugins/keepaway/keepaway.cpp.gcc-4.4 2007-10-27 10:53:50.000000000 +0200 ++++ bzflag-2.0.12/plugins/keepaway/keepaway.cpp 2008-12-22 17:28:01.000000000 +0100 +@@ -1,6 +1,7 @@ + // keepaway.cpp : Defines the entry point for the DLL application. + + #include "bzfsAPI.h" ++#include + #include + #include + #include +diff -up bzflag-2.0.12/plugins/koth/koth.cpp.gcc-4.4 bzflag-2.0.12/plugins/koth/koth.cpp +--- bzflag-2.0.12/plugins/koth/koth.cpp.gcc-4.4 2007-10-27 10:53:50.000000000 +0200 ++++ bzflag-2.0.12/plugins/koth/koth.cpp 2008-12-22 17:28:01.000000000 +0100 +@@ -1,6 +1,7 @@ + // koth.cpp : Defines the entry point for the DLL application. + + #include "bzfsAPI.h" ++#include + #include + #include + #include +diff -up bzflag-2.0.12/plugins/logDetail/logDetail.cpp.gcc-4.4 bzflag-2.0.12/plugins/logDetail/logDetail.cpp +--- bzflag-2.0.12/plugins/logDetail/logDetail.cpp.gcc-4.4 2008-04-24 23:08:49.000000000 +0200 ++++ bzflag-2.0.12/plugins/logDetail/logDetail.cpp 2008-12-22 17:28:01.000000000 +0100 +@@ -13,6 +13,7 @@ + // logDetail.cpp : Plugin module for logging server events to stdout + // + ++#include + #include + #include + #include "bzfsAPI.h" +diff -up bzflag-2.0.12/plugins/nagware/nagware.cpp.gcc-4.4 bzflag-2.0.12/plugins/nagware/nagware.cpp +--- bzflag-2.0.12/plugins/nagware/nagware.cpp.gcc-4.4 2007-11-15 23:28:18.000000000 +0100 ++++ bzflag-2.0.12/plugins/nagware/nagware.cpp 2009-03-02 15:49:58.962903218 +0100 +@@ -3,6 +3,9 @@ + // $Id: nagware.cpp 16200 2007-11-15 17:31:43Z JeffM2501 $ + + #include "bzfsAPI.h" ++#include ++#include ++#include + #include + + BZ_GET_PLUGIN_VERSION +@@ -485,25 +488,33 @@ char *strtrim (char *s){ + } + + MsgEnt * parseCfgMessage(const char *m){ +- char *p; ++ char *p, *new_m; + int time, repeat=0; ++ MsgEnt *retval = NULL; ++ ++ new_m = (char *)malloc (strlen (m)); ++ strcpy (new_m, m); + +- if ((p = strchr (m, ' ')) == NULL) +- return NULL; ++ if ((p = strchr (new_m, ' ')) == NULL) ++ goto fail; + *p = '\0'; +- if (strchr (m, ',') != NULL){ +- if (sscanf (m, "%d,%d", &time, &repeat) != 2) +- return NULL; ++ if (strchr (new_m, ',') != NULL){ ++ if (sscanf (new_m, "%d,%d", &time, &repeat) != 2) ++ goto fail; + } else { +- if (sscanf (m, "%d", &time) != 1) +- return NULL; ++ if (sscanf (new_m, "%d", &time) != 1) ++ goto fail; + } + if (time<0 || time > 500 || repeat < 0 || repeat > 1000) +- return NULL; ++ goto fail; + + // TODO: check linelen < 128 + +- return new MsgEnt (time*TIME_FACTOR, repeat*TIME_FACTOR, p+1); ++ retval = new MsgEnt (time*TIME_FACTOR, repeat*TIME_FACTOR, p+1); ++ ++fail: ++ free (new_m); ++ return retval; + } + + +diff -up bzflag-2.0.12/plugins/rabbitTimer/rabbitTimer.cpp.gcc-4.4 bzflag-2.0.12/plugins/rabbitTimer/rabbitTimer.cpp +--- bzflag-2.0.12/plugins/rabbitTimer/rabbitTimer.cpp.gcc-4.4 2007-09-20 21:48:54.000000000 +0200 ++++ bzflag-2.0.12/plugins/rabbitTimer/rabbitTimer.cpp 2008-12-22 17:28:01.000000000 +0100 +@@ -2,6 +2,7 @@ + // + + #include "bzfsAPI.h" ++#include + + BZ_GET_PLUGIN_VERSION + +diff -up bzflag-2.0.12/plugins/rabidRabbit/rabidRabbit.cpp.gcc-4.4 bzflag-2.0.12/plugins/rabidRabbit/rabidRabbit.cpp +--- bzflag-2.0.12/plugins/rabidRabbit/rabidRabbit.cpp.gcc-4.4 2007-10-27 10:53:51.000000000 +0200 ++++ bzflag-2.0.12/plugins/rabidRabbit/rabidRabbit.cpp 2008-12-22 17:28:01.000000000 +0100 +@@ -4,7 +4,8 @@ + #include + #include + #include +-#include ++#include ++#include + + BZ_GET_PLUGIN_VERSION + +diff -up bzflag-2.0.12/plugins/recordmatch/recordmatch.cpp.gcc-4.4 bzflag-2.0.12/plugins/recordmatch/recordmatch.cpp +--- bzflag-2.0.12/plugins/recordmatch/recordmatch.cpp.gcc-4.4 2009-03-02 15:51:00.115553228 +0100 ++++ bzflag-2.0.12/plugins/recordmatch/recordmatch.cpp 2009-03-02 15:51:15.233550713 +0100 +@@ -2,6 +2,7 @@ + // + + #include "bzfsAPI.h" ++#include + + class GameStartEndHandler : public bz_EventHandler + { +diff -up bzflag-2.0.12/plugins/teamflagreset/teamflagreset.cpp.gcc-4.4 bzflag-2.0.12/plugins/teamflagreset/teamflagreset.cpp +--- bzflag-2.0.12/plugins/teamflagreset/teamflagreset.cpp.gcc-4.4 2007-10-27 10:53:49.000000000 +0200 ++++ bzflag-2.0.12/plugins/teamflagreset/teamflagreset.cpp 2008-12-22 17:28:01.000000000 +0100 +@@ -1,6 +1,7 @@ + // teamflagreset.cpp : Defines the entry point for the DLL application. + + #include "bzfsAPI.h" ++#include + + BZ_GET_PLUGIN_VERSION + +diff -up bzflag-2.0.12/plugins/timedctf/timedctf.cpp.gcc-4.4 bzflag-2.0.12/plugins/timedctf/timedctf.cpp +--- bzflag-2.0.12/plugins/timedctf/timedctf.cpp.gcc-4.4 2007-10-27 10:53:51.000000000 +0200 ++++ bzflag-2.0.12/plugins/timedctf/timedctf.cpp 2008-12-22 17:28:01.000000000 +0100 +@@ -1,6 +1,7 @@ + // timedctf.cpp : Defines the entry point for the DLL application. + + #include "bzfsAPI.h" ++#include + + BZ_GET_PLUGIN_VERSION + +diff -up bzflag-2.0.12/plugins/torBlock/torBlock.cpp.gcc-4.4 bzflag-2.0.12/plugins/torBlock/torBlock.cpp +--- bzflag-2.0.12/plugins/torBlock/torBlock.cpp.gcc-4.4 2007-11-15 23:28:18.000000000 +0100 ++++ bzflag-2.0.12/plugins/torBlock/torBlock.cpp 2008-12-22 17:28:01.000000000 +0100 +@@ -2,6 +2,7 @@ + // + + #include "bzfsAPI.h" ++#include + #include + #include + #include +diff -up bzflag-2.0.12/plugins/wwzones/wwzones.cpp.gcc-4.4 bzflag-2.0.12/plugins/wwzones/wwzones.cpp +--- bzflag-2.0.12/plugins/wwzones/wwzones.cpp.gcc-4.4 2007-10-27 10:53:51.000000000 +0200 ++++ bzflag-2.0.12/plugins/wwzones/wwzones.cpp 2008-12-22 17:28:01.000000000 +0100 +@@ -1,6 +1,7 @@ + // wwzones.cpp : Defines the entry point for the DLL application. + + #include "bzfsAPI.h" ++#include + #include + #include + #include diff --git a/bzflag.spec b/bzflag.spec index 1f36c89..aaf8594 100644 --- a/bzflag.spec +++ b/bzflag.spec @@ -40,7 +40,7 @@ URL: http://bzflag.org Source0: http://downloads.sourceforge.net/bzflag/bzflag-%{version}%{?date:.%{date}}.tar.bz2 Source1: bzflag.desktop Patch0: bzflag-2.0.4-lookup.patch -Patch1: bzflag-2.0.10-gcc-4.3.patch +Patch1: bzflag-2.0.12-gcc-4.4.patch Patch2: bzflag-2.0.12-findresolutions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) %if %{with modular_x} @@ -92,7 +92,7 @@ There are two main styles of play: capture-the-flag and free-for-all. %prep %setup -q -n %{name}-%{version}%{?date:.%{date}} %patch0 -p1 -b .lookup -%patch1 -p1 -b .gcc-4.3 +%patch1 -p1 -b .gcc-4.4 %patch2 -p1 -b .findresolutions %build @@ -149,7 +149,10 @@ rm -rf %{buildroot} %{_mandir}/man*/* %changelog -* Mon Feb 23 2009 Fedora Release Engineering - 2.0.12-5 +* Mon Mar 02 2009 Nils Philippsen 2.0.12-5 +- fix building with gcc-4.4 + +* Mon Feb 23 2009 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Mon Dec 22 2008 Nils Philippsen 2.0.12-4