Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/tp_smapi/PKGBUILD
	community/fish/PKGBUILD
	community/supertux/PKGBUILD
	extra/gvfs/PKGBUILD
	multilib/wine/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iptables/PKGBUILD
	testing/krb5/PKGBUILD
	testing/lm_sensors/PKGBUILD
	testing/lm_sensors/healthd
	testing/lm_sensors/healthd.rc

2 files changed, 56 insertions, 9 deletions

diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index 27ae318b8..1c1804fe7 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 64173 2012-02-09 17:40:27Z svenstaro $
+# $Id: PKGBUILD 74620 2012-07-31 19:56:16Z ebelanger $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
- 
+
 pkgname=megaglest
 pkgver=3.6.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/megaglest/"
 license=('GPL3')
 depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew'
-         'libircclient' 'miniupnpc' 'wxgtk')
+'libircclient' 'miniupnpc' 'wxgtk')
 makedepends=('ftjam' 'cmake' 'mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz")
-md5sums=('5a4a2429435031d9f9cc5d9535a9de9d')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz"
+        lol.patch)
+md5sums=('5a4a2429435031d9f9cc5d9535a9de9d'
+         '68fd326b73ed1c75981004fbdef6b73a')
 
 build() {
   cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
 
+  patch -Np1 < $srcdir/lol.patch
+
   [[ -d build ]] && rm -r build
   mkdir build && cd build
   cmake .. \
-   -DWANT_SVN_STAMP=OFF \
- 	 -DCMAKE_INSTALL_PREFIX=/usr \
-   -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
+    -DWANT_SVN_STAMP=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
   make
 }
 
diff --git a/community/megaglest/lol.patch b/community/megaglest/lol.patch
new file mode 100644
index 000000000..56f94c852
--- /dev/null
+++ b/community/megaglest/lol.patch
@@ -0,0 +1,43 @@
+diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h
+index 8fcfb27..3cb7a41 100644
+--- a/source/shared_lib/include/graphics/math_util.h
++++ b/source/shared_lib/include/graphics/math_util.h
+@@ -184,10 +184,10 @@ public:
+ 
+ 	Rect2<T> computeBoundingRect() const{
+ 		return Rect2i(
+-			min(p[0].x, p[1].x), 
+-			min(p[0].y, p[2].y), 
+-			max(p[2].x, p[3].x), 
+-			max(p[1].y, p[3].y));
++			std::min(p[0].x, p[1].x),
++			std::min(p[0].y, p[2].y),
++			std::max(p[2].x, p[3].x),
++			std::max(p[1].y, p[3].y));
+ 	}
+ 
+ 	bool isInside(const Vec2<T> &pt) const{
+diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp
+index b09c972..ddebd03 100644
+--- a/source/shared_lib/sources/platform/posix/ircclient.cpp
++++ b/source/shared_lib/sources/platform/posix/ircclient.cpp
+@@ -13,6 +13,7 @@
+ #include "ircclient.h"
+ #include "util.h"
+ #include "platform_common.h"
++#include "libirc_rfcnumeric.h"
+ #include "libircclient.h"
+ 
+ #include <stdio.h>
+diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp
+index 05478fc..c27aa62 100644
+--- a/source/shared_lib/sources/util/util.cpp
++++ b/source/shared_lib/sources/util/util.cpp
+@@ -19,6 +19,7 @@
+ #include <stdarg.h>
+ #include <time.h>
+ #include <fcntl.h> // for open()
++#include <unistd.h>
+ 
+ #ifdef WIN32
+   #include <io.h> // for open()