Skip to Content.
Sympa Menu

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

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 (65d3e2b852ebdf3531e401fd35691c0e7b8ec057)
  • Date: Sat, 26 Apr 2008 15:41:07 -0500

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

games-engines/cyphesis/HISTORY | 6 +
games-engines/cyphesis/PRE_BUILD | 5 -
games-engines/cyphesis/gcc43.patch | 135
+++++++++++++++++++++++++++++++++++++
games-libs/atlas-c++/HISTORY | 5 +
games-libs/atlas-c++/PRE_BUILD | 5 -
games-libs/atlas-c++/gcc43.patch | 33 +++++++++
games-libs/eris/HISTORY | 5 +
games-libs/eris/PRE_BUILD | 5 -
games-libs/eris/gcc43.patch | 111 ++++++++++++++++++++++++++++++
games-libs/mercator/HISTORY | 5 +
games-libs/mercator/PRE_BUILD | 3
games-libs/mercator/gcc43.patch | 49 +++++++++++++
games-libs/skstream/HISTORY | 5 +
games-libs/skstream/PRE_BUILD | 3
games-libs/skstream/gcc43.patch | 22 ++++++
games-libs/varconf/HISTORY | 5 +
games-libs/varconf/PRE_BUILD | 3
games-libs/varconf/gcc43.patch | 18 ++++
18 files changed, 417 insertions(+), 6 deletions(-)

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

eris: Upstream patch from Marc Riese <marc-riese AT gmx.de> to fix
compilation with GCC 4.3.0

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

cyphesis: Upstream patch from Marc Riese <marc-riese AT gmx.de> to fix
compilation with GCC 4.3.0 with some modifications (sent upstream)

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

mercator: Upstream patch from Marc Riese <marc-riese AT gmx.de> to fix
compilation with GCC 4.3.0

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

atlas-c++: Upstream patch from Marc Riese <marc-riese AT gmx.de> to fix
compilation with GCC 4.3.0

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

varconf: Upstream patch from Marc Riese <marc-riese AT gmx.de>
to fix compilation with GCC 4.3.0

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

skstream: Fix compilation with gcc 4.3.0 (sent upstream)

diff --git a/games-engines/cyphesis/HISTORY b/games-engines/cyphesis/HISTORY
index d503c53..9454161 100644
--- a/games-engines/cyphesis/HISTORY
+++ b/games-engines/cyphesis/HISTORY
@@ -1,3 +1,9 @@
+2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Upstream patch from Marc Riese <marc-riese AT gmx.de>
+ to fix compilation with GCC 4.3.0 modified to apply cleanly
+ and also patch types.h. Sent changes upstream.
+
2008-01-06 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.5.15
Removed UPDATED
diff --git a/games-engines/cyphesis/PRE_BUILD
b/games-engines/cyphesis/PRE_BUILD
index d80a4a2..9082af8 100755
--- a/games-engines/cyphesis/PRE_BUILD
+++ b/games-engines/cyphesis/PRE_BUILD
@@ -1,6 +1,7 @@
-default_pre_build &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&

if [ "$CYPHESIS_CVS" == "y" ]; then
- cd $SOURCE_DIRECTORY &&
NOCONFIGURE="ON" ./autogen.sh
fi
diff --git a/games-engines/cyphesis/gcc43.patch
b/games-engines/cyphesis/gcc43.patch
new file mode 100644
index 0000000..337b348
--- /dev/null
+++ b/games-engines/cyphesis/gcc43.patch
@@ -0,0 +1,135 @@
+diff -Naur cyphesis-0.5.15.orig/common/Database.cpp
cyphesis-0.5.15/common/Database.cpp
+--- cyphesis-0.5.15.orig/common/Database.cpp 2008-04-26 13:17:57.000000000
-0700
++++ cyphesis-0.5.15/common/Database.cpp 2008-04-26 13:18:09.000000000
-0700
+@@ -34,6 +34,8 @@
+ #include <iostream>
+ #include <sstream>
+
++#include <cstring>
++#include <cstdlib>
+ #include <cassert>
+
+ using Atlas::Message::Element;
+diff -Naur cyphesis-0.5.15.orig/common/globals.cpp
cyphesis-0.5.15/common/globals.cpp
+--- cyphesis-0.5.15.orig/common/globals.cpp 2008-04-26 13:17:57.000000000
-0700
++++ cyphesis-0.5.15/common/globals.cpp 2008-04-26 13:18:09.000000000 -0700
+@@ -36,6 +36,7 @@
+
+ #include <sys/stat.h>
+
++#include <cstring>
+ #include <cassert>
+
+ const char * CYPHESIS = "cyphesis";
+diff -Naur cyphesis-0.5.15.orig/common/id.cpp cyphesis-0.5.15/common/id.cpp
+--- cyphesis-0.5.15.orig/common/id.cpp 2008-04-26 13:17:57.000000000 -0700
++++ cyphesis-0.5.15/common/id.cpp 2008-04-26 13:18:09.000000000 -0700
+@@ -22,6 +22,7 @@
+ #include "common/compose.hpp"
+
+ #include <cassert>
++#include <cstdlib>
+
+ long integerId(const std::string & id)
+ {
+diff -Naur cyphesis-0.5.15.orig/common/log.cpp cyphesis-0.5.15/common/log.cpp
+--- cyphesis-0.5.15.orig/common/log.cpp 2008-04-26 13:17:57.000000000
-0700
++++ cyphesis-0.5.15/common/log.cpp 2008-04-26 13:18:09.000000000 -0700
+@@ -27,6 +27,7 @@
+
+ #include <iostream>
+ #include <fstream>
++#include <cstring>
+
+ extern "C" {
+ #ifdef HAVE_SYSLOG_H
+diff -Naur cyphesis-0.5.15.orig/common/types.h cyphesis-0.5.15/common/types.h
+--- cyphesis-0.5.15.orig/common/types.h 2008-04-26 13:17:57.000000000
-0700
++++ cyphesis-0.5.15/common/types.h 2008-04-26 13:19:04.000000000 -0700
+@@ -25,6 +25,7 @@
+ #include <set>
+ #include <map>
+ #include <vector>
++#include <string>
+
+ class BaseEntity;
+ class Entity;
+diff -Naur cyphesis-0.5.15.orig/modules/DateTime.cpp
cyphesis-0.5.15/modules/DateTime.cpp
+--- cyphesis-0.5.15.orig/modules/DateTime.cpp 2008-04-26 13:17:57.000000000
-0700
++++ cyphesis-0.5.15/modules/DateTime.cpp 2008-04-26 13:18:09.000000000
-0700
+@@ -20,6 +20,7 @@
+ #include "DateTime.h"
+
+ #include <stdio.h>
++#include <cstdlib>
+
+ // date_pat=re.compile("^|[-:]|\s+");
+
+diff -Naur cyphesis-0.5.15.orig/rulesets/Container.h
cyphesis-0.5.15/rulesets/Container.h
+--- cyphesis-0.5.15.orig/rulesets/Container.h 2008-04-26 13:17:57.000000000
-0700
++++ cyphesis-0.5.15/rulesets/Container.h 2008-04-26 13:18:09.000000000
-0700
+@@ -25,6 +25,7 @@
+ #include <set>
+ #include <map>
+ #include <vector>
++#include <string>
+
+ class Entity;
+
+diff -Naur cyphesis-0.5.15.orig/rulesets/Statistics.h
cyphesis-0.5.15/rulesets/Statistics.h
+--- cyphesis-0.5.15.orig/rulesets/Statistics.h 2008-04-26 13:17:56.000000000
-0700
++++ cyphesis-0.5.15/rulesets/Statistics.h 2008-04-26 13:18:52.000000000
-0700
+@@ -22,6 +22,8 @@
+
+ #include "common/types.h"
+
++#include <cstring>
++
+ class ArithmeticScript;
+ class Character;
+
+diff -Naur cyphesis-0.5.15.orig/server/CommListener.cpp
cyphesis-0.5.15/server/CommListener.cpp
+--- cyphesis-0.5.15.orig/server/CommListener.cpp 2008-04-26
13:17:57.000000000 -0700
++++ cyphesis-0.5.15/server/CommListener.cpp 2008-04-26 13:18:09.000000000
-0700
+@@ -35,6 +35,7 @@
+ #include <skstream/skstream.h>
+
+ #include <iostream>
++#include <cstring>
+
+ #ifdef HAVE_ARPA_INET_H
+ #include <arpa/inet.h>
+diff -Naur cyphesis-0.5.15.orig/server/CommServer.cpp
cyphesis-0.5.15/server/CommServer.cpp
+--- cyphesis-0.5.15.orig/server/CommServer.cpp 2008-04-26 13:17:57.000000000
-0700
++++ cyphesis-0.5.15/server/CommServer.cpp 2008-04-26 13:18:09.000000000
-0700
+@@ -35,6 +35,7 @@
+
+ #include <skstream/sksocket.h>
+
++#include <cstring>
+ #include <iostream>
+
+ extern "C" {
+diff -Naur cyphesis-0.5.15.orig/tools/cyconfig.cpp
cyphesis-0.5.15/tools/cyconfig.cpp
+--- cyphesis-0.5.15.orig/tools/cyconfig.cpp 2008-04-26 13:17:56.000000000
-0700
++++ cyphesis-0.5.15/tools/cyconfig.cpp 2008-04-26 13:18:09.000000000 -0700
+@@ -33,6 +33,8 @@
+
+ #include <varconf/config.h>
+
++#include <cstring>
++#include <cstdlib>
+ #include <cassert>
+
+ static int install(int argc, char ** argv)
+diff -Naur cyphesis-0.5.15.orig/tools/cyconvertrules.cpp
cyphesis-0.5.15/tools/cyconvertrules.cpp
+--- cyphesis-0.5.15.orig/tools/cyconvertrules.cpp 2008-04-26
13:17:56.000000000 -0700
++++ cyphesis-0.5.15/tools/cyconvertrules.cpp 2008-04-26 13:18:09.000000000
-0700
+@@ -35,6 +35,7 @@
+ #include <string>
+ #include <fstream>
+ #include <iostream>
++#include <cstring>
+
+ using Atlas::Message::Element;
+ using Atlas::Message::MapType;
diff --git a/games-libs/atlas-c++/HISTORY b/games-libs/atlas-c++/HISTORY
index d5fb873..1202ae9 100644
--- a/games-libs/atlas-c++/HISTORY
+++ b/games-libs/atlas-c++/HISTORY
@@ -1,3 +1,8 @@
+2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Upstream patch from Marc Riese <marc-riese AT gmx.de>
+ to fix compilation with GCC 4.3.0
+
2008-03-11 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated stable to 0.6.1

diff --git a/games-libs/atlas-c++/PRE_BUILD b/games-libs/atlas-c++/PRE_BUILD
index a4b367f..f7301ed 100755
--- a/games-libs/atlas-c++/PRE_BUILD
+++ b/games-libs/atlas-c++/PRE_BUILD
@@ -1,6 +1,7 @@
-default_pre_build &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch &&

if [ "$ATLAS_CPP_BRANCH" == "cvs" ]; then
- cd $SOURCE_DIRECTORY &&
NOCONFIGURE="ON" ./autogen.sh
fi
diff --git a/games-libs/atlas-c++/gcc43.patch
b/games-libs/atlas-c++/gcc43.patch
new file mode 100644
index 0000000..420678c
--- /dev/null
+++ b/games-libs/atlas-c++/gcc43.patch
@@ -0,0 +1,33 @@
+? atlas_gcc43.patch
+Index: Atlas/Filter.cpp
+===================================================================
+RCS file: /home/cvspsrv/worldforge/forge/libs/Atlas-C++/Atlas/Filter.cpp,v
+retrieving revision 1.8
+diff -u -p -r1.8 Filter.cpp
+--- Atlas/Filter.cpp 28 Oct 2006 04:06:25 -0000 1.8
++++ Atlas/Filter.cpp 20 Apr 2008 00:55:59 -0000
+@@ -5,6 +5,7 @@
+ // $Id: Filter.cpp,v 1.8 2006-10-28 04:06:25 alriddoch Exp $
+
+ #include <Atlas/Filter.h>
++#include <cstring>
+
+ namespace Atlas {
+
+Index: tools/atlas_convert.cpp
+===================================================================
+RCS file:
/home/cvspsrv/worldforge/forge/libs/Atlas-C++/tools/atlas_convert.cpp,v
+retrieving revision 1.1
+diff -u -p -r1.1 atlas_convert.cpp
+--- tools/atlas_convert.cpp 10 Jun 2005 13:21:26 -0000 1.1
++++ tools/atlas_convert.cpp 20 Apr 2008 00:56:00 -0000
+@@ -13,6 +13,7 @@
+
+ #include <fstream>
+ #include <iostream>
++#include <cstdlib>
+
+ #include <unistd.h>
+
+
+
diff --git a/games-libs/eris/HISTORY b/games-libs/eris/HISTORY
index 8331a08..159cd0e 100644
--- a/games-libs/eris/HISTORY
+++ b/games-libs/eris/HISTORY
@@ -1,3 +1,8 @@
+2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Upstream patch from Marc Riese <marc-riese AT gmx.de>
+ to fix compilation with GCC 4.3.0
+
2008-01-06 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated stable to 1.3.13
Removed devel
diff --git a/games-libs/eris/PRE_BUILD b/games-libs/eris/PRE_BUILD
index a43a66c..335465d 100755
--- a/games-libs/eris/PRE_BUILD
+++ b/games-libs/eris/PRE_BUILD
@@ -1,6 +1,7 @@
-default_pre_build &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch &&

if [ "$ERIS_BRANCH" == "cvs" ]; then
- cd $SOURCE_DIRECTORY &&
NOCONFIGURE="on" ./autogen.sh
fi
diff --git a/games-libs/eris/gcc43.patch b/games-libs/eris/gcc43.patch
new file mode 100644
index 0000000..b961405
--- /dev/null
+++ b/games-libs/eris/gcc43.patch
@@ -0,0 +1,111 @@
+? eris_gcc43.patch
+Index: Eris/Account.h
+===================================================================
+RCS file: /home/cvspsrv/worldforge/forge/libs/eris/Eris/Account.h,v
+retrieving revision 1.17
+diff -u -p -r1.17 Account.h
+--- Eris/Account.h 4 Oct 2007 12:21:17 -0000 1.17
++++ Eris/Account.h 20 Apr 2008 00:44:03 -0000
+@@ -3,6 +3,7 @@
+
+ #include <vector>
+ #include <map>
++#include <memory>
+
+ #include <Eris/Types.h>
+ #include <Eris/Timeout.h>
+Index: Eris/Connection.h
+===================================================================
+RCS file: /home/cvspsrv/worldforge/forge/libs/eris/Eris/Connection.h,v
+retrieving revision 1.37
+diff -u -p -r1.37 Connection.h
+--- Eris/Connection.h 23 Oct 2007 11:31:58 -0000 1.37
++++ Eris/Connection.h 20 Apr 2008 00:44:04 -0000
+@@ -10,6 +10,7 @@
+
+ #include <deque>
+ #include <map>
++#include <memory>
+
+ /** Every Eris class and type lives inside the Eris namespace; certain
utility functions live in the
+ Util namespace, since they may be moved to a generic WorldForge foundation
library in the future.*/
+Index: Eris/EntityRef.h
+===================================================================
+RCS file: /home/cvspsrv/worldforge/forge/libs/eris/Eris/EntityRef.h,v
+retrieving revision 1.4
+diff -u -p -r1.4 EntityRef.h
+--- Eris/EntityRef.h 1 May 2006 22:19:06 -0000 1.4
++++ Eris/EntityRef.h 20 Apr 2008 00:44:04 -0000
+@@ -4,6 +4,8 @@
+ #include <sigc++/trackable.h>
+ #include <sigc++/signal.h>
+
++#include <string>
++
+ namespace Eris
+ {
+
+Index: Eris/Exceptions.h
+===================================================================
+RCS file: /home/cvspsrv/worldforge/forge/libs/eris/Eris/Exceptions.h,v
+retrieving revision 1.4
+diff -u -p -r1.4 Exceptions.h
+--- Eris/Exceptions.h 14 Dec 2005 23:12:04 -0000 1.4
++++ Eris/Exceptions.h 20 Apr 2008 00:44:04 -0000
+@@ -38,7 +38,7 @@ class InvalidAtlas : public BaseExceptio
+ public:
+ InvalidAtlas(const std::string& msg, const Atlas::Objects::Root& obj);
+
+- InvalidAtlas(const std::string& msg, const Atlas::Message::Element&
msg);
++ InvalidAtlas(const std::string& msg, const Atlas::Message::Element& el);
+
+ virtual ~InvalidAtlas() throw();
+ private:
+Index: Eris/Metaserver.cpp
+===================================================================
+RCS file: /home/cvspsrv/worldforge/forge/libs/eris/Eris/Metaserver.cpp,v
+retrieving revision 1.46
+diff -u -p -r1.46 Metaserver.cpp
+--- Eris/Metaserver.cpp 8 Nov 2006 18:19:10 -0000 1.46
++++ Eris/Metaserver.cpp 20 Apr 2008 00:44:04 -0000
+@@ -18,6 +18,7 @@
+
+ #include <cassert>
+ #include <cstdio>
++#include <cstring>
+
+ #ifdef __WIN32__
+
+Index: Eris/Metaserver.h
+===================================================================
+RCS file: /home/cvspsrv/worldforge/forge/libs/eris/Eris/Metaserver.h,v
+retrieving revision 1.30
+diff -u -p -r1.30 Metaserver.h
+--- Eris/Metaserver.h 3 Oct 2007 18:11:27 -0000 1.30
++++ Eris/Metaserver.h 20 Apr 2008 00:44:04 -0000
+@@ -11,6 +11,8 @@
+ #include <sigc++/trackable.h>
+ #include <sigc++/signal.h>
+
++#include <memory>
++
+ #ifndef __WIN32__
+ // pull in uint32_t on POSIX - is this generic?!
+ #include <stdint.h>
+Index: test/metaQuery.cpp
+===================================================================
+RCS file: /home/cvspsrv/worldforge/forge/libs/eris/test/metaQuery.cpp,v
+retrieving revision 1.14
+diff -u -p -r1.14 metaQuery.cpp
+--- test/metaQuery.cpp 3 Oct 2007 22:53:54 -0000 1.14
++++ test/metaQuery.cpp 20 Apr 2008 00:44:05 -0000
+@@ -7,6 +7,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <vector>
++#include <algorithm>
+ #include <sigc++/functors/ptr_fun.h>
+
+ using std::endl;
+
+
diff --git a/games-libs/mercator/HISTORY b/games-libs/mercator/HISTORY
index 01f36a9..9013e21 100644
--- a/games-libs/mercator/HISTORY
+++ b/games-libs/mercator/HISTORY
@@ -1,3 +1,8 @@
+2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Upstream patch from Marc Riese <marc-riese AT gmx.de>
+ to fix compilation with GCC 4.3.0
+
2008-01-06 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.2.5
Removed UPDATED
diff --git a/games-libs/mercator/PRE_BUILD b/games-libs/mercator/PRE_BUILD
new file mode 100755
index 0000000..2a1daf1
--- /dev/null
+++ b/games-libs/mercator/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/games-libs/mercator/gcc43.patch b/games-libs/mercator/gcc43.patch
new file mode 100644
index 0000000..993ab3d
--- /dev/null
+++ b/games-libs/mercator/gcc43.patch
@@ -0,0 +1,49 @@
+? mercator_gcc43.patch
+Index: Mercator/AreaShader.cpp
+===================================================================
+RCS file:
/home/cvspsrv/worldforge/forge/libs/mercator/Mercator/AreaShader.cpp,v
+retrieving revision 1.11
+diff -u -p -r1.11 AreaShader.cpp
+--- Mercator/AreaShader.cpp 20 Sep 2007 18:24:35 -0000 1.11
++++ Mercator/AreaShader.cpp 20 Apr 2008 00:42:52 -0000
+@@ -14,6 +14,7 @@
+
+ #include <set>
+ #include <iostream>
++#include <algorithm>
+
+ namespace Mercator
+ {
+Index: Mercator/AreaShader.h
+===================================================================
+RCS file:
/home/cvspsrv/worldforge/forge/libs/mercator/Mercator/AreaShader.h,v
+retrieving revision 1.5
+diff -u -p -r1.5 AreaShader.h
+--- Mercator/AreaShader.h 20 Sep 2007 18:24:35 -0000 1.5
++++ Mercator/AreaShader.h 20 Apr 2008 00:42:52 -0000
+@@ -26,7 +26,7 @@ public:
+ virtual bool checkIntersect(const Segment &) const;
+ private:
+ /// helper to shader a single area into the surface
+- void shadeArea(Surface& s, const Area* const s) const;
++ void shadeArea(Surface& s, const Area* const ar) const;
+
+ /// The layer number.
+ int m_layer;
+Index: Mercator/RandCache.h
+===================================================================
+RCS file: /home/cvspsrv/worldforge/forge/libs/mercator/Mercator/RandCache.h,v
+retrieving revision 1.5
+diff -u -p -r1.5 RandCache.h
+--- Mercator/RandCache.h 20 Sep 2007 18:24:35 -0000 1.5
++++ Mercator/RandCache.h 20 Apr 2008 00:42:53 -0000
+@@ -6,6 +6,7 @@
+ #define MERCATOR_RANDCACHE_H
+
+ #include <vector>
++#include <cstdlib>
+ #include <wfmath/MersenneTwister.h>
+
+ // construct with something like:
+
+
diff --git a/games-libs/skstream/HISTORY b/games-libs/skstream/HISTORY
index 61ef344..c871e8e 100644
--- a/games-libs/skstream/HISTORY
+++ b/games-libs/skstream/HISTORY
@@ -1,3 +1,8 @@
+2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Fix compilation with gcc 4.3.0
+ Sent upstream
+
2008-01-06 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.3.6

diff --git a/games-libs/skstream/PRE_BUILD b/games-libs/skstream/PRE_BUILD
new file mode 100755
index 0000000..34cce88
--- /dev/null
+++ b/games-libs/skstream/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/games-libs/skstream/gcc43.patch b/games-libs/skstream/gcc43.patch
new file mode 100644
index 0000000..567f4f5
--- /dev/null
+++ b/games-libs/skstream/gcc43.patch
@@ -0,0 +1,22 @@
+diff -Naur skstream-0.3.6.orig/skstream/skserver.cpp
skstream-0.3.6/skstream/skserver.cpp
+--- skstream-0.3.6.orig/skstream/skserver.cpp 2008-04-26 12:20:20.000000000
-0700
++++ skstream-0.3.6/skstream/skserver.cpp 2008-04-26 12:23:27.000000000
-0700
+@@ -41,6 +41,7 @@
+
+ #include <iostream>
+ #include <cstdio>
++#include <cstring>
+
+ #ifdef _WIN32
+ #define SHUT_RD SD_RECEIVE
+diff -Naur skstream-0.3.6.orig/skstream/skstream.cpp
skstream-0.3.6/skstream/skstream.cpp
+--- skstream-0.3.6.orig/skstream/skstream.cpp 2008-04-26 12:20:20.000000000
-0700
++++ skstream-0.3.6/skstream/skstream.cpp 2008-04-26 12:20:48.000000000
-0700
+@@ -43,6 +43,7 @@
+
+ #include <cstdio>
+ #include <cassert>
++#include <cstring>
+
+ #ifdef _WIN32
+ #define SHUT_RD SD_RECEIVE
diff --git a/games-libs/varconf/HISTORY b/games-libs/varconf/HISTORY
index 0ef8197..f00b684 100644
--- a/games-libs/varconf/HISTORY
+++ b/games-libs/varconf/HISTORY
@@ -1,3 +1,8 @@
+2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Upstream patch from Marc Riese <marc-riese AT gmx.de>
+ to fix compilation with GCC 4.3.0
+
2008-01-06 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.6.5
Removed UPDATED
diff --git a/games-libs/varconf/PRE_BUILD b/games-libs/varconf/PRE_BUILD
new file mode 100755
index 0000000..e0656fb
--- /dev/null
+++ b/games-libs/varconf/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/games-libs/varconf/gcc43.patch b/games-libs/varconf/gcc43.patch
new file mode 100644
index 0000000..acbb48f
--- /dev/null
+++ b/games-libs/varconf/gcc43.patch
@@ -0,0 +1,18 @@
+? varconf_gcc43.patch
+Index: varconf/variable.cpp
+===================================================================
+RCS file: /home/cvspsrv/worldforge/forge/libs/varconf/varconf/variable.cpp,v
+retrieving revision 1.26
+diff -u -p -r1.26 variable.cpp
+--- varconf/variable.cpp 12 Oct 2006 01:49:39 -0000 1.26
++++ varconf/variable.cpp 20 Apr 2008 00:41:08 -0000
+@@ -28,6 +28,7 @@
+
+ #include <string>
+ #include <cstdio>
++#include <cstdlib>
+
+ #ifdef __WIN32__
+ #include <tchar.h>
+
+



  • [SM-Commit] GIT changes to master games grimoire by Eric Sandall (65d3e2b852ebdf3531e401fd35691c0e7b8ec057), Eric Sandall, 04/26/2008

Archive powered by MHonArc 2.6.24.

Top of Page