diff options
| -rw-r--r-- | games-puzzle/pingus/ChangeLog | 7 | ||||
| -rw-r--r-- | games-puzzle/pingus/Manifest | 17 | ||||
| -rw-r--r-- | games-puzzle/pingus/files/pingus-0.6.0-gcc.patch (renamed from games-puzzle/pingus/files/pingus-0.6.0-gcc3.patch) | 27 | ||||
| -rw-r--r-- | games-puzzle/pingus/files/pingus-0.6.0-gcc34.patch | 15 | ||||
| -rw-r--r-- | games-puzzle/pingus/pingus-0.6.0-r1.ebuild | 5 |
5 files changed, 48 insertions, 23 deletions
diff --git a/games-puzzle/pingus/ChangeLog b/games-puzzle/pingus/ChangeLog index 2bcf8b9cb799..f61249b2bf85 100644 --- a/games-puzzle/pingus/ChangeLog +++ b/games-puzzle/pingus/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-puzzle/pingus # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.8 2005/06/15 19:01:34 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.9 2005/09/12 03:08:49 halcy0n Exp $ + + 12 Sep 2005; Mark Loeser <halcy0n@gentoo.org> + +files/pingus-0.6.0-gcc.patch, -files/pingus-0.6.0-gcc3.patch, + -files/pingus-0.6.0-gcc34.patch, pingus-0.6.0-r1.ebuild: + Combine all the gcc patches together, and add in a small fix for gcc4. 15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> pingus-0.6.0-r1.ebuild: diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest index a4b413802d95..d826a037df66 100644 --- a/games-puzzle/pingus/Manifest +++ b/games-puzzle/pingus/Manifest @@ -1,6 +1,15 @@ -MD5 0528b30914f3f023045e90fef7894ef3 ChangeLog 1832 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 11714ca2a71b7f9db139a313e4a4b261 ChangeLog 2077 MD5 f40bbfa2eda5672febaa041b87f025b7 metadata.xml 1049 -MD5 2c03c6b9c3d98b5233645e1b3f8dd81d pingus-0.6.0-r1.ebuild 1391 -MD5 79a09ca01b47ab2b226d93069c8b6068 files/pingus-0.6.0-gcc3.patch 3459 +MD5 76ae42b3fae7a42aa0c1abe800e3918d pingus-0.6.0-r1.ebuild 1350 MD5 cf74eabf33bb46fc3ed87e741b182c10 files/digest-pingus-0.6.0-r1 66 -MD5 ef6d7d2a88d42c89cce5a250b5d381a4 files/pingus-0.6.0-gcc34.patch 475 +MD5 50abceb94694d0b53196bf840e5e2710 files/pingus-0.6.0-gcc.patch 4456 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDJPFWCRZPokWLroQRAnZjAJ9SIK/jEa8vdXQ9Cme3y/rtKaeXnACdFRp3 +zcvhJnHrt/kTDrwga1TuTVQ= +=nE9J +-----END PGP SIGNATURE----- diff --git a/games-puzzle/pingus/files/pingus-0.6.0-gcc3.patch b/games-puzzle/pingus/files/pingus-0.6.0-gcc.patch index 3dbe617bfed1..b429bac676d3 100644 --- a/games-puzzle/pingus/files/pingus-0.6.0-gcc3.patch +++ b/games-puzzle/pingus/files/pingus-0.6.0-gcc.patch @@ -1,7 +1,22 @@ +Make sure we type the cast properly. + +http://bugs.gentoo.org/show_bug.cgi?id=63773 + Pingus uses assert() but never includes assert.h, boo ! http://bugs.gentoo.org/show_bug.cgi?id=28281 +--- pingus-0.6.0/src/story_screen.cxx ++++ pingus-0.6.0/src/story_screen.cxx +@@ -142,7 +142,7 @@ + + if (!page_displayed_completly) + { +- unsigned int len = static_cast<unsigned int>(20.0f * time_passed); ++ size_t len = static_cast<size_t>(20.0f * time_passed); + display_text = current_page.text.substr(0, Math::min(current_page.text.length(), len)); + + if (current_page.text.length() < len) --- pingus-0.6.0/src/blitter.cxx +++ pingus-0.6.0/src/blitter.cxx @@ -17,6 +17,7 @@ @@ -103,3 +118,15 @@ http://bugs.gentoo.org/show_bug.cgi?id=28281 #include <vector> +#include <iostream> +diff -ur pingus-0.6.0-orig/src/worldmap/sprite_drawable.hxx pingus-0.6.0/src/worldmap/sprite_drawable.hxx +--- pingus-0.6.0-orig/src/worldmap/sprite_drawable.hxx 2005-09-11 21:46:11.000000000 -0400 ++++ pingus-0.6.0/src/worldmap/sprite_drawable.hxx 2005-09-11 21:49:46.000000000 -0400 +@@ -46,7 +46,7 @@ + + private: + SpriteDrawable (const SpriteDrawable&); +- SpriteDrawable operator= (const SpriteDrawable&); ++ SpriteDrawable& operator= (const SpriteDrawable&); + }; + + } // namespace WorldMapNS diff --git a/games-puzzle/pingus/files/pingus-0.6.0-gcc34.patch b/games-puzzle/pingus/files/pingus-0.6.0-gcc34.patch deleted file mode 100644 index e7f3a7328285..000000000000 --- a/games-puzzle/pingus/files/pingus-0.6.0-gcc34.patch +++ /dev/null @@ -1,15 +0,0 @@ -Make sure we type the cast properly. - -http://bugs.gentoo.org/show_bug.cgi?id=63773 - ---- src/story_screen.cxx -+++ src/story_screen.cxx -@@ -142,7 +142,7 @@ - - if (!page_displayed_completly) - { -- unsigned int len = static_cast<unsigned int>(20.0f * time_passed); -+ size_t len = static_cast<size_t>(20.0f * time_passed); - display_text = current_page.text.substr(0, Math::min(current_page.text.length(), len)); - - if (current_page.text.length() < len) diff --git a/games-puzzle/pingus/pingus-0.6.0-r1.ebuild b/games-puzzle/pingus/pingus-0.6.0-r1.ebuild index bc1e1c609902..ecbe9f0cdc2e 100644 --- a/games-puzzle/pingus/pingus-0.6.0-r1.ebuild +++ b/games-puzzle/pingus/pingus-0.6.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.6.0-r1.ebuild,v 1.13 2005/06/15 19:01:34 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.6.0-r1.ebuild,v 1.14 2005/09/12 03:08:49 halcy0n Exp $ inherit eutils flag-o-matic games @@ -20,8 +20,7 @@ DEPEND=">=media-libs/hermes-1.3.2-r2 src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-gcc3.patch #28281 - epatch "${FILESDIR}"/${P}-gcc34.patch #63773 + epatch "${FILESDIR}"/${P}-gcc.patch #28281 #63773 autoconf || die "failed to update configure file in order to respect CFLAGS/LDFLAGS" } |