Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/asunder/PKGBUILD
	community/gshare/PKGBUILD
	community/kim4/PKGBUILD
	community/listen/PKGBUILD
	community/mercury/PKGBUILD
	core/eglibc/nscd

2 files changed, 0 insertions, 115 deletions

diff --git a/community/spring/awk-java.patch b/community/spring/awk-java.patch
deleted file mode 100644
index 36c932924..000000000
--- a/community/spring/awk-java.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk
---- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk	2011-07-26 17:29:16.623158278 +0200
-+++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk	2011-07-26 17:33:00.872921328 +0200
-@@ -341,7 +341,7 @@
- }
- 
- # beginn of struct S*Command
--/^\struct S.*Command( \{)?/ {
-+/^struct S.*Command( \{)?/ {
- 
- 	isInsideCmdStruct = 1;
- 	ind_cmdMember = 0;
-diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk
---- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk	2011-07-26 17:29:16.623158278 +0200
-+++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk	2011-07-26 17:32:51.009745026 +0200
-@@ -473,7 +473,7 @@
- }
- 
- # beginn of struct S*Event
--/^\struct S.*Event( \{)?/ {
-+/^struct S.*Event( \{)?/ {
- 
- 	isInsideEvtStruct = 1;
- 	ind_evtMember = 0;
-diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk
---- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk	2011-07-26 17:29:16.626491558 +0200
-+++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk	2011-07-26 17:30:25.695391913 +0200
-@@ -387,7 +387,7 @@
- }
- 
- # beginn of struct S*Command
--/^\struct S.*Command( \{)?/ {
-+/^struct S.*Command( \{)?/ {
- 
- 	isInsideCmdStruct = 1;
- 	ind_cmdMember = 0;
-diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk
---- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk	2011-07-26 17:29:16.626491558 +0200
-+++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk	2011-07-26 17:30:13.942245701 +0200
-@@ -366,7 +366,7 @@
- }
- 
- # beginn of struct S*Event
--/^\struct S.*Event( \{)?/ {
-+/^struct S.*Event( \{)?/ {
- 
- 	isInsideEvtStruct = 1;
- 	ind_evtMember = 0;
diff --git a/community/spring/gcc46.patch b/community/spring/gcc46.patch
deleted file mode 100644
index 4f6865cac..000000000
--- a/community/spring/gcc46.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Jan Dittberner <jandd@debian.org>
-Subject: Patch for FTBFS with g++ 4.6.0
-Bug-Debian: http://bugs.debian.org/625097
-Bug: http://springrts.com/mantis/view.php?id=2415
---- a/AI/Skirmish/E323AI/AAStar.h
-+++ b/AI/Skirmish/E323AI/AAStar.h
-@@ -4,6 +4,7 @@
- #include <queue>
- #include <vector>
- #include <list>
-+#include <cstddef> // for NULL
- 
- class AAStar {
- 	public:
---- a/rts/Rendering/ShadowHandler.cpp
-+++ b/rts/Rendering/ShadowHandler.cpp
-@@ -318,6 +318,11 @@
- 	xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1))));
- 	ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1))));
- 
-+	shadowParams.x = xmid;
-+	shadowParams.y = ymid;
-+	shadowParams.z = p17;
-+	shadowParams.w = p18;
-+
- 	shadowMatrix[ 0] =   cross1.x / maxLengthX;
- 	shadowMatrix[ 4] =   cross1.y / maxLengthX;
- 	shadowMatrix[ 8] =   cross1.z / maxLengthX;
---- a/rts/Rendering/ShadowHandler.h
-+++ b/rts/Rendering/ShadowHandler.h
-@@ -38,7 +38,7 @@
- 	CMatrix44f shadowMatrix;
- 	void CalcMinMaxView(void);
- 
--	const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); }
-+	const float4& GetShadowParams() const { return shadowParams; }
- 
- 	enum ShadowGenProgram {
- 		SHADOWGEN_PROGRAM_MODEL      = 0,
-@@ -76,6 +76,7 @@
- 	//! to write the (FBO) depth-buffer texture
- 	std::vector<Shader::IProgramObject*> shadowGenProgs;
- 
-+	float4 shadowParams;
- 	float x1, x2, y1, y2;
- 	float xmid, ymid;
- 	float p17, p18;
---- a/rts/Rendering/GLContext.cpp
-+++ b/rts/Rendering/GLContext.cpp
-@@ -9,6 +9,7 @@
- #include "GLContext.h"
- 
- #include <list>
-+#include <cstddef>  // for NULL
- 
- 
- using namespace std;
---- a/rts/System/MemPool.h
-+++ b/rts/System/MemPool.h
-@@ -4,6 +4,7 @@
- #define _MEM_POOL_H_
- 
- #include <new>
-+#include <cstddef> // for NULL
- 
- const size_t MAX_MEM_SIZE=200;
-