From d525d9a731f5d79c1128a192b9d2977a2967570f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 14 Jul 2013 01:49:21 -0700
Subject: Sun Jul 14 01:49:07 PDT 2013

---
 community/spring/PKGBUILD    | 12 ++++++++----
 community/spring/gcc48.patch | 22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 community/spring/gcc48.patch

(limited to 'community/spring')

diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 83feb1c9c..c0b82407c 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87439 2013-03-31 19:18:57Z stephane $
+# $Id: PKGBUILD 94070 2013-07-13 20:40:02Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
@@ -6,7 +6,7 @@
 pkgname=spring
 pkgver=0.94.1
 _pkgver=94.1
-pkgrel=2
+pkgrel=4
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64')
 url="http://springrts.com/"
@@ -17,14 +17,18 @@ makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'me
 optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
 install=spring.install
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
-md5sums=('bafc1e889bed31666553efc387a13b49')
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma
+        gcc48.patch)
+md5sums=('bafc1e889bed31666553efc387a13b49'
+         '8de391795f4a2e78be51a129dcd4dec2')
 
 build() {
   bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
   
   cd spring_${_pkgver}
 
+  patch -Np1 < $srcdir/gcc48.patch
+
   cmake	. \
     -DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATADIR=share/spring \
diff --git a/community/spring/gcc48.patch b/community/spring/gcc48.patch
new file mode 100644
index 000000000..ea69a42c4
--- /dev/null
+++ b/community/spring/gcc48.patch
@@ -0,0 +1,22 @@
+diff --git a/rts/System/Sound/EFX.cpp b/rts/System/Sound/EFX.cpp
+index 08fe9f4..3b197f0 100644
+--- a/rts/System/Sound/EFX.cpp
++++ b/rts/System/Sound/EFX.cpp
+@@ -83,7 +83,7 @@ CEFX::CEFX(ALCdevice* device)
+ 		ALuint alFx;
+ 		alGenEffects(1, &alFx);
+ 		if (alGetError() == AL_NO_ERROR) {
+-			for(size_t i = 0; i < sizeof(effects); i++) {
++			for(size_t i = 0; i < sizeof(effects)/sizeof(effects[0]); i++) {
+ 				const ALuint fx = effects[i];
+ 				alEffecti(alFx, AL_EFFECT_TYPE, fx);
+ 				effectsSupported[fx] = (alGetError() == AL_NO_ERROR);
+@@ -103,7 +103,7 @@ CEFX::CEFX(ALCdevice* device)
+ 		ALuint alFilter;
+ 		alGenFilters(1, &alFilter);
+ 		if (alGetError() == AL_NO_ERROR) {
+-			for(size_t i = 0; i < sizeof(filters); i++) {
++			for(size_t i = 0; i < sizeof(filters)/sizeof(filters[0]); i++) {
+ 				const ALuint filter = filters[i];
+ 				alFilteri(alFilter, AL_FILTER_TYPE, filter);
+ 				filtersSupported[filter] = (alGetError() == AL_NO_ERROR);
-- 
cgit v1.2.3-54-g00ecf