diff options
Diffstat (limited to 'games-simulation/secondlife/files/secondlife-1.18.4.1_rc-gentoo.patch')
| -rw-r--r-- | games-simulation/secondlife/files/secondlife-1.18.4.1_rc-gentoo.patch | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/games-simulation/secondlife/files/secondlife-1.18.4.1_rc-gentoo.patch b/games-simulation/secondlife/files/secondlife-1.18.4.1_rc-gentoo.patch index 833d53e..8478988 100644 --- a/games-simulation/secondlife/files/secondlife-1.18.4.1_rc-gentoo.patch +++ b/games-simulation/secondlife/files/secondlife-1.18.4.1_rc-gentoo.patch @@ -1,6 +1,6 @@ diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct --- linden.orig/indra/SConstruct 2007-10-30 06:12:46.000000000 +0900 -+++ linden/indra/SConstruct 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/SConstruct 2007-11-05 01:14:51.000000000 +0900 @@ -112,7 +112,7 @@ channel = optenv['CHANNEL'] standalone = optenv['STANDALONE'] @@ -28,6 +28,15 @@ diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct def pkgconfig(opt, pkgs=None): if pkgs is None: pkgs = standalone_pkgs + standalone_net_pkgs +@@ -243,7 +247,7 @@ + ############## + + # Generic GCC flags +- cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -Werror -fexceptions ' ++ cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -fexceptions ' + cxxflags = '' + cppflags = '-D_FORTIFY_SOURCE=2 ' + if standalone: @@ -602,7 +606,7 @@ net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ] net_external_libs += [ 'cares', 'expat' ] @@ -48,7 +57,7 @@ diff -Naur linden.orig/indra/SConstruct linden/indra/SConstruct create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver', diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej2coj/llimagej2coj.cpp --- linden.orig/indra/llimagej2coj/llimagej2coj.cpp 2007-10-30 06:12:46.000000000 +0900 -+++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/llimagej2coj/llimagej2coj.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -33,7 +33,7 @@ #include "llimagej2coj.h" @@ -60,7 +69,7 @@ diff -Naur linden.orig/indra/llimagej2coj/llimagej2coj.cpp linden/indra/llimagej #include "llmemory.h" diff -Naur linden.orig/indra/llmath/llquaternion.cpp linden/indra/llmath/llquaternion.cpp --- linden.orig/indra/llmath/llquaternion.cpp 2007-10-30 06:12:46.000000000 +0900 -+++ linden/indra/llmath/llquaternion.cpp 2007-11-03 09:47:50.000000000 +0900 ++++ linden/indra/llmath/llquaternion.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -698,22 +698,22 @@ { default: @@ -92,7 +101,7 @@ diff -Naur linden.orig/indra/llmath/llquaternion.cpp linden/indra/llmath/llquate return p; diff -Naur linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp linden/indra/llmessage/llfiltersd2xmlrpc.cpp --- linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-10-30 06:12:46.000000000 +0900 -+++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/llmessage/llfiltersd2xmlrpc.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -80,7 +80,7 @@ #include <sstream> @@ -104,7 +113,7 @@ diff -Naur linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp linden/indra/llmess #include "llbuffer.h" diff -Naur linden.orig/indra/llwindow/llgl.cpp linden/indra/llwindow/llgl.cpp --- linden.orig/indra/llwindow/llgl.cpp 2007-10-30 06:12:47.000000000 +0900 -+++ linden/indra/llwindow/llgl.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/llwindow/llgl.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -64,7 +64,7 @@ # include "GL/glxext.h" // Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol @@ -116,7 +125,7 @@ diff -Naur linden.orig/indra/llwindow/llgl.cpp linden/indra/llwindow/llgl.cpp diff -Naur linden.orig/indra/newview/llfloaterhtml.cpp linden/indra/newview/llfloaterhtml.cpp --- linden.orig/indra/newview/llfloaterhtml.cpp 2007-10-30 06:12:51.000000000 +0900 -+++ linden/indra/newview/llfloaterhtml.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/newview/llfloaterhtml.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -228,7 +228,9 @@ // static void LLFloaterHtml::onCommitUrlEdit(LLUICtrl* ctrl, void* user_data) @@ -129,7 +138,7 @@ diff -Naur linden.orig/indra/newview/llfloaterhtml.cpp linden/indra/newview/llfl std::string url = editor->getText(); diff -Naur linden.orig/indra/newview/llurldispatcher.cpp linden/indra/newview/llurldispatcher.cpp --- linden.orig/indra/newview/llurldispatcher.cpp 2007-10-30 06:12:51.000000000 +0900 -+++ linden/indra/newview/llurldispatcher.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/newview/llurldispatcher.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -151,7 +151,9 @@ { if (matchPrefix(url, SLURL_SL_HELP_PREFIX)) @@ -142,7 +151,7 @@ diff -Naur linden.orig/indra/newview/llurldispatcher.cpp linden/indra/newview/ll return false; diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/lluserauth.cpp --- linden.orig/indra/newview/lluserauth.cpp 2007-10-30 06:12:51.000000000 +0900 -+++ linden/indra/newview/lluserauth.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/newview/lluserauth.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -45,7 +45,7 @@ // NOTE: MUST include these after otherincludes since queue gets redefined!?!! @@ -154,7 +163,7 @@ diff -Naur linden.orig/indra/newview/lluserauth.cpp linden/indra/newview/llusera diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvoiceclient.cpp --- linden.orig/indra/newview/llvoiceclient.cpp 2007-10-30 06:12:51.000000000 +0900 -+++ linden/indra/newview/llvoiceclient.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/newview/llvoiceclient.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -39,7 +39,7 @@ #include "llvoavatar.h" #include "llbufferstream.h" @@ -166,7 +175,7 @@ diff -Naur linden.orig/indra/newview/llvoiceclient.cpp linden/indra/newview/llvo #include "llviewernetwork.h" // for gUserServerChoice diff -Naur linden.orig/indra/newview/llxmlrpctransaction.cpp linden/indra/newview/llxmlrpctransaction.cpp --- linden.orig/indra/newview/llxmlrpctransaction.cpp 2007-10-30 06:12:51.000000000 +0900 -+++ linden/indra/newview/llxmlrpctransaction.cpp 2007-11-03 09:36:53.000000000 +0900 ++++ linden/indra/newview/llxmlrpctransaction.cpp 2007-11-05 01:13:59.000000000 +0900 @@ -37,7 +37,7 @@ // Have to include these last to avoid queue redefinition! |