Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Eric Sandall (852bdf8198a9d5827237ce6cd90da7e3912e95ec)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Eric Sandall (852bdf8198a9d5827237ce6cd90da7e3912e95ec)
  • Date: Tue, 3 Jun 2008 16:59:54 -0500

GIT changes to master games grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

.gitignore | 2 ++
games-strategy-rts/glob2/HISTORY | 5 +++++
games-strategy-rts/glob2/PRE_BUILD | 3 +++
games-strategy-rts/glob2/gcc43.patch | 30 ++++++++++++++++++++++++++++++
4 files changed, 40 insertions(+)

New commits:
commit 852bdf8198a9d5827237ce6cd90da7e3912e95ec
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gitignore: Add {version,keyword}.index to ignore

commit d540c815a650a420c0ef3aae05e946a4ec5bf7d0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

glob2: Fix compilation with GCC 4.3 (patch from Debian)

diff --git a/.gitignore b/.gitignore
index b61a969..ad1b851 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
provides.index
codex.index
+version.index
+keyword.index
GRIMOIRE
*~
diff --git a/games-strategy-rts/glob2/HISTORY
b/games-strategy-rts/glob2/HISTORY
index 9d76308..fff25c0 100644
--- a/games-strategy-rts/glob2/HISTORY
+++ b/games-strategy-rts/glob2/HISTORY
@@ -1,3 +1,8 @@
+2008-06-03 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Fix GCC 4.3 compilation
+ From http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=479872
+
2008-05-04 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 0.9.3
* DEPENDS: added sub_depends for boost
diff --git a/games-strategy-rts/glob2/PRE_BUILD
b/games-strategy-rts/glob2/PRE_BUILD
new file mode 100755
index 0000000..2a1daf1
--- /dev/null
+++ b/games-strategy-rts/glob2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/games-strategy-rts/glob2/gcc43.patch
b/games-strategy-rts/glob2/gcc43.patch
new file mode 100644
index 0000000..38865fb
--- /dev/null
+++ b/games-strategy-rts/glob2/gcc43.patch
@@ -0,0 +1,30 @@
+#
+# Fix GCC 4.3 compilation
+# From http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=479872
+#
+Index: libgag/include/FileManager.h
+===================================================================
+--- libgag/include/FileManager.h
++++ libgag/include/FileManager.h
+@@ -24,6 +24,7 @@
+ #include <vector>
+ #include <fstream>
+ #include <string>
++#include <ctime>
+
+ //! this is the host filesystem directory separator
+ #ifndef DIR_SEPARATOR
+
+Index: src/FertilityCalculatorThreadMessage.cpp
+===================================================================
+--- src/FertilityCalculatorThreadMessage.cpp.orig 2008-05-20
01:18:24.913717892 +0200
++++ src/FertilityCalculatorThreadMessage.cpp 2008-05-20 01:18:33.466469496
+0200
+@@ -19,6 +19,7 @@
+ #include "FertilityCalculatorThreadMessage.h"
+
+ #include <sstream>
++#include <typeinfo>
+
+ FCTUpdateCompletionPercent::FCTUpdateCompletionPercent(float percent)
+ : percent(percent)
+



  • [SM-Commit] GIT changes to master games grimoire by Eric Sandall (852bdf8198a9d5827237ce6cd90da7e3912e95ec), Eric Sandall, 06/03/2008

Archive powered by MHonArc 2.6.24.

Top of Page