Skip to Content.
Sympa Menu

sm-commit - [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 <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Eric Sandall (910a57141ef9e471759fd726e36c01a05262bb32)
  • Date: Tue, 20 Apr 2010 23:45:23 -0500

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
+
2009-11-21 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DEPENDS: added option for fribidi
* DETAILS: updated spell to 0.9.4.4
diff --git a/games-strategy-rts/glob2/PRE_BUILD
b/games-strategy-rts/glob2/PRE_BUILD
new file mode 100755
index 0000000..b36187d
--- /dev/null
+++ b/games-strategy-rts/glob2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+patch $SOURCE_DIRECTORY/libgag/src/TextStream.cpp \
+ $SCRIPT_DIRECTORY/03_headers_order.patch
diff --git a/games-strategy-rts/globulation2/BUILD
b/games-strategy-rts/globulation2/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/games-strategy-rts/globulation2/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/games-strategy-rts/globulation2/DEPENDS
b/games-strategy-rts/globulation2/DEPENDS
deleted file mode 100755
index 3493152..0000000
--- a/games-strategy-rts/globulation2/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends glob2
diff --git a/games-strategy-rts/globulation2/DETAILS
b/games-strategy-rts/globulation2/DETAILS
deleted file mode 100755
index d612e82..0000000
--- a/games-strategy-rts/globulation2/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
- SPELL=globulation2
- VERSION=0.9.2
-# SOURCE=glob2-${VERSION}.tar.gz
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/glob2-${VERSION}
-# SOURCE_URL[0]=http://dl.sv.nongnu.org/releases/glob2/$VERSION/$SOURCE
-#
SOURCE_HASH=sha512:b942f18d3f00f3572e12b3ea1f8d8638796b9c482ef2cbbeeddf308b9a17317dc8cd6b0f4fb01d2b1b65a03dd95add8771ed793756ea8b5af742daa2640b167f
- LICENSE[0]=GPL
- WEB_SITE=http://globulation2.org/
- ENTERED=20040814
- PATCHLEVEL=2
- SHORT="Deprecated in favor of glob2."
-cat << EOF
-Deprecated in favor of glob2.
-EOF
diff --git a/games-strategy-rts/globulation2/HISTORY
b/games-strategy-rts/globulation2/HISTORY
deleted file mode 100644
index 48220a7..0000000
--- a/games-strategy-rts/globulation2/HISTORY
+++ /dev/null
@@ -1,63 +0,0 @@
-2008-02-25 Dale E. Edmons <linuxfan AT sourcemage.org>
- * DEPENDS: Stupid typo.
-
-2008-02-25 Dale E. Edmons <linuxfan AT sourcemage.org>
- * Deprecated: Use `cast glob2` instead.
-
-2007-04-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: updated no 0.8.23
-
-2006-08-15 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 0.8.21
- Removed BUILD_API=2 (grimoire-wide) and UPDATED (deprecated)
-
-2006-03-21 Benjamin 'Asaru' Dirks <asaru AT wtnet.de>
- * DETAILS: version update - 0.8.19
- updatet source and website url
-
-2006-02-12 Neuron <vlmarek AT volny.cz>
- * DETAILS: version update - 0.8.18
- * DEPENDS: added boost dependency
-
-2005-12-27 Neuron <vlmarek AT volny.cz>
- * DETAILS: version update - 0.8.17
-
-2005-12-16 Neuron <vlmarek AT volny.cz>
- * Fixed wrong SOURCE_HASH line
-
-2005-12-10 Neuron <vlmarek AT volny.cz>
- * DETAILS: version update - 0.8.16
-
-2005-12-01 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 -> SHA512
-
-2005-06-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: version update
- * BUILD: now uses default_game_build
-
-2005-02-20 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: SOURCE_URL fixed, version update
-
-2005-01-29 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: New WEB_SITE URL
- We're now listed on their Download page. ;)
-
-2005-01-28 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 0.8.11
- Added BUILD_API=2
- Shortened SHORT
- * DEPENDS: Added dependency on speex
- Formatted to Guru Handbook
-
-2004-09-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
- * DETAILS: updated to 0.8.8
- * BUILD: added to add -L/usr/X11R6/lib to LDFLAGS so libGLU is found
-
-2004-08-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * BUILD: removed
- * Minor bugfixes
- * DETAILS: BUILD_API=2
-
-2004-08-14 Duane Malcolm <d.malcolm AT auckland.ac.nz>
- * DETAILS DEPENDS BUILD HISTORY: Added spell
-
diff --git a/games-strategy-rts/globulation2/INSTALL
b/games-strategy-rts/globulation2/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/games-strategy-rts/globulation2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/games-strategy-rts/globulation2/PRE_BUILD
b/games-strategy-rts/globulation2/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/games-strategy-rts/globulation2/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/games-strategy-rts/globulation2/TRIGGERS
b/games-strategy-rts/globulation2/TRIGGERS
deleted file mode 100755
index e072328..0000000
--- a/games-strategy-rts/globulation2/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast globulation2 dispel_self




Archive powered by MHonArc 2.6.24.

Top of Page