[arch-commits] Commit in glob2/trunk (PKGBUILD fix-ftbfs-gcc49.diff)

[Eric Bélanger]

    Date: Monday, August 11, 2014 @ 07:18:00
  Author: eric
Revision: 117124

Fix build issue (close FS#40334)

Added:
  glob2/trunk/fix-ftbfs-gcc49.diff
Modified:
  glob2/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   10 ++++++----
 fix-ftbfs-gcc49.diff |   14 ++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-11 01:32:25 UTC (rev 117123)
+++ PKGBUILD	2014-08-11 05:18:00 UTC (rev 117124)
@@ -13,16 +13,18 @@
 depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu'
          'fribidi' 'xdg-utils' 'libgl' 'hicolor-icon-theme')
 makedepends=('scons' 'boost' 'mesa')
-install="$pkgname.install"
+install=glob2.install
 source=("http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz"
-        "$pkgname-${pkgver%.*}.1-gcc44.patch")
+        "glob2-0.9.4.1-gcc44.patch" fix-ftbfs-gcc49.diff)
 sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
-            '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a')
+            '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a'
+            '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
-  patch -Np0 -i "$srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch"
+  patch -p0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
+  patch -p1 -i "$srcdir/fix-ftbfs-gcc49.diff"
 }
 
 build() {

Added: fix-ftbfs-gcc49.diff
===================================================================
--- fix-ftbfs-gcc49.diff	                        (rev 0)
+++ fix-ftbfs-gcc49.diff	2014-08-11 05:18:00 UTC (rev 117124)
@@ -0,0 +1,14 @@
+Index: glob2-0.9.4.4/src/Game.h
+===================================================================
+--- glob2-0.9.4.4.orig/src/Game.h	2014-07-14 10:36:36.705074927 +0800
++++ glob2-0.9.4.4/src/Game.h	2014-07-14 10:38:28.733077827 +0800
+@@ -148,7 +148,8 @@
+ 		TOP_TO_BOTTOM,
+ 		BOTTOM_TO_TOP
+ 	};
+-	
++
++public:
+ 	struct BuildProject
+ 	{
+ 		int posX;