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, 46 insertions, 11 deletions

diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD
index 152a2d7da..b8d394894 100644
--- a/community/supertux/PKGBUILD
+++ b/community/supertux/PKGBUILD
@@ -1,28 +1,27 @@
+# $Id: PKGBUILD 74627 2012-07-31 19:57:01Z ebelanger $
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Eric Belanger <belanger@astro.umontreal.ca>
+# Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: vande198
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=supertux
 pkgver=0.3.3
-pkgrel=5.1
+pkgrel=6
 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://super-tux.sourceforge.net/"
 license=('GPL')
 depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew')
 makedepends=('cmake' 'boost')
-source=("http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2"
-	'squirrel.patch')
+source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 
+        supertux2-0.3.3-squirrel-gcc47.patch)
 md5sums=('f3f803e629ee51a9de0b366a036e393d'
-	 'eb06315514be4f200428f14b927beb66')
+         'eb06315514be4f200428f14b927beb66')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # The following patch was taken from https://supertux.lethargik.org/bugs/view.php?id=933&nbn=3
-  patch -Np1 -i "$srcdir/squirrel.patch"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
   sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
   sed -i '/types\.h/d' src/addon/addon_manager.cpp
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
@@ -30,7 +29,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch
new file mode 100644
index 000000000..16781b610
--- /dev/null
+++ b/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch
@@ -0,0 +1,36 @@
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h	1970-01-01 01:00:00.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h	2012-05-01 11:59:37.000000000 +0200
+@@ -0,0 +1,8 @@
++/*	see copyright notice in squirrel.h */
++#ifndef _SQMEM_H_
++#define _SQMEM_H_
++
++void *sq_vm_malloc(SQUnsignedInteger size);
++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
++void sq_vm_free(void *p,SQUnsignedInteger size);
++#endif //_SQMEM_H_
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h	2010-03-01 13:40:58.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h	2012-05-01 11:59:37.000000000 +0200
+@@ -136,8 +136,4 @@
+ extern SQObjectPtr _minusone_;
+ 
+ bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
+-
+-void *sq_vm_malloc(SQUnsignedInteger size);
+-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
+-void sq_vm_free(void *p,SQUnsignedInteger size);
+ #endif //_SQSTATE_H_
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h	2010-03-01 13:40:58.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h	2012-05-01 11:59:37.000000000 +0200
+@@ -2,6 +2,8 @@
+ #ifndef _SQUTILS_H_
+ #define _SQUTILS_H_
+ 
++#include "sqmem.h"
++
+ #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
+ #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
+ #define SQ_MALLOC(__size) sq_vm_malloc((__size));