summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2009-05-28 07:54:49 +0000
committerAlfredo Tupone <tupone@gentoo.org>2009-05-28 07:54:49 +0000
commitc08e88cf492e64b0f5ad14b76ba23a0eec610376 (patch)
treec13e23202860f71c6f7726f8ac57b71bd61e6148 /games-puzzle/enigma
parentFixed configure with USE=kerberos and --as-needed (bug #271492). (diff)
downloadhistorical-c08e88cf492e64b0f5ad14b76ba23a0eec610376.tar.gz
historical-c08e88cf492e64b0f5ad14b76ba23a0eec610376.tar.bz2
historical-c08e88cf492e64b0f5ad14b76ba23a0eec610376.zip
Fix build with gcc-4.4.0 and glibc-2.10.1 Bug #271464
Package-Manager: portage-2.1.6.11/cvs/Linux x86_64
Diffstat (limited to 'games-puzzle/enigma')
-rw-r--r--games-puzzle/enigma/ChangeLog6
-rw-r--r--games-puzzle/enigma/Manifest14
-rw-r--r--games-puzzle/enigma/files/enigma-1.01-gcc44.patch11
3 files changed, 18 insertions, 13 deletions
diff --git a/games-puzzle/enigma/ChangeLog b/games-puzzle/enigma/ChangeLog
index 6d0c8c57648a..b360e95cd53e 100644
--- a/games-puzzle/enigma/ChangeLog
+++ b/games-puzzle/enigma/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/enigma
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.45 2009/05/23 06:42:25 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.46 2009/05/28 07:54:49 tupone Exp $
+
+ 28 May 2009; Alfredo Tupone <tupone@gentoo.org>
+ files/enigma-1.01-gcc44.patch:
+ Fix build with gcc-4.4.0 and glibc-2.10.1 Bug #271464 by Martin Vaeth
22 May 2009; Alfredo Tupone <tupone@gentoo.org>
+files/enigma-1.01-gcc44.patch, enigma-1.01.ebuild:
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index f8b5be484e40..f1af7cc511e6 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX enigma-1.01-autotools.patch 2865 RMD160 a8415815e2f73be9f89066e58e712ffc8cc784c8 SHA1 4b9dd11660428438a32d5a5cee8304e8a5045279 SHA256 141ea4b51ee272c2842983cab09e5631755f8738e367408de37fb435b84131e1
AUX enigma-1.01-gcc43.patch 813 RMD160 27998358a70579aabbd476358ce6e262494a2ce5 SHA1 fabc6422e5bf9372179d23bc2da3fe9e280172b7 SHA256 24f5f4f4b4235622d84bc5fd4c954aeffa7c3f2fccd1daa78ad458e44afca897
-AUX enigma-1.01-gcc44.patch 1210 RMD160 7bbdc69827e2e5f30589a3870d937db9a5ffe9e0 SHA1 2844bf4c7aaf44198af893f890b96fcdcd962107 SHA256 fc99f9b6b434405727974bf2a696a8b817148164882174ebcc5080134837f213
+AUX enigma-1.01-gcc44.patch 1693 RMD160 afc2574ea9018ae4a109d86acf4075b6240df6c9 SHA1 832820b8441ec4c24e58b4f6bb460c06f02f730c SHA256 77b9fd58a843a21afb8c8769e562e86c5d7e5fcaf87067ef4dd91cbe09b207ff
AUX enigma-1.01-xerces-c.patch 3824 RMD160 f58690c41dbf2d47b25523de8bd7a86de5f6627c SHA1 f64878363fedf54f1f6e186555f789a25e13f9cd SHA256 9868afa6bbb4f430bc708f6c5ce2c7c9b434ea044e9ccf239d706d56071c710f
DIST enigma-1.01-64bit.tar.gz 10891095 RMD160 671971415e8d96bc84e2a823d66359025e158128 SHA1 2f9f5aaf3d233c248d818c3a2fd5ea873d34135f SHA256 ae87ecf635bd89bec143a8011e30a4a3b546edb3fe2ed2fca243d366bb599736
EBUILD enigma-1.01.ebuild 1198 RMD160 03ca4a006cf3240af00fa9c4aac57ec635bfdb10 SHA1 3acc60c88dabd7d04b9dc5ca99850719dc9648f8 SHA256 b8329812b749928ed579f4d4aa0c581bc2a3e961825592b8e60e94eb5a30ca48
-MISC ChangeLog 6954 RMD160 c72add7b1e907f4c8168be3561f1644480d04f4a SHA1 88e23d4bb9756a2d4ffdacdd01b235b2891b23f4 SHA256 18680a3c1a93ee5afd0e060ae6808060bb37d79d5e64de480d730ea8091347e2
+MISC ChangeLog 7112 RMD160 4c4fa03bc4c48761449d370cf713c6a5b310d97f SHA1 a8c9ccd0657842913d3ff12fb2f251df17870ed5 SHA256 92db2a06fd1974c9fc6679aa51063bd2f6c8642001f7bd6d7cfc2d0c90924540
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoXmuoACgkQV3J2n04EauzsLgCgvqpMeA9yuR8oZsRuvqE0pHLS
-dpgAniE4BtrLvnib+nc7EAubOpvGVyqI
-=GQBy
------END PGP SIGNATURE-----
diff --git a/games-puzzle/enigma/files/enigma-1.01-gcc44.patch b/games-puzzle/enigma/files/enigma-1.01-gcc44.patch
index 4695ec4f2118..9a14063cf764 100644
--- a/games-puzzle/enigma/files/enigma-1.01-gcc44.patch
+++ b/games-puzzle/enigma/files/enigma-1.01-gcc44.patch
@@ -38,3 +38,14 @@
namespace enigma { namespace lev {
+--- src/lua.cc.old 2009-05-28 09:43:36.000000000 +0200
++++ src/lua.cc 2009-05-28 09:44:22.000000000 +0200
+@@ -574,7 +574,7 @@
+ int y = round_down<int>(lua_tonumber(L, 2));
+ const char *dir = lua_tostring(L,3);
+ const char *allowed = "wsen";
+- char *found = strchr(allowed, dir[0]);
++ const char *found = strchr(allowed, dir[0]);
+
+ if (found && found[0])
+ world::AddScramble(GridPos(x,y), enigma::Direction(found-allowed));