diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2012-07-09 02:30:02 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2012-07-09 02:30:02 +0000 |
| commit | 33386a18add8e41cb60fea016c486959f2b100d2 (patch) | |
| tree | f44034aed9230d761affd07ea1ac58426d62abeb /games-puzzle/pingus | |
| parent | Remove old wrt bug 425050 (diff) | |
| download | historical-33386a18add8e41cb60fea016c486959f2b100d2.tar.gz historical-33386a18add8e41cb60fea016c486959f2b100d2.tar.bz2 historical-33386a18add8e41cb60fea016c486959f2b100d2.zip | |
add gcc47 patch from Markus Oehme (bug #425238)
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'games-puzzle/pingus')
| -rw-r--r-- | games-puzzle/pingus/ChangeLog | 6 | ||||
| -rw-r--r-- | games-puzzle/pingus/Manifest | 11 | ||||
| -rw-r--r-- | games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch | 22 | ||||
| -rw-r--r-- | games-puzzle/pingus/pingus-0.7.6.ebuild | 6 |
4 files changed, 37 insertions, 8 deletions
diff --git a/games-puzzle/pingus/ChangeLog b/games-puzzle/pingus/ChangeLog index 8ce3b900592f..bb175da75931 100644 --- a/games-puzzle/pingus/ChangeLog +++ b/games-puzzle/pingus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/pingus # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.42 2012/06/30 05:00:28 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.43 2012/07/09 02:30:02 mr_bones_ Exp $ + + 09 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org> pingus-0.7.6.ebuild, + +files/pingus-0.7.6-gcc47.patch: + add gcc47 patch from Markus Oehme (bug #425238) 30 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> +files/pingus-0.7.6-noopengl.patch, pingus-0.7.6.ebuild: diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest index a71cfda2a667..ec4b7e3545dc 100644 --- a/games-puzzle/pingus/Manifest +++ b/games-puzzle/pingus/Manifest @@ -1,5 +1,6 @@ -AUX pingus-0.7.6-noopengl.patch 388 RMD160 b61dd49d8c48595a85b647b09ed9de584e8fa56b SHA1 a8285c879c3b53cf65f145aaec6bb6821de1d49b SHA256 7b21454857240c46ee94e06cd18e80c6ffc390256764dde50d42c699fc942914 -DIST pingus-0.7.6.tar.bz2 12622268 RMD160 0b8377a5eddbdfeac5ec765e87902271a5c0c268 SHA1 b5f5a25d71beb197c9466fb8928018a377f56487 SHA256 759c1253075d1e72691bc1e770b24cdd51917041fd1857c1daf85b65a6686460 -EBUILD pingus-0.7.6.ebuild 1660 RMD160 02f38c247ca4d742d6014588e0705016dbe2bf9e SHA1 9bffe06e02f6bea12f62be753bbcd14b917801a5 SHA256 1247919628f3ab3c38920544d23b889e870b13876846f8cae39775e5de06195b -MISC ChangeLog 6318 RMD160 0204d06d70588276530589c7c51fc7a41b09ca19 SHA1 7b15cc6554cfb85beceab0ca8c69915a63928fe7 SHA256 12bb284db1de0d6d72aa10290661b348ea11e3890b1251a618bad126e1198998 -MISC metadata.xml 1111 RMD160 ddc26c0d53726325b362684416d17da1cf233683 SHA1 69ceec92d0b0ef95a9afc8db8dd62e1f4f1da857 SHA256 a2b191d59e7491c2b434478e9f683fb533015b5400b9452b15b1ee3a2b36f06a +AUX pingus-0.7.6-gcc47.patch 1242 SHA256 918dcd8a1c2850af5a6b390d92fc0f4f8670a2e002fc15d01d171bbb97c095e5 SHA512 998aa2c9547fe82775442b8f234d07724642e342d7ccea724726c9210559b1cc8ea5e19d51c7d0bbf61b523cb83fa198596b25e6c6e1ce9882d75d73b9d67f68 WHIRLPOOL ccff5e8ee90a744c15852821a7ca62ea0603ac8fdb81069bb6936254c7d4aaf2b81b4432609c160ebc23ba6e08e5452c90054d092c7a3a6464ff18fc50aeab1e +AUX pingus-0.7.6-noopengl.patch 388 SHA256 7b21454857240c46ee94e06cd18e80c6ffc390256764dde50d42c699fc942914 SHA512 431226d068ffdadf33cd1b73c86e2e2e43de3def166c42cd0592b58e0025f842f579bafa4532f45acf05f4490189d26c679a4b0bcf4f16818aea307b2efe5eb2 WHIRLPOOL 8b54118d4d226ebead2ffe3ffde119f3bd51b8b5e4b692ebac9d9934f880752825b5883b5a9ad34d1c29879883050204fb651891ba181be6b85c7440c90f7f9a +DIST pingus-0.7.6.tar.bz2 12622268 SHA256 759c1253075d1e72691bc1e770b24cdd51917041fd1857c1daf85b65a6686460 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188 WHIRLPOOL 2c4bafef86c40fec3fcfc9ff4b298e72919c8309d475aa4aeb4d368927ac611801f416375108091d9f40bdb2703633765125f6f7ea361186f637e2d5234e53e2 +EBUILD pingus-0.7.6.ebuild 1699 SHA256 6ddc5f6057c9b17227bbfa74aa9f8519544a23caf773a7e7ff21093edad53c19 SHA512 7f55f3b86ed5cf65939a1ba67049b842187e7b691c4a66dec2e29b882e981508920b416f317b73e1bdc3832942edcf3baaa2d76fbaaa6049f049b6e820ca1ebf WHIRLPOOL 7a70b7854b56196f7944d98853c2d0a67be08ea9751b4c2001aa458681d83228b77f348df2300c3a946ba960b6598cc4b0e20d0f3b9b7518c903402ec915fa13 +MISC ChangeLog 6480 SHA256 9d2d30d8cf8cd28172186bd85477bf17198cf0755eadcb002a7d9ed84549bdf4 SHA512 2e086a4f893e698e802e55e4f399c45e3a30615967e84a3dcdd42d07608663bf9274d853d75125328b002619180e42727fdb0da487b1b2e725f51a6b3a079ef6 WHIRLPOOL 713ea29a2e9d677877e031fcc18bd26df3c1eaa5dd406a4ec6aeab2fed1dcd2f08d003973cad7a6d2f7bc5f14a408c5a4250c79bfc69431851c3230a27064e8f +MISC metadata.xml 1111 SHA256 a2b191d59e7491c2b434478e9f683fb533015b5400b9452b15b1ee3a2b36f06a SHA512 f5184dbe8509f635d3537ecb222f66bd1d7961e8f49ddaef69f4250acf5f9f7c068673fdfe4fd9a8e6e7f93c57943f1b1175d430d208a0d7ea1d1b98b4182d72 WHIRLPOOL fb0721928dae535abbcc53dde7944ad92e4d7ae5b7902c00c46f7191bd3df2e1d9e5eba2b113c7ac856118b30fd7a3fa1bebaae3fa0927c53db7eb2f60310b82 diff --git a/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch b/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch new file mode 100644 index 000000000000..b1397da31f68 --- /dev/null +++ b/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch @@ -0,0 +1,22 @@ +--- src/pingus/pingus_main.cpp.orig 2012-07-08 14:02:40.343767438 +0200 ++++ src/pingus/pingus_main.cpp 2012-07-08 14:02:54.062768168 +0200 +@@ -465,7 +465,7 @@ + void + PingusMain::print_greeting_message() + { +- std::string greeting = "Welcome to Pingus "VERSION; ++ std::string greeting = "Welcome to Pingus " VERSION; + greeting += "!"; + std::cout << greeting << std::endl; + for (unsigned int i = 0; i < greeting.length(); ++i) +--- src/pingus/screens/pingus_menu.cpp.orig 2012-07-08 14:03:05.549768782 +0200 ++++ src/pingus/screens/pingus_menu.cpp 2012-07-08 14:03:17.015769393 +0200 +@@ -153,7 +153,7 @@ + gc.get_height()/2 - 280)); + + gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140), +- "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n" ++ "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n" + "See the file AUTHORS for a complete list of contributors.\n" + "Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n" + "welcome to redistribute it under certain conditions; see the file COPYING for details.\n"); diff --git a/games-puzzle/pingus/pingus-0.7.6.ebuild b/games-puzzle/pingus/pingus-0.7.6.ebuild index 9ec8604cd3d4..2dc588e14af5 100644 --- a/games-puzzle/pingus/pingus-0.7.6.ebuild +++ b/games-puzzle/pingus/pingus-0.7.6.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-puzzle/pingus/pingus-0.7.6.ebuild,v 1.7 2012/06/30 05:00:28 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.7.6.ebuild,v 1.8 2012/07/09 02:30:02 mr_bones_ Exp $ EAPI=2 inherit eutils flag-o-matic scons-utils toolchain-funcs games @@ -38,7 +38,9 @@ src_prepare() { export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}" strip-flags - epatch "${FILESDIR}"/${P}-noopengl.patch + epatch \ + "${FILESDIR}"/${P}-noopengl.patch \ + "${FILESDIR}"/${P}-gcc47.patch } src_compile() { |