diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2012-08-31 19:37:57 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2012-08-31 19:37:57 +0000 |
| commit | f75ad5ea3ba2620212dc67e54e20a21363b179c8 (patch) | |
| tree | 6cf0a02f25713719e178328a216da7838dc7e99a /games-roguelike/scourge | |
| parent | Version bump. Remove old (diff) | |
| download | gentoo-2-f75ad5ea3ba2620212dc67e54e20a21363b179c8.tar.gz gentoo-2-f75ad5ea3ba2620212dc67e54e20a21363b179c8.tar.bz2 gentoo-2-f75ad5ea3ba2620212dc67e54e20a21363b179c8.zip | |
Fix build with gcc-4.7. Bug #432202
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'games-roguelike/scourge')
| -rw-r--r-- | games-roguelike/scourge/ChangeLog | 8 | ||||
| -rw-r--r-- | games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch | 12 | ||||
| -rw-r--r-- | games-roguelike/scourge/scourge-0.21.1.ebuild | 5 |
3 files changed, 21 insertions, 4 deletions
diff --git a/games-roguelike/scourge/ChangeLog b/games-roguelike/scourge/ChangeLog index c97cbe20dbbb..f59fdf03bfd7 100644 --- a/games-roguelike/scourge/ChangeLog +++ b/games-roguelike/scourge/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-roguelike/scourge -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/ChangeLog,v 1.37 2010/09/24 23:13:15 mr_bones_ Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/ChangeLog,v 1.38 2012/08/31 19:37:57 tupone Exp $ + + 31 Aug 2012; Alfredo Tupone <tupone@gentoo.org> scourge-0.21.1.ebuild, + +files/scourge-0.21.1-gcc47.patch: + Fix build with gcc-4.7. Bug #432202 by Diego Elio Pettenò 24 Sep 2010; Michael Sterrett <mr_bones_@gentoo.org> scourge-0.21.1.ebuild: diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch new file mode 100644 index 000000000000..50c5cac32934 --- /dev/null +++ b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch @@ -0,0 +1,12 @@ +--- src/squirrel/squtils.h.old 2012-08-30 18:06:43.474037926 +0200 ++++ src/squirrel/squtils.h 2012-08-30 18:14:13.300261523 +0200 +@@ -8,6 +8,9 @@ + #define SQ_FREE(__ptr,__size) sq_vm_free(__ptr,__size); + #define SQ_REALLOC(__ptr,__oldsize,__size) sq_vm_realloc(__ptr,__oldsize,__size); + ++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size); ++void sq_vm_free(void *p,SQUnsignedInteger size); ++ + //sqvector mini vector class, supports objects by value + template<typename T> class sqvector + { diff --git a/games-roguelike/scourge/scourge-0.21.1.ebuild b/games-roguelike/scourge/scourge-0.21.1.ebuild index b27d99d14a2e..b1d15014f8a7 100644 --- a/games-roguelike/scourge/scourge-0.21.1.ebuild +++ b/games-roguelike/scourge/scourge-0.21.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/scourge-0.21.1.ebuild,v 1.6 2010/09/24 23:13:15 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/scourge-0.21.1.ebuild,v 1.7 2012/08/31 19:37:57 tupone Exp $ EAPI=2 inherit autotools eutils wxwidgets games @@ -38,6 +38,7 @@ src_prepare() { sed -i \ -e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \ src/scourgehandler.cpp || die + epatch "${FILESDIR}"/${P}-gcc47.patch eautoreconf } |