Fix building with glibc-2.10. (bug #226191)

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 39 insertions, 11 deletions

diff --git a/games-rpg/adonthell/ChangeLog b/games-rpg/adonthell/ChangeLog
index 517c3fb6dc32..2ca97833c67e 100644
--- a/games-rpg/adonthell/ChangeLog
+++ b/games-rpg/adonthell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/adonthell
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.15 2008/05/29 12:16:46 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.16 2009/07/26 22:03:30 dirtyepic Exp $
+
+  26 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> adonthell-0.3.4a-r1.ebuild,
+  +files/adonthell-0.3.4a-glibc-2.10.patch:
+  Fix building with glibc-2.10. (bug #226191)
 
   29 May 2008; Tristan Heaven <nyhm@gentoo.org> adonthell-0.3.4a-r1.ebuild:
   Move swig to DEPEND, bug #221483
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
index be6b408e1cd4..063970fe3601 100644
--- a/games-rpg/adonthell/Manifest
+++ b/games-rpg/adonthell/Manifest
@@ -4,15 +4,16 @@ Hash: SHA1
 AUX 0.3.4a-configure.in.patch 3310 RMD160 4de8ce67f5362c1d89d64d0ac37687c1e9bba5ab SHA1 818fe23ac15bba79712fb269078d41f4766345d1 SHA256 29883a145e5aaecbec3c526dffc9a75933eb1e6b0f0d536b6ecbb440cd26a17e
 AUX adonthell-0.3.4a-external-libs.patch 3713 RMD160 6abeffb5adc289fec74814ea97e1e57c1b524cfe SHA1 7ece53eed1389804eb1a5c40cf6a748507145520 SHA256 e49b89b079e607d5077daf1e81ec64c81927b36e2cb804f20ff9623746b8c439
 AUX adonthell-0.3.4a-gcc-41.patch 368 RMD160 7809943ceb905846fbda7ac175dddd12eba82888 SHA1 9f2b8d4e3b3f2b3f56d468cacc65186e76a32b2b SHA256 8725778c536ef332586e22451fab31273e4efc1db1b28c3bc6fd2c1498dbb30b
+AUX adonthell-0.3.4a-glibc-2.10.patch 792 RMD160 e3516959c0554009628f78cf0e49b3969b054d51 SHA1 0faaeeda028a24ee38671fd5f3b3eb38476027a3 SHA256 23e1a0ad1f49035c80797bec1ba6740bceb84426938ac4a3f7c7169c32424d31
 AUX adonthell-0.3.4a-inline.patch 432 RMD160 0df619b071ddd582cc34d819a10db234ba64fe58 SHA1 d2800639f56dfad8434a84e987e1fc357907b234 SHA256 b2a1ffec7e75fb1919873c14173ce7f821fb3b7388125c93cfaff551503ae661
 DIST adonthell-src-0.3.4a.tar.gz 680872 RMD160 0ad52d2940375fbddccd387346f84fa8f009a03c SHA1 01c07a138a7c41f5640d4306f2197f71a8554aee SHA256 05e0a282d15dfdac282f9a8fee077e43d09423eb30ae9a1654ada765e3052087
-EBUILD adonthell-0.3.4a-r1.ebuild 1484 RMD160 e31bdee2b7b64caa8c3fef428dc4e2bd4b91aeef SHA1 41b785fe3ecb29d733fe0ae58bf119f76075f14b SHA256 5cc4d7a42e95e74df0fe18b88924eed36e9273ea6dc0a0ceaaba4f3d62dee2bf
-MISC ChangeLog 2816 RMD160 0faa2c23f653251007fb2baa6e91aaa7fb812cb9 SHA1 d4be1dc6a70271c18c3c32f6ae156420f2cd836f SHA256 da973688d210248dc3812fda8c3fd789e01b3099d2ef4ce79269cdccd91f1504
+EBUILD adonthell-0.3.4a-r1.ebuild 1529 RMD160 39c82ce3524944530f5224381b382148684a223a SHA1 a91386d0326ad69e29e5ffa6d360b550e18d437f SHA256 9f1aaa1f1057d979aeaf9805c280325ddc1111feb87bfa6faf06ee36f3db13e8
+MISC ChangeLog 2988 RMD160 886d15349f50fcd0c5c795974435c853ee2f53ef SHA1 ea75411f16e76d12d59285fc7a86bc405633fb2c SHA256 ae3ca9a7d195e5ad06e66a908c084ca760d175ebbaf2151481d14a9610c0da88
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkg+nrQACgkQdz7hIScOURFc8gCdGUQ2mAU5KW6y1R8mCebc10+3
-e1sAoLnXG6tbWdWjjOvESA+8sZ1Y0kU6
-=BmTa
+iEYEARECAAYFAkps0tUACgkQiqiDRvmkBmIg7ACdFOE63Z7JFwlRoN4uvrBGCEIH
+IVkAoL47hj9wO6PTa5kBtO2QUjw1ZBwE
+=96c/
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/adonthell/adonthell-0.3.4a-r1.ebuild b/games-rpg/adonthell/adonthell-0.3.4a-r1.ebuild
index 01a6705082f7..250a50ee661d 100644
--- a/games-rpg/adonthell/adonthell-0.3.4a-r1.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.4a-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.4a-r1.ebuild,v 1.2 2008/05/29 12:16:46 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.4a-r1.ebuild,v 1.3 2009/07/26 22:03:30 dirtyepic Exp $
 
 inherit autotools eutils games
 
@@ -34,7 +34,8 @@ src_unpack() {
 		"${FILESDIR}"/${PV}-configure.in.patch \
 		"${FILESDIR}"/${P}-gcc-41.patch \
 		"${FILESDIR}"/${P}-inline.patch \
-		"${FILESDIR}"/${P}-external-libs.patch
+		"${FILESDIR}"/${P}-external-libs.patch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch
 	rm -f src/SDL_ttf.* # SDL_ttf
 	rm -f src/{music*,SDL_mixer.h,wavestream*,mixer.c} # SDL_mixer
 	rm -f ac{local,include}.m4
diff --git a/games-rpg/adonthell/files/adonthell-0.3.4a-glibc-2.10.patch b/games-rpg/adonthell/files/adonthell-0.3.4a-glibc-2.10.patch
new file mode 100644
index 000000000000..7aec808cd5f1
--- /dev/null
+++ b/games-rpg/adonthell/files/adonthell-0.3.4a-glibc-2.10.patch
@@ -0,0 +1,22 @@
+diff -Naurp adonthell-0.3.4-orig/src/dialog.cc adonthell-0.3.4/src/dialog.cc
+--- adonthell-0.3.4-orig/src/dialog.cc	2005-03-10 12:39:41.000000000 -0600
++++ adonthell-0.3.4/src/dialog.cc	2009-07-26 15:57:01.410882131 -0600
+@@ -265,7 +265,8 @@ string dialog::scan_string (const char *
+ {
+     u_int32 begin, end, len;
+     PyObject *result;
+-    char *tmp, *start, *mid, *str = NULL;
++    const char *start;
++    char *tmp, *mid, *str = NULL;
+     character *the_player = data::the_player;
+     string newstr (s); 
+ 
+@@ -318,7 +319,7 @@ string dialog::scan_string (const char *
+ 
+         // Error!
+         cout << "\n*** Error, unknown macro " << start << flush;
+-        start[0] = ' ';
++        newstr[newstr.length () - strlen (start)] = ' ';
+     }
+     
+     // execute python functions