Skip to Content.
Sympa Menu

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

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 (def1890446b8a472756155b23f785ce490d0b63a)
  • Date: Wed, 28 Jul 2010 16:03:01 -0500

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

games-puzzles/enigma2/BUILD | 1
games-puzzles/enigma2/DEPENDS | 1
games-puzzles/enigma2/HISTORY | 10 +
games-puzzles/enigma2/PRE_BUILD | 10 +
games-puzzles/enigma2/enigma-1.01-gcc44.patch | 54 +++++++++
games-puzzles/enigma2/xerces3.patch | 88
++++++++++++++++
games-strategy-rts/boswars/DETAILS | 7 -
games-strategy-rts/boswars/HISTORY | 6 +
games-strategy-rts/boswars/PRE_BUILD | 5
games-strategy-rts/boswars/boswars-2.6.1-src.tar.gz.sig |binary
games-strategy-rts/boswars/gcc43.patch | 23 ----
11 files changed, 175 insertions(+), 30 deletions(-)

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

enigma2: Mention GCC 4.3 patch is being applied

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

enigma2: Enable optimizations

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

enigma2: Depends on autoconf to regenerate configure
Apply xerces3.patch and enigma-1.01-gcc44.patch
Run autoconf to regenerate configure
xerces3.patch: link against -lxerces-c and new Utf8Xml API
From
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch
enigma-1.01-gcc44.patch: From
http://aur.archlinux.org/packages/enigma_sdl/enigma_sdl/enigma-1.01-gcc44.patch

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

boswars: Updated to 2.6.1
SOURCE_URL now includes dist/
Do not apply gcc43.patch
Removed gcc43.patch, we're on GCC 4.4.3 and this patch no
longer applies

diff --git a/games-puzzles/enigma2/BUILD b/games-puzzles/enigma2/BUILD
index f2438e5..dbfc9a7 100755
--- a/games-puzzles/enigma2/BUILD
+++ b/games-puzzles/enigma2/BUILD
@@ -1 +1,2 @@
+OPTS="--enable-optimize $OPTS" &&
default_games_build
diff --git a/games-puzzles/enigma2/DEPENDS b/games-puzzles/enigma2/DEPENDS
index 6e3e9fd..ebe1bde 100755
--- a/games-puzzles/enigma2/DEPENDS
+++ b/games-puzzles/enigma2/DEPENDS
@@ -1,3 +1,4 @@
+depends autoconf &&
depends sdl_mixer &&
depends sdl_image &&
depends xerces-c &&
diff --git a/games-puzzles/enigma2/HISTORY b/games-puzzles/enigma2/HISTORY
index 1ec17cb..be41c91 100644
--- a/games-puzzles/enigma2/HISTORY
+++ b/games-puzzles/enigma2/HISTORY
@@ -1,3 +1,13 @@
+2010-07-28 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Enable optimizations
+ * DEPENDS: Depends on autoconf to regenerate configure
+ * PRE_BUILD: Apply xerces3.patch and enigma-1.01-gcc44.patch
+ Run autoconf to regenerate configure
+ Mention GCC 4.3 patch is being applied
+ * xerces3.patch: link against -lxerces-c and new Utf8Xml API
+ From
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch
+ * enigma-1.01-gcc44.patch: From
http://aur.archlinux.org/packages/enigma_sdl/enigma_sdl/enigma-1.01-gcc44.patch
+
2008-09-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD, gcc-4.3*.patch: make it build with 4.3, thanks to suse
* DETAILS: updated spell to 1.01
diff --git a/games-puzzles/enigma2/PRE_BUILD b/games-puzzles/enigma2/PRE_BUILD
index f2242bc..c95d465 100755
--- a/games-puzzles/enigma2/PRE_BUILD
+++ b/games-puzzles/enigma2/PRE_BUILD
@@ -1,2 +1,10 @@
default_pre_build &&
-patch -p0 -d "$SOURCE_DIRECTORY" <
"$SPELL_DIRECTORY"/enigma-gcc-4.3-ftbfs.patch
+cd $SOURCE_DIRECTORY &&
+message "${MESSAGE_COLOR}Applying GCC 4.3 patch...${DEFAULT_COLOR}" &&
+patch -p0 -d "$SOURCE_DIRECTORY" <
"$SPELL_DIRECTORY"/enigma-gcc-4.3-ftbfs.patch &&
+message "${MESSAGE_COLOR}Applying GCC 4.4 patch...${DEFAULT_COLOR}" &&
+patch -p0 < "$SPELL_DIRECTORY/enigma-1.01-gcc44.patch" &&
+message "${MESSAGE_COLOR}Applying Xerces-C 3.x link
patch...${DEFAULT_COLOR}" &&
+patch -p0 < "$SPELL_DIRECTORY/xerces3.patch" &&
+message "${MESSAGE_COLOR}Regenerating configure...${DEFAULT_COLOR}" &&
+autoconf
diff --git a/games-puzzles/enigma2/enigma-1.01-gcc44.patch
b/games-puzzles/enigma2/enigma-1.01-gcc44.patch
new file mode 100644
index 0000000..c41557c
--- /dev/null
+++ b/games-puzzles/enigma2/enigma-1.01-gcc44.patch
@@ -0,0 +1,54 @@
+#
+# From
http://aur.archlinux.org/packages/enigma_sdl/enigma_sdl/enigma-1.01-gcc44.patch
+#
+--- src/PropertyManager.cc.old 2009-05-22 10:50:04.000000000 +0200
++++ src/PropertyManager.cc 2009-05-22 10:50:30.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include "XMLtoLocal.hh"
+ #include "XMLtoUtf8.hh"
+ #include "ecl_system.hh"
++#include <cstdio>
+ #include <iostream>
+ #include <xercesc/dom/DOM.hpp>
+ #include <xercesc/util/XMLDouble.hpp>
+--- src/StateManager.cc.old 2009-05-22 10:52:13.000000000 +0200
++++ src/StateManager.cc 2009-05-22 10:52:38.000000000 +0200
+@@ -31,6 +31,7 @@
+ #include "XMLtoUtf8.hh"
+ #include "ecl_system.hh"
+ #include "gui/ErrorMenu.hh"
++#include <cstdio>
+ #include <iostream>
+ #include <sstream>
+ #include <xercesc/dom/DOM.hpp>
+--- src/gui/LevelPackComposer.cc.old 2009-05-22 10:53:46.000000000 +0200
++++ src/gui/LevelPackComposer.cc 2009-05-22 10:54:24.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include "lev/Index.hh"
+
+ #include "main.hh"
++#include <cstdio>
+
+ using namespace ecl;
+ using namespace std;
+--- src/lev/Index.cc.old 2009-05-22 10:55:16.000000000 +0200
++++ src/lev/Index.cc 2009-05-22 10:55:41.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include "StateManager.hh"
+ #include "lev/ScoreManager.hh"
+ #include "lev/RatingManager.hh"
++#include <cstdio>
+
+
+ namespace enigma { namespace lev {
+--- src/lua.cc.old 2009-05-28 09:43:36.000000000 +0200
++++ src/lua.cc 2009-05-28 09:44:22.000000000 +0200
+@@ -574,7 +574,7 @@
+ int y = round_down<int>(lua_tonumber(L, 2));
+ const char *dir = lua_tostring(L,3);
+ const char *allowed = "wsen";
+- char *found = strchr(allowed, dir[0]);
++ const char *found = strchr(allowed, dir[0]);
+
+ if (found && found[0])
+ world::AddScramble(GridPos(x,y), enigma::Direction(found-allowed));
diff --git a/games-puzzles/enigma2/xerces3.patch
b/games-puzzles/enigma2/xerces3.patch
new file mode 100644
index 0000000..1caa01a
--- /dev/null
+++ b/games-puzzles/enigma2/xerces3.patch
@@ -0,0 +1,88 @@
+#
+# From
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch?revision=1.2
+#
+--- configure.ac 2008-11-18 14:09:53.724778996 +0500
++++ configure.ac3 2008-11-18 14:42:30.322032537 +0500
+@@ -167,14 +167,14 @@ dnl ------------------------------------
+ dnl Check for xerces
+ dnl ----------------------------------------
+ if test "$MINGW32" = yes; then
+- AC_MSG_CHECKING([for Xerces 3.0 experimental version])
+- AC_EGREP_HEADER([gXercesMajVersion = 3],[xercesc/util/XercesVersion.hpp],
++ AC_MSG_CHECKING([for Xerces 3 version])
++ AC_EGREP_HEADER([XERCES_VERSION_MAJOR 3],[xercesc/util/XercesVersion.hpp],
+ [AC_MSG_RESULT([found])],
+ [AC_MSG_ERROR([not found])])
+ AC_CHECK_LIB(xerces, main,,[AC_MSG_ERROR([xerces is required to compile
Enigma])])
+ else
+- AC_MSG_CHECKING([for Xerces 3.0 experimental version])
+- AC_EGREP_HEADER([gXercesMajVersion = 3],[xercesc/util/XercesVersion.hpp],
++ AC_MSG_CHECKING([for Xerces 3 version])
++ AC_EGREP_HEADER([XERCES_VERSION_MAJOR 3],[xercesc/util/XercesVersion.hpp],
+ xerces3exp="yes",
+ xerces3exp="no")
+ if test "x$xerces3exp" = xyes; then
+--- src/lev/ScoreManager.cc
++++ src/lev/ScoreManager.cc
+@@ -65,15 +65,23 @@
+ class ScoreDomSerFilter : public DOMWriterFilter {
+ #endif
+ public:
++#if _XERCES_VERSION >= 30000
++ virtual DOMNodeFilter::FilterAction acceptNode(const DOMNode
*node) const;
++#else
+ virtual short acceptNode(const DOMNode *node) const;
++#endif
+ virtual unsigned long getWhatToShow () const {
+ return DOMNodeFilter::SHOW_ALL;
+ }
+ virtual void setWhatToShow (unsigned long toShow) {}
+ };
+-
++
++#if _XERCES_VERSION >= 30000
++ DOMNodeFilter::FilterAction ScoreDomSerFilter::acceptNode(const DOMNode
*node) const {
++#else
+ short ScoreDomSerFilter::acceptNode(const DOMNode *node) const {
+- if (node->getNodeType () == DOMNode::ELEMENT_NODE &&
++#endif
++ if (node->getNodeType () == DOMNode::ELEMENT_NODE &&
+ std::string(XMLtoUtf8(node->getNodeName()).c_str()) ==
"level") {
+ const DOMElement *e = dynamic_cast<const DOMElement *>(node);
+ std::string id =
XMLtoUtf8(e->getAttribute(Utf8ToXML("id").x_str())).c_str();
+--- src/Utf8ToXML.cc~ 2008-12-29 00:12:26.000000000 +0600
++++ src/Utf8ToXML.cc 2008-12-29 00:15:19.000000000 +0600
+@@ -40,11 +40,11 @@
+ }
+
+ void Utf8ToXML::init(const char * const toTranscode) {
+- unsigned int srcLength = std::strlen(toTranscode) + 1;
++ XMLSize_t srcLength = std::strlen(toTranscode) + 1;
+ // make safe assumptions on utf-16 size
+- unsigned int maxDestLength = srcLength;
+- unsigned int charsEaten;
+- unsigned int destLength;
++ XMLSize_t maxDestLength = srcLength;
++ XMLSize_t charsEaten;
++ XMLSize_t destLength;
+ unsigned char *charSizes = new unsigned char[maxDestLength]; //
just junk
+ // make a buffer - size does not matter - the object is temporary
+ xmlString = new XMLCh[maxDestLength];
+--- src/XMLtoUtf8.cc~ 2008-12-29 00:12:12.000000000 +0600
++++ src/XMLtoUtf8.cc 2008-12-29 00:14:47.000000000 +0600
+@@ -27,11 +27,11 @@
+ namespace enigma
+ {
+ XMLtoUtf8::XMLtoUtf8(const XMLCh* const toTranscode) {
+- unsigned int srcLength = XMLString::stringLen(toTranscode) + 1;
++ XMLSize_t srcLength = XMLString::stringLen(toTranscode) + 1;
+ // make safe assumptions on utf-8 size
+- unsigned int maxDestLength = 3 * srcLength;
+- unsigned int charsEaten;
+- unsigned int destLength;
++ XMLSize_t maxDestLength = 3 * srcLength;
++ XMLSize_t charsEaten;
++ XMLSize_t destLength;
+ // make a buffer - size does not matter - the object is temporary
+ utf8String = new char[maxDestLength];
+ // transcode to utf-8 -- there are no unrepresentable chars
diff --git a/games-strategy-rts/boswars/DETAILS
b/games-strategy-rts/boswars/DETAILS
index f69834e..9f11d3d 100755
--- a/games-strategy-rts/boswars/DETAILS
+++ b/games-strategy-rts/boswars/DETAILS
@@ -1,11 +1,12 @@
SPELL=boswars
- VERSION=2.5
+ VERSION=2.6.1
SOURCE=${SPELL}-${VERSION}-src.tar.gz
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+#
SOURCE_HASH=sha512:046fac616025a779eb82418a48ad5b9fc5876560668f83e19e852343fd406a34868bd52c82f2145a29cfe0de8264e59183bed7516819d32cc13edbc801b25919
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src
- SOURCE_URL[0]=http://www.boswars.org/releases/$SOURCE
+ SOURCE_URL[0]=http://www.boswars.org/dist/releases/$SOURCE
WEB_SITE=http://www.boswars.org/
ENTERED=20040719
-
SOURCE_HASH=sha512:046fac616025a779eb82418a48ad5b9fc5876560668f83e19e852343fd406a34868bd52c82f2145a29cfe0de8264e59183bed7516819d32cc13edbc801b25919
LICENSE[0]=GPL
SHORT='Bos Wars is a futuristic real-time strategy game.'
cat << EOF
diff --git a/games-strategy-rts/boswars/HISTORY
b/games-strategy-rts/boswars/HISTORY
index b0e44b0..a72d43c 100644
--- a/games-strategy-rts/boswars/HISTORY
+++ b/games-strategy-rts/boswars/HISTORY
@@ -1,3 +1,9 @@
+2010-07-28 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.6.1
+ SOURCE_URL now includes dist/
+ * PRE_BUILD: Do not apply gcc43.patch
+ * gcc43.patch: Removed, we're on GCC 4.4.3 and this patch no longer
applies
+
2008-10-07 Julien "_kaze_" ROZO <julien AT rozo.org>
* gcc43.patch: added, fixes compilation issue with gcc 4.3.x
(fixes bug #14629)
diff --git a/games-strategy-rts/boswars/PRE_BUILD
b/games-strategy-rts/boswars/PRE_BUILD
index 022e838..ba6b19b 100755
--- a/games-strategy-rts/boswars/PRE_BUILD
+++ b/games-strategy-rts/boswars/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-# unbreaking a broken scons *grumbl*

-sedit "205s:env.Append(CCFLAGS = Split(.*:env.Append(CCFLAGS =
Split('$CFLAGS')):" SConstruct &&
-patch -p0 < $SPELL_DIRECTORY/gcc43.patch
+# unbreaking a broken scons *grumbl*
+sedit "205s:env.Append(CCFLAGS = Split(.*:env.Append(CCFLAGS =
Split('$CFLAGS')):" SConstruct
diff --git a/games-strategy-rts/boswars/boswars-2.6.1-src.tar.gz.sig
b/games-strategy-rts/boswars/boswars-2.6.1-src.tar.gz.sig
new file mode 100644
index 0000000..ca3177e
Binary files /dev/null and
b/games-strategy-rts/boswars/boswars-2.6.1-src.tar.gz.sig differ
diff --git a/games-strategy-rts/boswars/gcc43.patch
b/games-strategy-rts/boswars/gcc43.patch
deleted file mode 100644
index 3d5f5c0..0000000
--- a/games-strategy-rts/boswars/gcc43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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"
-



  • [SM-Commit] GIT changes to master games grimoire by Eric Sandall (def1890446b8a472756155b23f785ce490d0b63a), Eric Sandall, 07/28/2010

Archive powered by MHonArc 2.6.24.

Top of Page