diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2012-08-04 14:39:10 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2012-08-04 14:39:10 +0000 |
| commit | 981b5dee8c33411c6fd606773c6fefa7bfcc373c (patch) | |
| tree | cdd598b5e19384ac9191a392efd91aaaf11dfbf8 /games-strategy | |
| parent | Remove old. (diff) | |
| download | historical-981b5dee8c33411c6fd606773c6fefa7bfcc373c.tar.gz historical-981b5dee8c33411c6fd606773c6fefa7bfcc373c.tar.bz2 historical-981b5dee8c33411c6fd606773c6fefa7bfcc373c.zip | |
add upstream patch for gcc47 extracted by Michał Górny (bug #420961)
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/widelands/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/widelands/Manifest | 19 | ||||
| -rw-r--r-- | games-strategy/widelands/files/widelands-0.17-gcc47.patch | 12 | ||||
| -rw-r--r-- | games-strategy/widelands/widelands-0.17.ebuild | 6 |
4 files changed, 31 insertions, 12 deletions
diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog index b7d831a0a5c0..82a811a68614 100644 --- a/games-strategy/widelands/ChangeLog +++ b/games-strategy/widelands/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/widelands # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.43 2012/05/21 19:23:02 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.44 2012/08/04 14:39:10 mr_bones_ Exp $ + + 04 Aug 2012; Michael Sterrett <mr_bones_@gentoo.org> + +files/widelands-0.17-gcc47.patch, widelands-0.17.ebuild: + add upstream patch for gcc47 extracted by Michał Górny (bug #420961) 21 May 2012; Michael Sterrett <mr_bones_@gentoo.org> widelands-0.16.ebuild, widelands-0.17.ebuild: diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest index 9e8044572661..accc8a505fbf 100644 --- a/games-strategy/widelands/Manifest +++ b/games-strategy/widelands/Manifest @@ -1,10 +1,11 @@ -AUX widelands-0.16-cxxflags.patch 728 RMD160 6cf36298f55084ce33adbb47fac354ebc019e5c3 SHA1 fa572e07d482dcee8d182bcdbf4b80c0316d83ad SHA256 933ca96d6d7ee19a23d2cc64bea2a1817c61a18916485c3a9bbfb28778091222 -AUX widelands-0.16-goldmine.patch 558 RMD160 d900c8626141a56057f02a0b75d0a94064437275 SHA1 ba7c59cf4e317403443d87832260bcf23c3feb73 SHA256 e49bb7f6e31a36c3b6bffe374122161c113a65a945087ffaa979988fda7b6ade -AUX widelands-0.16-libpng15.patch 2064 RMD160 a8c9e83438f41e015a42f7d02d4b51bb5321bfc8 SHA1 2cf53e5b53de93a6fae9b1ad2173cbb90dcce573 SHA256 1b696a840d4beef6740531c1cafc227798c513b4c8dd7d3a61d3ce6b256e02ff -AUX widelands-0.17-cxxflags.patch 1733 RMD160 1b369e43f8f5bde4511b7ed0d74448818c41ac2a SHA1 c620b8c8092eb33a15a3dc9ddc06eda124711eb4 SHA256 1ce15258755faf1f348601dd0431b1657a73af348bc5f3ca1a9b22d83d6ad150 +AUX widelands-0.16-cxxflags.patch 728 SHA256 933ca96d6d7ee19a23d2cc64bea2a1817c61a18916485c3a9bbfb28778091222 SHA512 da7d185482320217a828f08c2fad5cf4632ded5c3be44664ed996ffa7fc34e070f817b3fae67e7d5d24d77915cb7bff6790c05737d47b36e02312fe03561dd5a WHIRLPOOL 0ba7f989c425e2ca4eba96710afb7087f82caf4aefdcf495304105bdc9adc27669a1991c7264a6e8b3e31f45cafce2070a579360ac644cc3a6f8b6851198950b +AUX widelands-0.16-goldmine.patch 558 SHA256 e49bb7f6e31a36c3b6bffe374122161c113a65a945087ffaa979988fda7b6ade SHA512 d9c830a05676bf4a98cc9c08aabff794046783a31ceca6dbef07c41224eb37e8dd67c02c236c3a9890769a05a7e46904ace5af8029da5d70b5b3c1f8c1762cf6 WHIRLPOOL 3c505e70099ad96487bdb224b10dde9d63b30fa12a00b304fd9417601cfe09418174cbbaf9b92b37290acaa5b537c6ecd4c18fa7e2ce8af6c1c8bf67a360665b +AUX widelands-0.16-libpng15.patch 2064 SHA256 1b696a840d4beef6740531c1cafc227798c513b4c8dd7d3a61d3ce6b256e02ff SHA512 2cfd7da09ede6e0bbe395505472d60946922b7b1740795c00674d7df37a9db6ce6b1cfa7b6777123f524042e812b2f425e52d95e022507261ce4f574de1d294f WHIRLPOOL ca65e2f4e498d9b0a149b3156469a1810421dacc9086c2eea761b055ccfe11357e73f2232e3226b43c0a2c450515af0be9dd6054c10029b4bb5320bfb26da1bf +AUX widelands-0.17-cxxflags.patch 1733 SHA256 1ce15258755faf1f348601dd0431b1657a73af348bc5f3ca1a9b22d83d6ad150 SHA512 952dc2fd7bfbd6e0108ea6155d153ca6b4d83f9c8ad9124ac134da502851fbd991fe9e75af7af8bb72eb5938537c4a62389de0b54d16e8bab0ff057b4897d5bc WHIRLPOOL 2ce299c7f40ad2238f7704cc2dbb5a65916da696648641d8f29943901d38b99f90f02b6652651fb7bcba75729f1f6ad7ca64dc55c56fce6d5cb51a4b5d072a89 +AUX widelands-0.17-gcc47.patch 247 SHA256 54359ddc7e3a6c86339e6bcc5f8fadad0a472156dabc27b2e4289cf1cd920e29 SHA512 2ce2728ee6f3e7e066443e6891a95a74b430ac1aaf2386d52dd54dd8217afdadbe747cea1daef1f6a57543f98f8e2eb9451a9b81e22a82f6964750fd60020139 WHIRLPOOL cb7eba1815785f76b3b5ccfc763ab6342eb764eb50a14a4914c740b80b0ebb7be25ee851b09732031c79848b653ae1cb3409a812c7163a7dad1ee09546339040 DIST widelands-build16-src.tar.bz2 137808494 RMD160 aa7d14fe0071041227cebf5b5974feb74e7b8c8f SHA1 3e6df06337a4e422236bb0c0bb21068cddb6e274 SHA256 d8db3c15c30314cb220c6d79d93d3d31e7bce2722c93d2c385d643c3c669625d -DIST widelands-build17-src.tar.bz2 175547379 RMD160 4ea81d21d3b3e02fc22194d1a39e8c08e05aaa44 SHA1 0ac6e1a1e6a5ba8cdd01c3f70e4c391ae9186ff1 SHA256 be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5 -EBUILD widelands-0.16.ebuild 1700 RMD160 7901b7d748517494b90566077e38babb1f188171 SHA1 13f19dd17255d306d011d7dd2a561f66ebcdb1d8 SHA256 755054489022cd3ae72b891ef940aed9915d00bfb5e93bc0c4de07fc4edf10a2 -EBUILD widelands-0.17.ebuild 1701 RMD160 3c72d0bdda8aa421430fa8e0a7cf2d23126b28a3 SHA1 6e5e039d963643d9138e7c65b7d5a61ce946f92c SHA256 0124d593defce1a2d6aede1bef1f9b105df73f1fb88fbcdb0ed672a3335c1321 -MISC ChangeLog 7237 RMD160 97530a3ff0fa6083b7e5da18101e1a7a7daa0859 SHA1 25f6347e3df13ce614835bcee342564d636d0abc SHA256 5eb937caaeda942f11427395fc86bd037408ab94392b89c3515cff6702a40089 -MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +DIST widelands-build17-src.tar.bz2 175547379 SHA256 be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5 SHA512 ace4127ba00bbe788cb266d2c508b2d9b0651c99f65f08a3c7d680f8998e64e26252f7095c1b62d94012b99ef1a6dc2f8be08d17f2e8f1ab864abc650c658f2d WHIRLPOOL 35454b86d467058017ac71da8fae23b3556fe8e6ced5cf94fbd07ff21b2b38eca444be6168224d3023cd1af81867a3e6e45dd1773ef54675769ec51403b24cfa +EBUILD widelands-0.16.ebuild 1700 SHA256 755054489022cd3ae72b891ef940aed9915d00bfb5e93bc0c4de07fc4edf10a2 SHA512 52e0b1778254e6626144f15d35d48d4e6911e5498dbb431e48603f6f7e6aa7feb0dc96985191488008febc135de89bfa52eb121b11b2501bb89eb62aec3ad931 WHIRLPOOL 869fd68350c9f263d3354318b25e1b8523fae98ca35eba6fa9dadedad208da2ed8ab651a1ab0b4d37cffbaefb0e59c6819c3ea895cde717c3fa4fd94c0ac5d00 +EBUILD widelands-0.17.ebuild 1740 SHA256 b17a8433ca3d5b4c7d4221cf0f41c1d8a846374cb22c2c7dae26e6d0770e957c SHA512 127307b4240b0457f2a478ee069ef9b9610cb6a309f061109a1d9d7f3a43ce49b0b0eba41bb44fea01d602415e555575d4b3c7852801972dd20999fbd712fc68 WHIRLPOOL a674d9ceac5cf798be5145b35cfbdfb0f64bbdf5827a40d72f00e34bf57ae57fcd971bfb20b8ff162ed655dc3c49761fca59141c8f4b1f8dc95121dc785ae205 +MISC ChangeLog 7426 SHA256 3a598c02e5ff68eb3b863f5835e4b5918e5e0bacf6f24389c34ba895e279e3a4 SHA512 19bf1fef2978bdded7f4cd3acc742e338faa11c3a9b0488aced90b344a8330dce20788dea79a8368e6f939464d2020c090c0af97fdccda48957d90bdc724739e WHIRLPOOL 2bf609671dcaf8924f22a1d074104c333bca7dbcea7d7dff2c28fcf0bcc7aeb2a7e2c4e05127adc360597c47c9aaba8c307ef7fc7e64b7a634fd3c436ddf55ec +MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada diff --git a/games-strategy/widelands/files/widelands-0.17-gcc47.patch b/games-strategy/widelands/files/widelands-0.17-gcc47.patch new file mode 100644 index 000000000000..9ea19c3571db --- /dev/null +++ b/games-strategy/widelands/files/widelands-0.17-gcc47.patch @@ -0,0 +1,12 @@ +=== modified file 'src/main.cc' +--- src/main.cc 2012-02-15 21:25:34 +0000 ++++ src/main.cc 2012-05-02 07:43:01 +0000 +@@ -28,6 +28,7 @@ + #include <iostream> + #include <stdexcept> + #include <typeinfo> ++#include <unistd.h> + + #include <SDL_main.h> + + diff --git a/games-strategy/widelands/widelands-0.17.ebuild b/games-strategy/widelands/widelands-0.17.ebuild index e6614c1685c2..2733ab137e12 100644 --- a/games-strategy/widelands/widelands-0.17.ebuild +++ b/games-strategy/widelands/widelands-0.17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild,v 1.3 2012/05/21 19:23:02 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild,v 1.4 2012/08/04 14:39:10 mr_bones_ Exp $ EAPI=3 inherit eutils versionator cmake-utils games @@ -32,7 +32,9 @@ CMAKE_BUILD_TYPE=Release PREFIX=${GAMES_DATADIR}/${PN} src_prepare() { - epatch "${FILESDIR}"/${P}-cxxflags.patch + epatch \ + "${FILESDIR}"/${P}-cxxflags.patch \ + "${FILESDIR}"/${P}-gcc47.patch sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die sed -i -e '74i#define OF(x) x' src/io/filesystem/{un,}zip.h || die |