Skip to Content.
Sympa Menu

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

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 (dabebcabcba4eda8c459392e9ab0aeed4ec5e112)
  • Date: Sun, 12 Apr 2009 16:36:14 -0500

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

dev/null |binary
games-libs/eris/DETAILS | 2
games-libs/eris/HISTORY | 5 +
games-libs/eris/PRE_BUILD | 7 --
games-libs/eris/eris-1.3.13.tar.bz2.sig | 0
games-libs/eris/eris-1.3.14.tar.bz2.sig |binary
games-libs/eris/gcc43.patch | 111
--------------------------------
7 files changed, 6 insertions(+), 119 deletions(-)

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

eris: Updated to 1.3.14, removed gcc43.patch

diff --git a/games-libs/eris/DETAILS b/games-libs/eris/DETAILS
index 7a976c6..7f21c25 100755
--- a/games-libs/eris/DETAILS
+++ b/games-libs/eris/DETAILS
@@ -1,5 +1,5 @@
SPELL=eris
- VERSION=${VERSION:=1.3.13}
+ VERSION=${VERSION:=1.3.14}
if [ "$ERIS_BRANCH" == "cvs" ]; then
if [ "$ERIS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
diff --git a/games-libs/eris/HISTORY b/games-libs/eris/HISTORY
index 159cd0e..7ea5a0c 100644
--- a/games-libs/eris/HISTORY
+++ b/games-libs/eris/HISTORY
@@ -1,3 +1,8 @@
+2009-04-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.3.14
+ * PRE_BUILD: Removed, no longer applying gcc43.patch
+ * gcc43.patch: Removed, applied upstream
+
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>
diff --git a/games-libs/eris/PRE_BUILD b/games-libs/eris/PRE_BUILD
deleted file mode 100755
index 335465d..0000000
--- a/games-libs/eris/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/gcc43.patch &&
-
-if [ "$ERIS_BRANCH" == "cvs" ]; then
- NOCONFIGURE="on" ./autogen.sh
-fi
diff --git a/games-libs/eris/eris-1.3.13.tar.bz2.sig
b/games-libs/eris/eris-1.3.13.tar.bz2.sig
deleted file mode 100644
index deb5267..0000000
Binary files a/games-libs/eris/eris-1.3.13.tar.bz2.sig and /dev/null differ
diff --git a/games-libs/eris/eris-1.3.14.tar.bz2.sig
b/games-libs/eris/eris-1.3.14.tar.bz2.sig
new file mode 100644
index 0000000..5a0dda1
Binary files /dev/null and b/games-libs/eris/eris-1.3.14.tar.bz2.sig differ
diff --git a/games-libs/eris/gcc43.patch b/games-libs/eris/gcc43.patch
deleted file mode 100644
index b961405..0000000
--- a/games-libs/eris/gcc43.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-? 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;
-
-



  • [SM-Commit] GIT changes to master games grimoire by Eric Sandall (dabebcabcba4eda8c459392e9ab0aeed4ec5e112), Eric Sandall, 04/12/2009

Archive powered by MHonArc 2.6.24.

Top of Page