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

Conflicts:
	community/antiword/PKGBUILD
	community/apcupsd/PKGBUILD
	community/busybox/PKGBUILD
	community/chrpath/PKGBUILD
	community/driftnet/PKGBUILD
	community/emesene/PKGBUILD
	community/fdm/PKGBUILD
	community/fftw2/PKGBUILD
	community/gsynaptics/PKGBUILD
	community/gtk-rezlooks-engine/PKGBUILD
	community/httptunnel/PKGBUILD
	community/libnfnetlink/PKGBUILD
	community/libopenraw/PKGBUILD
	community/mashup/PKGBUILD
	community/pcb/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/preload/PKGBUILD
	community/rlog/PKGBUILD
	community/scponly/PKGBUILD
	community/splint/PKGBUILD
	community/wmname/PKGBUILD
	community/xosd/PKGBUILD
	community/xxkb/PKGBUILD
	community/znc/PKGBUILD
	core/glibc/PKGBUILD
	core/libtool/PKGBUILD
	extra/at/PKGBUILD
	extra/autogen/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/cdrdao/PKGBUILD
	extra/chkrootkit/PKGBUILD
	extra/cmt/PKGBUILD
	extra/compface/PKGBUILD
	extra/dasher/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/dmapi/PKGBUILD
	extra/docker/PKGBUILD
	extra/dvd+rw-tools/PKGBUILD
	extra/dvdrtools/PKGBUILD
	extra/fcgi/PKGBUILD
	extra/festival/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gecko-sharp-2.0/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gmetadom/PKGBUILD
	extra/gnome-speech/PKGBUILD
	extra/gnome-vfsmm/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/graphite/PKGBUILD
	extra/i8kutils/PKGBUILD
	extra/id3/PKGBUILD
	extra/java-access-bridge/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/koffice/PKGBUILD
	extra/ladspa/PKGBUILD
	extra/libcddb/PKGBUILD
	extra/libcroco/PKGBUILD
	extra/libdc1394/PKGBUILD
	extra/libdca/PKGBUILD
	extra/libgee/PKGBUILD
	extra/libglademm/PKGBUILD
	extra/libgnomecanvasmm/PKGBUILD
	extra/libsigsegv/PKGBUILD
	extra/libstdc++5/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libytnef/PKGBUILD
	extra/lua/PKGBUILD
	extra/mcpp/PKGBUILD
	extra/metalog/PKGBUILD
	extra/mp3wrap/PKGBUILD
	extra/mt-st/PKGBUILD
	extra/naim/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/oxine/PKGBUILD
	extra/php/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pstoedit/PKGBUILD
	extra/qt/PKGBUILD
	extra/speex/PKGBUILD
	extra/sweep/PKGBUILD
	extra/t1lib/PKGBUILD
	extra/taglib-extras/PKGBUILD
	extra/unixodbc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/ypbind-mt/PKGBUILD
	gnome-unstable/caribou/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/cogl/PKGBUILD
	gnome-unstable/dconf/PKGBUILD
	gnome-unstable/empathy/PKGBUILD
	gnome-unstable/empathy/empathy.install
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/folks/PKGBUILD
	gnome-unstable/gconf/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/gdm/fix_external_program_directories.patch
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-color-manager/PKGBUILD
	gnome-unstable/gnome-contacts/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/gnome-menus/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-panel/PKGBUILD
	gnome-unstable/gnome-power-manager/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-shell/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gnome-utils/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gtkmm3/PKGBUILD
	gnome-unstable/libgdata/PKGBUILD
	gnome-unstable/libgnome-keyring/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/libwnck3/PKGBUILD
	gnome-unstable/mash/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/mx/PKGBUILD
	gnome-unstable/pulseaudio/PKGBUILD
	gnome-unstable/pygobject/PKGBUILD
	gnome-unstable/pygobject2/PKGBUILD
	gnome-unstable/seahorse/PKGBUILD
	gnome-unstable/sushi/PKGBUILD
	gnome-unstable/totem/PKGBUILD
	gnome-unstable/upower/PKGBUILD
	gnome-unstable/vala/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-gtk/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-mpg123/PKGBUILD
	multilib/lib32-nspr/PKGBUILD
	multilib/lib32-nss/PKGBUILD
	multilib/lib32-nss/add_spi+cacert_ca_certs.patch
	multilib/lib32-openssl/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	multilib/wine/PKGBUILD
	testing/util-linux/PKGBUILD

1 files changed, 67 insertions, 0 deletions

diff --git a/community-staging/spring/gcc46.patch b/community-staging/spring/gcc46.patch
new file mode 100644
index 000000000..4f6865cac
--- /dev/null
+++ b/community-staging/spring/gcc46.patch
@@ -0,0 +1,67 @@
+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;
+