[SM-Commit] GIT changes to master games grimoire by Julien ROZO (c4ed131c4c602a743c09567baa94dc27c55d9364)

Julien ROZO scm at sourcemage.org
Thu Mar 12 14:12:56 EDT 2009


GIT changes to master games grimoire by Julien ROZO <julien at rozo.org>:

 dev/null                                                  |binary
 games-arcade-3d/scorched3d/DETAILS                        |    2 
 games-arcade-3d/scorched3d/HISTORY                        |    5 
 games-arcade-3d/scorched3d/PRE_BUILD                      |    4 
 games-arcade-3d/scorched3d/Scorched3D-42-src.tar.gz.sig   |    0 
 games-arcade-3d/scorched3d/Scorched3D-42.1-src.tar.gz.sig |binary
 games-arcade-3d/scorched3d/scorched3d-gcc43.patch         |   88 --------------
 7 files changed, 7 insertions(+), 92 deletions(-)

New commits:
commit c4ed131c4c602a743c09567baa94dc27c55d9364
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    scorched3d: updated version to 42.1
    gcc 4.3 patch is no longer needed

diff --git a/games-arcade-3d/scorched3d/DETAILS b/games-arcade-3d/scorched3d/DETAILS
index b18a9a4..e09bd98 100755
--- a/games-arcade-3d/scorched3d/DETAILS
+++ b/games-arcade-3d/scorched3d/DETAILS
@@ -1,5 +1,5 @@
            SPELL=scorched3d
-         VERSION=42
+         VERSION=42.1
           SOURCE=Scorched3D-$VERSION-src.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/scorched
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
diff --git a/games-arcade-3d/scorched3d/HISTORY b/games-arcade-3d/scorched3d/HISTORY
index 55bbc93..e0660a6 100644
--- a/games-arcade-3d/scorched3d/HISTORY
+++ b/games-arcade-3d/scorched3d/HISTORY
@@ -1,3 +1,8 @@
+2009-03-12 Julien "_kaze_" ROZO <julien at rozo.org>
+	* DETAILS: updated version to 42.1
+	* PRE_BUILD: no longer applying gcc 4.3 patch
+	* scorched3d-gcc43.patch: removed, no longer needed
+
 2009-02-19 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: updated version to 42
 	* PRE_BUILD: added, fixing source unpacking and applying gcc 4.3 patch
diff --git a/games-arcade-3d/scorched3d/PRE_BUILD b/games-arcade-3d/scorched3d/PRE_BUILD
index 2819c00..629e487 100755
--- a/games-arcade-3d/scorched3d/PRE_BUILD
+++ b/games-arcade-3d/scorched3d/PRE_BUILD
@@ -1,5 +1,3 @@
 mkdir $SOURCE_DIRECTORY &&
 cd $SOURCE_DIRECTORY &&
-unpack_file &&
-cd scorched/ &&
-patch -p1 < $SPELL_DIRECTORY/scorched3d-gcc43.patch
+unpack_file 
diff --git a/games-arcade-3d/scorched3d/Scorched3D-42-src.tar.gz.sig b/games-arcade-3d/scorched3d/Scorched3D-42-src.tar.gz.sig
deleted file mode 100644
index a909746..0000000
Binary files a/games-arcade-3d/scorched3d/Scorched3D-42-src.tar.gz.sig and /dev/null differ
diff --git a/games-arcade-3d/scorched3d/Scorched3D-42.1-src.tar.gz.sig b/games-arcade-3d/scorched3d/Scorched3D-42.1-src.tar.gz.sig
new file mode 100644
index 0000000..b873d86
Binary files /dev/null and b/games-arcade-3d/scorched3d/Scorched3D-42.1-src.tar.gz.sig differ
diff --git a/games-arcade-3d/scorched3d/scorched3d-gcc43.patch b/games-arcade-3d/scorched3d/scorched3d-gcc43.patch
deleted file mode 100644
index 05a7205..0000000
--- a/games-arcade-3d/scorched3d/scorched3d-gcc43.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -Naur scorched.orig/src/common/common/DefinesFile.h scorched/src/common/common/DefinesFile.h
---- scorched.orig/src/common/common/DefinesFile.h	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/common/DefinesFile.h	2008-12-29 18:38:23.000000000 +0100
-@@ -23,6 +23,7 @@
- 
- #include <time.h>
- #include <string>
-+#include <cstring>
- 
- namespace S3D
- {
-diff -Naur scorched.orig/src/common/common/LoggerI.h scorched/src/common/common/LoggerI.h
---- scorched.orig/src/common/common/LoggerI.h	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/common/LoggerI.h	2008-12-29 18:38:23.000000000 +0100
-@@ -22,6 +22,7 @@
- #define __INCLUDE_LoggerIh_INCLUDE__
- 
- #include <string>
-+#include <cstring>
- 
- class GLTexture;
- class LoggerInfo
-diff -Naur scorched.orig/src/common/common/main.h scorched/src/common/common/main.h
---- scorched.orig/src/common/common/main.h	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/common/main.h	2008-12-29 18:38:23.000000000 +0100
-@@ -20,6 +20,7 @@
- 
- #define WIN32_LEAN_AND_MEAN
- 
-+#include <cstdlib>
- #include <windows.h>
- 
- #ifdef HAVE_UNISTD_H
-diff -Naur scorched.orig/src/common/common/sha2.h scorched/src/common/common/sha2.h
---- scorched.orig/src/common/common/sha2.h	2008-03-02 19:47:36.000000000 +0100
-+++ scorched/src/common/common/sha2.h	2008-03-02 19:47:36.000000000 +0100
-@@ -45,6 +45,7 @@
- #define __SHA2C_H__
- 
- #include <string>
-+#include <cstring>
- #include <stdexcept>
- 
- // NOTE: You may need to define things by hand for your system: 
-diff -Naur scorched.orig/src/common/lang/LangParam.cpp scorched/src/common/lang/LangParam.cpp
---- scorched.orig/src/common/lang/LangParam.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/lang/LangParam.cpp	2008-12-29 18:38:23.000000000 +0100
-@@ -18,6 +18,7 @@
- //    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- ////////////////////////////////////////////////////////////////////////////////
- 
-+#include <cstdlib>
- #include <lang/LangParam.h>
- #include <common/DefinesString.h>
- 
-diff -Naur scorched.orig/src/common/lang/ResourceBundle.h scorched/src/common/lang/ResourceBundle.h
---- scorched.orig/src/common/lang/ResourceBundle.h	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/lang/ResourceBundle.h	2008-12-29 18:38:23.000000000 +0100
-@@ -21,6 +21,7 @@
- #if !defined(__INCLUDE_ResourceBundle_INCLUDE__)
- #define __INCLUDE_ResourceBundle_INCLUDE__
- 
-+#include <cstring>
- #include <set>
- #include <lang/ResourceBundleEntry.h>
- 
-diff -Naur scorched.orig/src/common/landscapemap/HeightMapModifier.h scorched/src/common/landscapemap/HeightMapModifier.h
---- scorched.orig/src/common/landscapemap/HeightMapModifier.h	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/landscapemap/HeightMapModifier.h	2008-12-29 18:38:23.000000000 +0100
-@@ -21,6 +21,7 @@
- #if !defined(AFX_HEIGHTMAPMODIFIER_H__26733049_91D4_4AB9_8870_1BC94F531E9A__INCLUDED_)
- #define AFX_HEIGHTMAPMODIFIER_H__26733049_91D4_4AB9_8870_1BC94F531E9A__INCLUDED_
- 
-+#include <limits.h>
- #include <common/RandomGenerator.h>
- #include <common/FixedVector.h>
- #include <landscapemap/HeightMap.h>
-diff -Naur scorched.orig/src/client/console/ConsoleImpl.h scorched/src/client/console/ConsoleImpl.h
---- scorched.orig/src/client/console/ConsoleImpl.h	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/console/ConsoleImpl.h	2008-12-29 18:38:23.000000000 +0100
-@@ -21,6 +21,7 @@
- #if !defined(AFX_ConsoleImpl_H__516D85F7_420B_43EB_B0BE_563DCBE1B143__INCLUDED_)
- #define AFX_ConsoleImpl_H__516D85F7_420B_43EB_B0BE_563DCBE1B143__INCLUDED_
- 
-+#include <limits.h>
- #include <common/LoggerI.h>
- #include <engine/GameStateI.h>
- #include <GLEXT/GLFont2d.h>



More information about the SM-Commit mailing list