[SM-Commit] GIT changes to master games grimoire by Julien ROZO (0ae0655855707044599774bc5958d1b71fcc18aa)

Julien ROZO scm at sourcemage.org
Tue Oct 7 16:40:39 EDT 2008


GIT changes to master games grimoire by Julien ROZO <julien at rozo.org>:

 games-strategy-rts/boswars/HISTORY     |    5 +++++
 games-strategy-rts/boswars/PRE_BUILD   |    3 ++-
 games-strategy-rts/boswars/gcc43.patch |   23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

New commits:
commit 0ae0655855707044599774bc5958d1b71fcc18aa
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    boswars: added gcc43.patch to fix compilation issue with gcc 4.3.x (fixes bug #14629)

diff --git a/games-strategy-rts/boswars/HISTORY b/games-strategy-rts/boswars/HISTORY
index 58b0c96..b0e44b0 100644
--- a/games-strategy-rts/boswars/HISTORY
+++ b/games-strategy-rts/boswars/HISTORY
@@ -1,3 +1,8 @@
+2008-10-07 Julien "_kaze_" ROZO <julien at rozo.org>
+	* gcc43.patch: added, fixes compilation issue with gcc 4.3.x
+	  (fixes bug #14629)
+	* PRE_BUILD: applies gcc43.patch
+
 2008-03-02 Dale E. Edmons <linuxfan at sourcemage.org>
 	* BUILD: Updated to version 2.5
 	* INSTALL: Removed install of video/; Added intro/.
diff --git a/games-strategy-rts/boswars/PRE_BUILD b/games-strategy-rts/boswars/PRE_BUILD
index bb1d626..022e838 100755
--- a/games-strategy-rts/boswars/PRE_BUILD
+++ b/games-strategy-rts/boswars/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build     &&
 cd $SOURCE_DIRECTORY  &&
 # unbreaking a broken scons *grumbl*
 
-sedit "205s:env.Append(CCFLAGS = Split(.*:env.Append(CCFLAGS = Split('$CFLAGS')):" SConstruct
+sedit "205s:env.Append(CCFLAGS = Split(.*:env.Append(CCFLAGS = Split('$CFLAGS')):" SConstruct  &&
+patch -p0 < $SPELL_DIRECTORY/gcc43.patch
diff --git a/games-strategy-rts/boswars/gcc43.patch b/games-strategy-rts/boswars/gcc43.patch
new file mode 100644
index 0000000..3d5f5c0
--- /dev/null
+++ b/games-strategy-rts/boswars/gcc43.patch
@@ -0,0 +1,23 @@
+--- engine/stratagus/stratagus.cpp	2008-03-01 21:15:36.000000000 +0100
++++ engine/stratagus/stratagus2.cpp	2008-09-27 23:11:53.000000000 +0200
+@@ -160,6 +160,9 @@
+ #include <time.h>
+ #include <ctype.h>
+ #include <sstream>
++#include <algorithm>
++#include <streambuf>
++#include <vector>
+ 
+ #ifndef _MSC_VER
+ #include <unistd.h>
+--- engine/pathfinder/astar.cpp	2008-03-01 21:15:35.000000000 +0100
++++ engine/pathfinder/astar2.cpp 2008-09-27 22:15:30.000000000 +0200
+@@ -32,7 +32,7 @@
+ /*----------------------------------------------------------------------------
+ --  Includes
+ ----------------------------------------------------------------------------*/
+-
++#include "stdlib.h"
+ #include "stratagus.h"
+ #include "pathfinder.h"
+ 



More information about the SM-Commit mailing list