Skip to Content.
Sympa Menu

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

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 (bbfe38abbd0309a6dcf452a199067e190a2cc8a0)
  • Date: Sun, 13 Jul 2008 02:36:53 -0500

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

dev/null |binary
games-data/ember-media/DETAILS | 2
games-data/ember-media/HISTORY | 5
games-data/ember-media/INSTALL | 7
games-data/ember-media/ember-media-0.5.1.tar.bz2.sig | 0
games-data/ember-media/ember-media-0.5.3.tar.bz2.sig |binary
games-engines/cyphesis/DETAILS | 2
games-engines/cyphesis/HISTORY | 5
games-engines/cyphesis/PRE_BUILD | 1
games-engines/cyphesis/cyphesis-0.5.15.tar.bz2.sig | 0
games-engines/cyphesis/cyphesis-0.5.16.tar.bz2.sig |binary
games-engines/cyphesis/gcc43.patch | 135
-------------------
games-rpg-mp/ember/DETAILS | 2
games-rpg-mp/ember/HISTORY | 5
games-rpg-mp/ember/PRE_BUILD | 1
games-rpg-mp/ember/ember-0.5.2.tar.bz2.sig | 0
games-rpg-mp/ember/ember-0.5.3.tar.bz2.sig |binary
games-rpg-mp/ember/gcc43.patch.gz | 0
18 files changed, 22 insertions(+), 143 deletions(-)

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

cyphesis: Updated to 0.5.16

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

ember: Updated to 0.5.3

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

ember-media: Updated to 0.5.3

diff --git a/games-data/ember-media/DETAILS b/games-data/ember-media/DETAILS
index a707d65..4e6c8ef 100755
--- a/games-data/ember-media/DETAILS
+++ b/games-data/ember-media/DETAILS
@@ -1,5 +1,5 @@
SPELL=ember-media
- VERSION=0.5.1
+ VERSION=0.5.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/worldforge/$SOURCE
diff --git a/games-data/ember-media/HISTORY b/games-data/ember-media/HISTORY
index e89e7bc..9c99d60 100644
--- a/games-data/ember-media/HISTORY
+++ b/games-data/ember-media/HISTORY
@@ -1,3 +1,8 @@
+2008-07-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.5.3
+ * INSTALL: Removed duplicated COPYING.txt and LICENSING.txt
+ Now split into shared and user, but we want it all system (shared)
+
2008-01-06 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.5.1
Removed UPDATED
diff --git a/games-data/ember-media/INSTALL b/games-data/ember-media/INSTALL
index 6818abb..0f8d330 100755
--- a/games-data/ember-media/INSTALL
+++ b/games-data/ember-media/INSTALL
@@ -1,3 +1,4 @@
-mkdir -p $INSTALL_ROOT/usr/share/games/ember &&
-chown -R root:games media &&
-cp -r media $INSTALL_ROOT/usr/share/games/ember
+mkdir -p $INSTALL_ROOT/usr/share/games/ember &&
+rm -f shared/{COPYING,LICENSING}.txt &&
+chown -R root:games shared user &&
+cp -fr shared/* user/* $INSTALL_ROOT/usr/share/games/ember
diff --git a/games-data/ember-media/ember-media-0.5.1.tar.bz2.sig
b/games-data/ember-media/ember-media-0.5.1.tar.bz2.sig
deleted file mode 100644
index f3eca61..0000000
Binary files a/games-data/ember-media/ember-media-0.5.1.tar.bz2.sig and
/dev/null differ
diff --git a/games-data/ember-media/ember-media-0.5.3.tar.bz2.sig
b/games-data/ember-media/ember-media-0.5.3.tar.bz2.sig
new file mode 100644
index 0000000..c31c009
Binary files /dev/null and
b/games-data/ember-media/ember-media-0.5.3.tar.bz2.sig differ
diff --git a/games-engines/cyphesis/DETAILS b/games-engines/cyphesis/DETAILS
index 77b3a34..7f2bf42 100755
--- a/games-engines/cyphesis/DETAILS
+++ b/games-engines/cyphesis/DETAILS
@@ -1,5 +1,5 @@
SPELL=cyphesis
- VERSION=${VERSION:=0.5.15}
+ VERSION=${VERSION:=0.5.16}
if [ "$CYPHESIS_CVS" == "y" ]; then
if [ "$CYPHESIS_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
diff --git a/games-engines/cyphesis/HISTORY b/games-engines/cyphesis/HISTORY
index 9454161..2c5d6c4 100644
--- a/games-engines/cyphesis/HISTORY
+++ b/games-engines/cyphesis/HISTORY
@@ -1,3 +1,8 @@
+2008-07-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.5.16
+ * PRE_BUILD: Don't apply gcc 4.3 patch
+ * gcc43.patch: Removed, fixed 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-engines/cyphesis/PRE_BUILD
b/games-engines/cyphesis/PRE_BUILD
index 9082af8..7f61d8f 100755
--- a/games-engines/cyphesis/PRE_BUILD
+++ b/games-engines/cyphesis/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&

if [ "$CYPHESIS_CVS" == "y" ]; then
NOCONFIGURE="ON" ./autogen.sh
diff --git a/games-engines/cyphesis/cyphesis-0.5.15.tar.bz2.sig
b/games-engines/cyphesis/cyphesis-0.5.15.tar.bz2.sig
deleted file mode 100644
index 01bf0c5..0000000
Binary files a/games-engines/cyphesis/cyphesis-0.5.15.tar.bz2.sig and
/dev/null differ
diff --git a/games-engines/cyphesis/cyphesis-0.5.16.tar.bz2.sig
b/games-engines/cyphesis/cyphesis-0.5.16.tar.bz2.sig
new file mode 100644
index 0000000..3acf1de
Binary files /dev/null and
b/games-engines/cyphesis/cyphesis-0.5.16.tar.bz2.sig differ
diff --git a/games-engines/cyphesis/gcc43.patch
b/games-engines/cyphesis/gcc43.patch
deleted file mode 100644
index 337b348..0000000
--- a/games-engines/cyphesis/gcc43.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-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-rpg-mp/ember/DETAILS b/games-rpg-mp/ember/DETAILS
index 3091918..616d24c 100755
--- a/games-rpg-mp/ember/DETAILS
+++ b/games-rpg-mp/ember/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
SOURCE_IGNORE=unversioned
FORCE_DOWNLOAD="on"
else
- VERSION=0.5.2
+ VERSION=0.5.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/worldforge/$SOURCE
diff --git a/games-rpg-mp/ember/HISTORY b/games-rpg-mp/ember/HISTORY
index fe89dc0..e78d40e 100644
--- a/games-rpg-mp/ember/HISTORY
+++ b/games-rpg-mp/ember/HISTORY
@@ -1,3 +1,8 @@
+2008-07-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.5.3
+ * PRE_BUILD: No longer apply gcc 4.3 patch
+ * gcc43.patch.gz: Removed, fixed upstream
+
2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated stable to 0.5.2
* PRE_BUILD: Apply gcc43.patch.gz
diff --git a/games-rpg-mp/ember/PRE_BUILD b/games-rpg-mp/ember/PRE_BUILD
index 40afe5c..bbb02bd 100755
--- a/games-rpg-mp/ember/PRE_BUILD
+++ b/games-rpg-mp/ember/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-zcat $SCRIPT_DIRECTORY/gcc43.patch | patch -p1 &&

for file in ember ember.in
do
diff --git a/games-rpg-mp/ember/ember-0.5.2.tar.bz2.sig
b/games-rpg-mp/ember/ember-0.5.2.tar.bz2.sig
deleted file mode 100644
index 8bdbf34..0000000
Binary files a/games-rpg-mp/ember/ember-0.5.2.tar.bz2.sig and /dev/null differ
diff --git a/games-rpg-mp/ember/ember-0.5.3.tar.bz2.sig
b/games-rpg-mp/ember/ember-0.5.3.tar.bz2.sig
new file mode 100644
index 0000000..4b82906
Binary files /dev/null and b/games-rpg-mp/ember/ember-0.5.3.tar.bz2.sig differ
diff --git a/games-rpg-mp/ember/gcc43.patch.gz
b/games-rpg-mp/ember/gcc43.patch.gz
deleted file mode 100644
index e2f86a8..0000000
Binary files a/games-rpg-mp/ember/gcc43.patch.gz and /dev/null differ



  • [SM-Commit] GIT changes to master games grimoire by Eric Sandall (bbfe38abbd0309a6dcf452a199067e190a2cc8a0), Eric Sandall, 07/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page