diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-11-24 13:00:01 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-11-24 13:00:01 +0000 |
| commit | 298622b85835f0f22a502ac24bb6bc16518af187 (patch) | |
| tree | f8bf60cfc2a4c7fd1805626eb5ea2eef40dbdb5f /games-strategy | |
| parent | Skip the rfc2045 test since it requires the en_US.utf-8 locale. Remove old pa... (diff) | |
| download | historical-298622b85835f0f22a502ac24bb6bc16518af187.tar.gz historical-298622b85835f0f22a502ac24bb6bc16518af187.tar.bz2 historical-298622b85835f0f22a502ac24bb6bc16518af187.zip | |
Fix buld with gcc-4.5 Bug #346543
Package-Manager: portage-2.1.9.24/cvs/Linux i686
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/widelands/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/widelands/Manifest | 5 | ||||
| -rw-r--r-- | games-strategy/widelands/files/widelands-0.15-gcc45.patch | 49 | ||||
| -rw-r--r-- | games-strategy/widelands/widelands-0.15.ebuild | 5 |
4 files changed, 60 insertions, 5 deletions
diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog index 2f69c44a210f..e70936a4911d 100644 --- a/games-strategy/widelands/ChangeLog +++ b/games-strategy/widelands/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/widelands # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.27 2010/11/20 17:48:59 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.28 2010/11/24 13:00:01 tupone Exp $ + + 24 Nov 2010; Tupone Alfredo <tupone@gentoo.org> widelands-0.15.ebuild, + +files/widelands-0.15-gcc45.patch: + Fix buld with gcc-4.5 Bug #346543 by tobias muser 20 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org> widelands-0.15.ebuild, +files/widelands-0.15-locale.patch: diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest index 7ba7aee2ce90..932bea30d255 100644 --- a/games-strategy/widelands/Manifest +++ b/games-strategy/widelands/Manifest @@ -1,10 +1,11 @@ AUX widelands-0.0.14-build.patch 545 RMD160 5c59bdf264d1a7e4f0a6e980826530c846546f1f SHA1 29a6da13d455e47c25de3516f16b29294994bd8d SHA256 43ade110de1d6eb5c166d78c207f1d522e506f39c267a9979b262f2b4987549f AUX widelands-0.0.14-gcc45.patch 1620 RMD160 df16bf17fd8826ebf212c65b11655af5fe18e373 SHA1 827b3c6b4e212d4ea90a1184e950c94a41925933 SHA256 293382401d7ba7a8584cba4a64923e331daa0a766f0a1d8fa085b8aaac07a3cb AUX widelands-0.15-build.patch 1839 RMD160 baedf2f0e20815fdafd8c256a1d339bf32170f21 SHA1 71544823e8c75784db9fa4dcb875fe03f4c1cab8 SHA256 002afd51479536cf796cbab60515ff133bc6fb31d9e9322f966e6217dfdcdd1d +AUX widelands-0.15-gcc45.patch 1968 RMD160 be797bf86bb24896b7ccc46848726ba8ee15e71d SHA1 b5e5ecb72ad004f39cc77c5b1e0cce5f26bf3746 SHA256 f30fb6ed536fc9caa97fe2fa0b14c162b6469d9e9371beeb183ab7bbb342686b AUX widelands-0.15-locale.patch 488 RMD160 f194d94e29745084371e735cd913cafbd1b615d0 SHA1 a2f7073ad6e9c5aa642ff03f653865f7413deb84 SHA256 789b80cb441b39fdb54e0b8b9dafbad93786d8b7f23caee3221e42667c05dcfe DIST Widelands-Build14-src.7z 63758110 RMD160 a9cbda7021ab5c2200a84d75d6759e35606159b9 SHA1 405ac86ec47da830d750e4ebdea1e0e0534852b2 SHA256 553632c32edde73c1aac9db6d1f113ddd260b745b65bd5340c01c0e115966939 DIST widelands-build15-src.tar.bz2 107471022 RMD160 23dd238978cf97cea2abcb2b8178b090d790cf77 SHA1 dfa3c1bf701dec55cefb5b10f278da037c9288ea SHA256 99cfc86318e74a9abfe85493bf0a072d7ac99d9a3cdaa44922e9a5e027d1be03 EBUILD widelands-0.0.14.ebuild 1758 RMD160 c666f5a9315e5ea08b8c42881e1e969e45260299 SHA1 89a0f823f30bef4a31fc2e1dbd89628a6a7aec34 SHA256 48db8f71d7e7f14c77e4d5ac4c443457c66da7eb8df9d0d23f1922b75dff6c9a -EBUILD widelands-0.15.ebuild 1597 RMD160 f648ff61be9fd38af829c3fb1218b92b377347df SHA1 5ad5732023429a6357b8311d87e37d007470f082 SHA256 a35d944d4b2d1cbecb50713a0b4c3c6f1f1ab050ef4d159e92b6b72120f9cdff -MISC ChangeLog 4784 RMD160 26fa4811b4b0852cb705137ca5e800d8de1ac880 SHA1 f2862bc27a9b65b4588d11be4974d5e442ef196e SHA256 f34edff19337ee9cb01e0709c075829bb296310ac3f1424e2c467a13195ed948 +EBUILD widelands-0.15.ebuild 1629 RMD160 6295e58a7ea292b21b52bc80f1e7a9d5fa59cef0 SHA1 4fcc5ef7f68314ca5d05c5e467a862a4b8b1d08b SHA256 aa3e0090c1de4da189183e31d853834311f79aa95c845e0e717e82bc68085fe7 +MISC ChangeLog 4944 RMD160 43a9f19f2a62002055210705159960e06f552b26 SHA1 8845e8d76cc01a6071c8b2d9d37ed6e434294726 SHA256 1a50921d3c55d3672326b0d20f881606e8fa907dc8201df9d0125aab3a335e96 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-strategy/widelands/files/widelands-0.15-gcc45.patch b/games-strategy/widelands/files/widelands-0.15-gcc45.patch new file mode 100644 index 000000000000..efd42a8b95e4 --- /dev/null +++ b/games-strategy/widelands/files/widelands-0.15-gcc45.patch @@ -0,0 +1,49 @@ +--- src/editor/ui_menus/editor_main_menu_random_map.cc.old 2010-05-18 17:17:15.000000000 +0200 ++++ src/editor/ui_menus/editor_main_menu_random_map.cc 2010-05-18 17:18:29.000000000 +0200 +@@ -251,7 +251,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Random_Map::button_clicked, *this, 8, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -322,7 +322,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + break; + case 9: + break; +@@ -476,7 +476,7 @@ + (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) + ++m_currentworld; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + button_clicked(-1); // Update other values in UI as well + +--- src/editor/ui_menus/editor_main_menu_new_map.cc.old 2010-05-18 17:38:29.000000000 +0200 ++++ src/editor/ui_menus/editor_main_menu_new_map.cc 2010-05-18 17:38:55.000000000 +0200 +@@ -113,7 +113,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Map::button_clicked, *this, 4, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -142,7 +142,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name + ()); + break; + } diff --git a/games-strategy/widelands/widelands-0.15.ebuild b/games-strategy/widelands/widelands-0.15.ebuild index 7e0a987073af..16a7a73bc071 100644 --- a/games-strategy/widelands/widelands-0.15.ebuild +++ b/games-strategy/widelands/widelands-0.15.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-strategy/widelands/widelands-0.15.ebuild,v 1.2 2010/11/20 17:48:59 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.15.ebuild,v 1.3 2010/11/24 13:00:01 tupone Exp $ EAPI=2 inherit eutils versionator cmake-utils games @@ -35,7 +35,8 @@ S=${WORKDIR}/${MY_P} src_prepare() { epatch \ "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-locale.patch + "${FILESDIR}"/${P}-locale.patch \ + "${FILESDIR}"/${P}-gcc45.patch sed -i \ -e 's:__ppc__:__PPC__:' src/s2map.cc \ |