[Frugalware-git] frugalware-current: scorched3d-42-1-i686
Devil505
devil505linux at gmail.com
Sun Feb 22 20:03:44 CET 2009
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=977de9bb0115b8f6a9232d8fcc11c174daf25960
commit 977de9bb0115b8f6a9232d8fcc11c174daf25960
Author: Devil505 <devil505linux at gmail.com>
Date: Sun Feb 22 20:02:08 2009 +0100
scorched3d-42-1-i686
* version bump
* removed old gcc43 patch
* added new gcc43 patch
* improved desktop entry
diff --git a/source/games-extra/scorched3d/FrugalBuild b/source/games-extra/scorched3d/FrugalBuild
index 67619f6..f4f9497 100644
--- a/source/games-extra/scorched3d/FrugalBuild
+++ b/source/games-extra/scorched3d/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Devil505 <devil505linux at gmail.com>
pkgname=scorched3d
-pkgver=41.3
+pkgver=42
pkgrel=1
pkgdesc="Scorched3D is a 3D remake of the popular 2D artillery game Scorched Earth."
depends=('wxgtk-u8' 'libvorbis' 'libogg' 'sdl_net' 'openal' 'freealut' 'fftw' 'freetype2' \
@@ -10,18 +10,20 @@ depends=('wxgtk-u8' 'libvorbis' 'libogg' 'sdl_net' 'openal' 'freealut' 'fftw' 'f
_F_sourceforge_name="Scorched3D"
_F_sourceforge_dirname="$pkgname"
_F_sourceforge_ext="-src.tar.gz"
-_F_sourceforge_prefix="Build "
+_F_sourceforge_prefix="Version "
+_F_sourceforge_sep="-"
Finclude sourceforge
-options=('scriptlet')
groups=('games-extra')
archs=('i686' 'x86_64')
-source=(${source[@]} gcc4.3.diff)
-sha1sums=('c38fa05ca801b484c859012086dbbc03244ae71c' \
- '0692b9328e86619c77808b310fc445ac892474a6')
+source=(${source[@]} $pkgname-$pkgver-gcc43.patch)
+sha1sums=('112398b79ff919ecde54a8410d1456da8de9311b' \
+ '91e399cf8881a0ce264d4cf5656684138c14245f')
_F_cd_path="scorched"
Fconfopts="${Fconfopts[@]} --disable-dependency-tracking \
--datadir=/usr/share/$pkgname"
-_F_desktop_categories="Game"
+
+_F_desktop_name="Scorched 3D"
+_F_desktop_categories="Game;ArcadeGame;"
build()
{
diff --git a/source/games-extra/scorched3d/gcc4.3.diff b/source/games-extra/scorched3d/gcc4.3.diff
deleted file mode 100644
index ff265f8..0000000
--- a/source/games-extra/scorched3d/gcc4.3.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- scorched/src/common/main.h~ 2008-01-26 20:41:37.000000000 +0100
-+++ scorched/src/common/main.h 2008-01-26 20:45:15.000000000 +0100
-@@ -21,6 +21,8 @@
- #define WIN32_LEAN_AND_MEAN
-
- #include <windows.h>
-+#include <cstdlib>
-+#include <vector>
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
---- scorched/src/common/sha2.h~ 2008-01-26 20:41:37.000000000 +0100
-+++ scorched/src/common/sha2.h 2008-01-26 20:45:15.000000000 +0100
-@@ -46,6 +46,7 @@
-
- #include <string>
- #include <stdexcept>
-+#include <cstring>
-
- // NOTE: You may need to define things by hand for your system:
- typedef unsigned char sha_byte; // Exactly 1 byte
---- scorched/src/common/DefinesFile.cpp~ 2008-01-26 20:41:37.000000000 +0100
-+++ scorched/src/common/DefinesFile.cpp 2008-01-26 20:45:15.000000000 +0100
-@@ -21,6 +21,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string>
-+#include <cstring>
- #include <common/DefinesFile.h>
- #include <sys/types.h>
- #include <sys/stat.h>
---- scorched/src/common/LoggerI.cpp~ 2008-01-26 20:45:33.000000000 +0100
-+++ scorched/src/common/LoggerI.cpp 2008-01-26 20:46:03.000000000 +0100
-@@ -20,6 +20,7 @@
-
- #include <common/LoggerI.h>
- #include <time.h>
-+#include <cstring>
-
- LoggerInfo::LoggerInfo(
- const char *message,
diff --git a/source/games-extra/scorched3d/scorched3d-42-gcc43.patch b/source/games-extra/scorched3d/scorched3d-42-gcc43.patch
new file mode 100644
index 0000000..6497e3c
--- /dev/null
+++ b/source/games-extra/scorched3d/scorched3d-42-gcc43.patch
@@ -0,0 +1,101 @@
+diff -ur scorched.old/src/client/console/ConsoleImpl.cpp scorched/src/client/console/ConsoleImpl.cpp
+--- scorched.old/src/client/console/ConsoleImpl.cpp 2009-02-18 20:06:23.000000000 +0200
++++ scorched/src/client/console/ConsoleImpl.cpp 2009-02-18 20:39:23.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <GLEXT/GLViewPort.h>
+ #include <GLW/GLWFont.h>
+ #include <GLW/GLWToolTip.h>
++#include <climits>
+
+ ConsoleImpl::ConsoleImpl() :
+ GameStateI("Console"),
+diff -ur scorched.old/src/common/common/DefinesFile.cpp scorched/src/common/common/DefinesFile.cpp
+--- scorched.old/src/common/common/DefinesFile.cpp 2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/common/DefinesFile.cpp 2009-02-18 20:07:58.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <common/DefinesFile.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <cstring>
+
+ #pragma warning(disable : 4996)
+
+diff -ur scorched.old/src/common/common/LoggerI.cpp scorched/src/common/common/LoggerI.cpp
+--- scorched.old/src/common/common/LoggerI.cpp 2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/common/LoggerI.cpp 2009-02-18 20:14:55.000000000 +0200
+@@ -20,6 +20,7 @@
+
+ #include <common/LoggerI.h>
+ #include <time.h>
++#include <cstring>
+
+ LoggerInfo::LoggerInfo(
+ const std::string &message,
+diff -ur scorched.old/src/common/common/main.h scorched/src/common/common/main.h
+--- scorched.old/src/common/common/main.h 2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/common/main.h 2009-02-18 20:07:18.000000000 +0200
+@@ -40,7 +40,7 @@
+ void _no_storage()
+ {
+ printf("Failed to allocate memory!!");
+- std::exit(1);
++ exit(1);
+ }
+
+ void run_main(int argc, char *argv[], OptionsParameters ¶ms)
+diff -ur scorched.old/src/common/common/sha2.h scorched/src/common/common/sha2.h
+--- scorched.old/src/common/common/sha2.h 2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/common/sha2.h 2009-02-18 20:24:57.000000000 +0200
+@@ -46,6 +46,7 @@
+
+ #include <string>
+ #include <stdexcept>
++#include <cstring>
+
+ // NOTE: You may need to define things by hand for your system:
+ typedef unsigned char sha_byte; // Exactly 1 byte
+diff -ur scorched.old/src/common/landscapemap/HeightMapModifier.cpp scorched/src/common/landscapemap/HeightMapModifier.cpp
+--- scorched.old/src/common/landscapemap/HeightMapModifier.cpp 2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/landscapemap/HeightMapModifier.cpp 2009-02-18 20:28:50.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <image/ImageBitmap.h>
+ #include <image/ImageFactory.h>
+ #include <lang/LangResource.h>
++#include <climits>
+
+ void HeightMapModifier::levelSurround(HeightMap &hmap)
+ {
+diff -ur scorched.old/src/common/lang/LangParam.cpp scorched/src/common/lang/LangParam.cpp
+--- scorched.old/src/common/lang/LangParam.cpp 2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/lang/LangParam.cpp 2009-02-18 20:22:06.000000000 +0200
+@@ -20,6 +20,7 @@
+
+ #include <lang/LangParam.h>
+ #include <common/DefinesString.h>
++#include <cstdlib>
+
+ LangParam::LangParam(const LangStringConverter &convValue)
+ {
+diff -ur scorched.old/src/common/lang/ResourceBundle.h scorched/src/common/lang/ResourceBundle.h
+--- scorched.old/src/common/lang/ResourceBundle.h 2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/lang/ResourceBundle.h 2009-02-18 20:20:12.000000000 +0200
+@@ -23,6 +23,7 @@
+
+ #include <set>
+ #include <lang/ResourceBundleEntry.h>
++#include <cstring>
+
+ class ResourceBundle
+ {
+diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h
+--- scorched.old/src/common/porting/windows.h 2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/porting/windows.h 2009-02-18 20:06:46.000000000 +0200
+@@ -20,7 +20,7 @@
+ typedef unsigned short WORD;
+ typedef unsigned char BYTE;
+
+-typedef int HWND;
++// typedef int HWND;
+ typedef void * HINSTANCE;
+ typedef int WPARAM;
+ typedef int LPARAM;
More information about the Frugalware-git
mailing list