diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2005-09-12 03:08:49 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2005-09-12 03:08:49 +0000 |
| commit | f49fa67df2bb2a5dc9bf9d7315c6f91af24845d9 (patch) | |
| tree | d0f8fe27194875b5cac0922303c69901bc9f1c01 /games-puzzle/pingus/files | |
| parent | ia64 stable (diff) | |
| download | gentoo-2-f49fa67df2bb2a5dc9bf9d7315c6f91af24845d9.tar.gz gentoo-2-f49fa67df2bb2a5dc9bf9d7315c6f91af24845d9.tar.bz2 gentoo-2-f49fa67df2bb2a5dc9bf9d7315c6f91af24845d9.zip | |
Combine all the gcc patches together, and add in a small fix for gcc4.
(Portage version: 2.0.52-r1)
Diffstat (limited to 'games-puzzle/pingus/files')
| -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 |
2 files changed, 27 insertions, 15 deletions
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) |