summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2006-10-08 20:54:22 +0000
committerAlfredo Tupone <tupone@gentoo.org>2006-10-08 20:54:22 +0000
commit67d226a893242828a27a01c7a8b8e2f671b0dc40 (patch)
treefa1b220187edc086489c17638a5fa7c1df16cefb /games-roguelike/tome
parentVersion bump (diff)
downloadgentoo-2-67d226a893242828a27a01c7a8b8e2f671b0dc40.tar.gz
gentoo-2-67d226a893242828a27a01c7a8b8e2f671b0dc40.tar.bz2
gentoo-2-67d226a893242828a27a01c7a8b8e2f671b0dc40.zip
Fix for gcc-4. Bug #145125
(Portage version: 2.1.1)
Diffstat (limited to 'games-roguelike/tome')
-rw-r--r--games-roguelike/tome/ChangeLog6
-rw-r--r--games-roguelike/tome/files/tome-2.3.3-gcc41.patch18
-rw-r--r--games-roguelike/tome/tome-2.3.3.ebuild6
3 files changed, 27 insertions, 3 deletions
diff --git a/games-roguelike/tome/ChangeLog b/games-roguelike/tome/ChangeLog
index 110481ff18b7..6f00d111cee9 100644
--- a/games-roguelike/tome/ChangeLog
+++ b/games-roguelike/tome/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-roguelike/tome
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.23 2006/03/07 19:28:10 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.24 2006/10/08 20:54:22 tupone Exp $
+
+ 08 Oct 2006; <tupone@gentoo.org> +files/tome-2.3.3-gcc41.patch,
+ tome-2.3.3.ebuild:
+ Failed emerging with gcc-4. Bug #145125 by Elmo Todurov
07 Mar 2006; <Tupone@gentoo.org> tome-2.3.3.ebuild:
using bindnow-flags and adding ~ppc-macosx
diff --git a/games-roguelike/tome/files/tome-2.3.3-gcc41.patch b/games-roguelike/tome/files/tome-2.3.3-gcc41.patch
new file mode 100644
index 000000000000..89ef0bb2e07d
--- /dev/null
+++ b/games-roguelike/tome/files/tome-2.3.3-gcc41.patch
@@ -0,0 +1,18 @@
+--- src/main-gtk.c.old 2006-10-08 22:36:50.000000000 +0200
++++ src/main-gtk.c 2006-10-08 22:37:24.000000000 +0200
+@@ -4478,13 +4478,13 @@
+ strnfmt(buf, 64, "/Terms/%s", angband_term_name[i]);
+
+ /* XXX XXX Store it in the menu definition */
+- (cptr)term_entry[i].path = string_make(buf);
++ term_entry[i].path = string_make(buf);
+
+ /* XXX XXX Build the real path name to the entry */
+ strnfmt(buf, 64, "/Options/Font/%s", angband_term_name[i]);
+
+ /* XXX XXX Store it in the menu definition */
+- (cptr)font_entry[i].path = string_make(buf);
++ font_entry[i].path = string_make(buf);
+ }
+ }
+
diff --git a/games-roguelike/tome/tome-2.3.3.ebuild b/games-roguelike/tome/tome-2.3.3.ebuild
index 0bbfe7fe544b..adf09d91400c 100644
--- a/games-roguelike/tome/tome-2.3.3.ebuild
+++ b/games-roguelike/tome/tome-2.3.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.3.ebuild,v 1.2 2006/03/07 19:28:10 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.3.ebuild,v 1.3 2006/10/08 20:54:22 tupone Exp $
inherit eutils flag-o-matic games
@@ -30,7 +30,9 @@ S="${WORKDIR}/tome-${MY_PV}-src"
src_unpack() {
unpack ${A}
- cd "${S}/src"
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc41.patch
+ cd "src"
mv makefile.std makefile
epatch "${FILESDIR}/${PV}-gentoo-paths.patch"
sed -i \