Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master games grimoire by Eric Sandall (910a57141ef9e471759fd726e36c01a05262bb32)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <eric AT sandall.us>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master games grimoire by Eric Sandall (910a57141ef9e471759fd726e36c01a05262bb32)
  • Date: Wed, 21 Apr 2010 20:26:24 -0700

Quoting Ladislav Hagara <ladislav.hagara AT unob.cz>:


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

ChangeLog | 3 +
games-strategy-rts/glob2/03_headers_order.patch | 22 ++++++++
games-strategy-rts/glob2/HISTORY | 8 +++
games-strategy-rts/glob2/PRE_BUILD | 3 +
games-strategy-rts/globulation2/BUILD | 1
games-strategy-rts/globulation2/DEPENDS | 1
games-strategy-rts/globulation2/DETAILS | 14 -----
games-strategy-rts/globulation2/HISTORY | 63 ------------------------
games-strategy-rts/globulation2/INSTALL | 1
games-strategy-rts/globulation2/PRE_BUILD | 1
games-strategy-rts/globulation2/TRIGGERS | 1
11 files changed, 36 insertions(+), 82 deletions(-)

New commits:
commit 910a57141ef9e471759fd726e36c01a05262bb32
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

globulation2: Remove deprecated spell

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

glob2: Fix compilation with GCC 4.4 (Bug #15266)

From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=553706

diff --git a/ChangeLog b/ChangeLog
index df72e34..6db6f85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-04-20 Eric Sandall <sandalle AT sourcemage.org>
+ * games-strategy-rts/globulation2: Removed deprecated spell
+
2010-03-27 Ismael Luceno <ismael AT sourcemage.org>
* games-rpg-mp/tmw: New Spell, The Mana World, a MMORPG

diff --git a/games-strategy-rts/glob2/03_headers_order.patch b/games-strategy-rts/glob2/03_headers_order.patch
new file mode 100644
index 0000000..c01c4f6
--- /dev/null
+++ b/games-strategy-rts/glob2/03_headers_order.patch
@@ -0,0 +1,22 @@
+# From http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=553706
+With gcc 4.4, compilation of libgag/src/TextStream.cpp
+fails with the error:
+'class GAGCore::StreamBackend' has no member named 'getc'. Reordering
+#include's solves the problem.
+Index: glob2-0.9.4.1/libgag/src/TextStream.cpp
+===================================================================
+--- glob2-0.9.4.1.orig/libgag/src/TextStream.cpp 2009-06-27 20:19:38.000000000 +0400
++++ glob2-0.9.4.1/libgag/src/TextStream.cpp 2009-06-27 20:20:22.000000000 +0400
+@@ -17,11 +17,11 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <TextStream.h>
+ #include <assert.h>
+ #include <fstream>
+ #include <iostream>
+ #include <stack>
++#include <TextStream.h>
+ #ifdef WIN32
+ #define snprintf _snprintf
+ #define vsnprintf _vsnprintf
diff --git a/games-strategy-rts/glob2/HISTORY b/games-strategy-rts/glob2/HISTORY
index f553313..43053e8 100644
--- a/games-strategy-rts/glob2/HISTORY
+++ b/games-strategy-rts/glob2/HISTORY
@@ -1,3 +1,11 @@
+2010-04-20 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply 03_headers_order.patch (Bug #15266)
+ * 03_headers_order.patch: From
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=553706
+
+2010-04-20 Eric Sandall <sandalle AT sourcemage.org>
+ * audio-libs/mp4v2: Added a recent MP4 library
+


Yea, but into test grimoire. :-)

Bah, I really need to find what's up with my KDE. :( Thanks again.

-sandalle

--
Eric Sandall | Source Mage GNU/Linux Developer
eric AT sandall.us PGP: 0xA8EFDD61 | http://www.sourcemage.org/
http://eric.sandall.us/ | http://counter.li.org/ #196285




Archive powered by MHonArc 2.6.24.

Top of Page