diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2009-04-16 06:29:58 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-04-16 06:29:58 +0000 |
commit | 2265915990330c2ffc5215393ce1dd7507ff5715 (patch) | |
tree | b5c64ef723dca71dcd9ee2f9ce4fde8a68162a49 /games-action/btanks/files | |
parent | Stable for HPPA (bug #251832). (diff) | |
download | gentoo-2-2265915990330c2ffc5215393ce1dd7507ff5715.tar.gz gentoo-2-2265915990330c2ffc5215393ce1dd7507ff5715.tar.bz2 gentoo-2-2265915990330c2ffc5215393ce1dd7507ff5715.zip |
old
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'games-action/btanks/files')
-rw-r--r-- | games-action/btanks/files/btanks-0.7.5800-gcc43.patch | 91 | ||||
-rw-r--r-- | games-action/btanks/files/btanks-0.7.5800-scons-blows.patch | 35 |
2 files changed, 0 insertions, 126 deletions
diff --git a/games-action/btanks/files/btanks-0.7.5800-gcc43.patch b/games-action/btanks/files/btanks-0.7.5800-gcc43.patch deleted file mode 100644 index c6515b62d940..000000000000 --- a/games-action/btanks/files/btanks-0.7.5800-gcc43.patch +++ /dev/null @@ -1,91 +0,0 @@ -sniped from Debian to fix building with gcc-4.3 - -http://bugs.gentoo.org/217944 - ---- btanks-0.7.5800/mrt/udp_socket.cpp -+++ btanks-0.7.5800/mrt/udp_socket.cpp -@@ -22,6 +22,7 @@ - # endif - #endif - -+#include <cstring> - - using namespace mrt; - ---- btanks-0.7.5800/mrt/sys_socket.cpp -+++ btanks-0.7.5800/mrt/sys_socket.cpp -@@ -27,6 +27,7 @@ - # include <unistd.h> - #endif - -+#include <cstring> - - using namespace mrt; - ---- btanks-0.7.5800/mrt/lang.cpp -+++ btanks-0.7.5800/mrt/lang.cpp -@@ -8,6 +8,9 @@ - #include "lang.h" - #include "logger.h" - -+#include <cstdlib> -+#include <cstring> -+ - const std::string mrt::getLanguageCode() { - #ifdef WIN32 - LANGID lang_id = GetUserDefaultLangID(); ---- btanks-0.7.5800/mrt/serializator.cpp -+++ btanks-0.7.5800/mrt/serializator.cpp -@@ -31,6 +31,8 @@ - #include <limits.h> - #include "exception.h" - -+#include <cstring> -+ - #ifdef WIN32 - # ifndef uint32_t - # define uint32_t unsigned __int32 ---- btanks-0.7.5800/menu/menu_config.cpp -+++ btanks-0.7.5800/menu/menu_config.cpp -@@ -24,6 +24,8 @@ - #include "mrt/b64.h" - #include "config.h" - -+#include <cstring> -+ - IMPLEMENT_SINGLETON(MenuConfig, IMenuConfig); - - void SlotConfig::serialize(mrt::Serializator &s) const { ---- btanks-0.7.5800/src/i18n.cpp -+++ btanks-0.7.5800/src/i18n.cpp -@@ -20,6 +20,8 @@ - #include "mrt/exception.h" - #include <assert.h> - -+#include <cstring> -+ - IMPLEMENT_SINGLETON(I18n, II18n); - - bool lessnocase::operator()(const std::string& s1, const std::string& s2) const { ---- btanks-0.7.5800/src/var.cpp -+++ btanks-0.7.5800/src/var.cpp -@@ -21,6 +21,8 @@ - #include "mrt/serializator.h" - #include <assert.h> - -+#include <cstdlib> -+ - void Var::serialize(mrt::Serializator &s) const { - if (type.empty()) - throw_ex(("cannot serialize empty variable")); ---- btanks-0.7.5800/objects/trooper.cpp -+++ btanks-0.7.5800/objects/trooper.cpp -@@ -24,6 +24,8 @@ - #include "config.h" - #include "trooper.h" - -+#include <cstring> -+ - void Trooper::getImpassabilityPenalty(const float impassability, float &base, float &base_value, float &penalty) const { - if (impassability > 0.2f) { - base_value = 0.2f; diff --git a/games-action/btanks/files/btanks-0.7.5800-scons-blows.patch b/games-action/btanks/files/btanks-0.7.5800-scons-blows.patch deleted file mode 100644 index f3e9fed3bd76..000000000000 --- a/games-action/btanks/files/btanks-0.7.5800-scons-blows.patch +++ /dev/null @@ -1,35 +0,0 @@ -Respect env build settings, dont force crappy flags, and make sure -rpath is added properly. - ---- SConstruct -+++ SConstruct -@@ -81,16 +81,10 @@ - if env['gcc_visibility']: - env.Append(CCFLAGS=' -fvisibility-inlines-hidden -fvisibility=hidden '); - env.Append(CPPFLAGS=' -fvisibility-inlines-hidden -fvisibility=hidden '); -- if debug: -- env.Append(CCFLAGS='-ggdb ') -- env.Append(CPPFLAGS='-ggdb ') -- else: -- env.Append(CCFLAGS='-O3 ') -- env.Append(CPPFLAGS='-O3 ') - - al_lib = 'openal' -- env.Append(CPPFLAGS=' -Wall -pedantic -Wno-long-long -pipe -pthread ') -- env.Append(CCFLAGS=' -Wall -pedantic -Wno-long-long -pipe -pthread ') -+ env.Append(CPPFLAGS=' -Wall -pedantic -Wno-long-long -pthread ') -+ env.Append(CCFLAGS=' -Wall -pedantic -Wno-long-long -pthread ') - - - conf_env = env.Copy() ---- SConscript -+++ SConscript -@@ -94,7 +94,7 @@ - - Import('lib_dir') - if sys.platform != 'win32': -- bt_env.Append(LINKFLAGS=' -Wl,-rpath '+ lib_dir + ' -Wl,-rpath-link,build/' + env['mode'] + '/mrt') -- bt_env.Append(LINKFLAGS=' -Wl,-rpath '+ lib_dir + ' -Wl,-rpath-link,build/' + env['mode'] + '/sdlx') -+ bt_env.Append(LINKFLAGS=' -Wl,-rpath,'+ lib_dir + ' -Wl,-rpath-link,build/' + env['mode'] + '/mrt') -+ bt_env.Append(LINKFLAGS=' -Wl,-rpath,'+ lib_dir + ' -Wl,-rpath-link,build/' + env['mode'] + '/sdlx') - - bt_main = bt_env.Program('bt', bt_main_sources, LIBS=bt_main_libs, RPATH=[lib_dir]) |