Build with gcc-4.5 Bug #321297

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/games-rpg/tmw/ChangeLog b/games-rpg/tmw/ChangeLog
index 032d0fb477789c95f0fafb2eea8f4271e31ccd89..0cc66ed2ee2efbf889d9bb6d47a2561086c2ea78 100644 (file)
--- a/games-rpg/tmw/ChangeLog
+++ b/games-rpg/tmw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/tmw
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/ChangeLog,v 1.37 2010/03/02 11:20:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/ChangeLog,v 1.38 2010/05/24 15:45:55 tupone Exp $
+
+  24 May 2010; Tupone Alfredo <tupone@gentoo.org> tmw-0.0.29.1.ebuild,
+  +files/tmw-0.0.29.1-gcc45.patch:
+  Build with gcc-4.5 Bug #321297 by flameeyes@gentoo.org
 
   02 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> tmw-0.0.29.1.ebuild:
   x86 stable wrt bug #303483

diff --git a/games-rpg/tmw/Manifest b/games-rpg/tmw/Manifest
index 50c7bf333f9dff28927416837c9f7e00e1eb4e8f..1b04b35bb2f9638c51db47fdd6c088086181b800 100644 (file)
--- a/games-rpg/tmw/Manifest
+++ b/games-rpg/tmw/Manifest
@@ -1,6 +1,7 @@
 AUX tmw-0.0.29.1-desktop.patch 1524 RMD160 2d837ec55f6b9725ea59ba9ee1fee85a642e9cff SHA1 c98c84104edc792a2ebece4d9dd9d83a5830c81e SHA256 64d50fd25940f83e3afa524e1a9e5ff41c5aa70b5a1e0956e1156f308b29c165
+AUX tmw-0.0.29.1-gcc45.patch 625 RMD160 21fe9ffaf0ba2df2caa028e230e29cdbe5028cca SHA1 0b127dfc67796042187f38385bf4d82de0e8bd23 SHA256 9657f37dd2560fdadcd3cdd2b05e5a26d757b0575fc770e0ba7fa2a4c19f600c
 DIST tmw-0.0.29.1.tar.gz 2614869 RMD160 c80dd7f84bc84f6074a1e3256294f7ecbb3bc4e1 SHA1 c8f0c9627b1fe95547ad231cf24159c51f79899c SHA256 319e91e6e0434cdbefa1b6c1214bfbf24dca714dce57353cc6265506fbf031f7
 DIST tmwmusic-0.0.20.tar.gz 9259802 RMD160 a7212f90b40f864d0670905fe037564eba48ab30 SHA1 c1e3126ff7f53f6e12caaf885a493cd5c4aed6e3 SHA256 964bb27235cdc3199c392f6ddf25ce293c6f32e013abe85592b96221a5896939
-EBUILD tmw-0.0.29.1.ebuild 1718 RMD160 54df93b510a311797226d128e61923f465ea6b65 SHA1 7349071d3f090b9617b98a2ee9a3afafad4098b8 SHA256 8ceb0e49a6a4deee8fe0c4486a2f30cb8955957fc776da360ba6ebb9545abca1
-MISC ChangeLog 5423 RMD160 20ad55c37d199dfd12a8a4798c2001c5e8ad4b5e SHA1 5ed50196f267e81ce688ac79ffa4974c20f339c2 SHA256 0b1087cfc1bbd7d27b2b0bf8f2f43907ba4581a3e2bfdf95e03feaa0475d89f0
+EBUILD tmw-0.0.29.1.ebuild 1749 RMD160 e352c90bc2e9cc226e32c4ee9984d6a66a913b50 SHA1 29b5a31215570f9f855f092d5a2c966afad6ede1 SHA256 44403d95da0b9bdff76aff7131f67541e62028351d7229fb54b9f86c4c5a5711
+MISC ChangeLog 5583 RMD160 655c98a1691013e6d86f1b57661da405b4783225 SHA1 e6aeab50f7952ed2d7c8eaa1125bc9e34000ed55 SHA256 a6dce0993d656d25bfede684a43729a23d9920f34d4453ed70c8337ef69ecbf2
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-rpg/tmw/files/tmw-0.0.29.1-gcc45.patch b/games-rpg/tmw/files/tmw-0.0.29.1-gcc45.patch
new file mode 100644 (file)
index 0000000..c6cad2a
--- /dev/null
+++ b/games-rpg/tmw/files/tmw-0.0.29.1-gcc45.patch
@@ -0,0 +1,22 @@
+--- src/emoteshortcut.cpp.old  2010-05-24 17:17:18.000000000 +0200
++++ src/emoteshortcut.cpp      2010-05-24 17:18:40.000000000 +0200
+@@ -26,7 +26,7 @@
+ 
+ #include "utils/stringutils.h"
+ 
+-EmoteShortcut::EmoteShortcut *emoteShortcut;
++EmoteShortcut *emoteShortcut;
+ 
+ EmoteShortcut::EmoteShortcut():
+     mEmoteSelected(0)
+--- src/itemshortcut.cpp.old   2010-05-24 17:19:37.000000000 +0200
++++ src/itemshortcut.cpp       2010-05-24 17:19:49.000000000 +0200
+@@ -30,7 +30,7 @@
+ 
+ #include "utils/stringutils.h"
+ 
+-ItemShortcut::ItemShortcut *itemShortcut;
++ItemShortcut *itemShortcut;
+ 
+ ItemShortcut::ItemShortcut():
+     mItemSelected(-1)

diff --git a/games-rpg/tmw/tmw-0.0.29.1.ebuild b/games-rpg/tmw/tmw-0.0.29.1.ebuild
index 5a99744aeb763ef5466113de1d93181544c1b862..acbd3b8977e54e65363b5119bd53f9aef22cfc33 100644 (file)
--- a/games-rpg/tmw/tmw-0.0.29.1.ebuild
+++ b/games-rpg/tmw/tmw-0.0.29.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.0.29.1.ebuild,v 1.5 2010/03/02 11:20:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.0.29.1.ebuild,v 1.6 2010/05/24 15:45:55 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -38,7 +38,8 @@ src_prepare() {
                -e '/^SUBDIRS/s/fonts//' \
                data/Makefile.in \
                || die "sed failed"
-       epatch "${FILESDIR}"/${P}-desktop.patch
+       epatch "${FILESDIR}"/${P}-desktop.patch \
+               "${FILESDIR}"/${P}-gcc45.patch
 }
 
 src_configure() {