From 416637809c62b628546b9bb95278e1e0dac74271 Mon Sep 17 00:00:00 2001
From: Alfredo Tupone <tupone@gentoo.org>
Date: Tue, 5 Jan 2010 15:18:24 +0000
Subject: Fix build with gcc-4.4.2. Bug #298900 (Portage version:
 2.1.6.13/cvs/Linux i686)

---
 games-arcade/wop/files/wop-0.4.3-gcc43.patch | 49 ++++++++++++++--------------
 1 file changed, 25 insertions(+), 24 deletions(-)

(limited to 'games-arcade/wop/files')

diff --git a/games-arcade/wop/files/wop-0.4.3-gcc43.patch b/games-arcade/wop/files/wop-0.4.3-gcc43.patch
index 59aee2a665dd..903a97ba92ce 100644
--- a/games-arcade/wop/files/wop-0.4.3-gcc43.patch
+++ b/games-arcade/wop/files/wop-0.4.3-gcc43.patch
@@ -1,31 +1,32 @@
---- src/scusibot.cpp.old        2009-01-27 15:22:39.000000000 +0100
-+++ src/scusibot.cpp    2009-01-27 15:23:10.000000000 +0100
+--- src/scusibot.cpp.old	2010-01-05 15:41:23.000000000 +0100
++++ src/scusibot.cpp	2010-01-05 15:41:46.000000000 +0100
 @@ -5,6 +5,7 @@
  #include "stationarygun.hpp"
  #include "global.hpp"
  #include <vector>
 +#include <algorithm>
-
+ 
  ScusiBot::ScusiBot()
-        : m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) {
---- src/spriteset.cpp.old       2009-01-27 15:26:39.000000000 +0100
-+++ src/spriteset.cpp   2009-01-27 15:27:51.000000000 +0100
-@@ -2,6 +2,7 @@
-
- #include  "spriteset.hpp"
- #include  "global.hpp"
-+#include "sprite.hpp"
-
+ 	: m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) {
+--- src/gameinfowindow.cpp.old	2010-01-05 15:45:09.000000000 +0100
++++ src/gameinfowindow.cpp	2010-01-05 15:46:08.000000000 +0100
+@@ -10,6 +10,8 @@
+ #include "avatarworm.hpp"
+ #include "wopsprites.hpp"
+ #include "wopsprites.cpp"
++#include "spriteset.cpp"
++#include "spritesequence.cpp"
+ #include "scorekeeper.hpp"
+ #include "wopgui.hpp"
+ 
+--- src/map.cpp.old	2010-01-05 15:46:35.000000000 +0100
++++ src/map.cpp	2010-01-05 15:47:06.000000000 +0100
+@@ -9,6 +9,8 @@
+ #include "world.hpp"
+ #include "wopsettings.hpp"
+ #include "objectpaths.hpp"
++#include "spriteset.cpp"
++#include "spritesequence.cpp"
+ 
  /**********************************************************/
-
-@@ -17,6 +18,9 @@
- #endif // SUPPRESS_COLORING
- #endif // BLACK_
-
-+/* force creation of an implementation of SpriteSet<Sprite> */
-+static SpriteSet<Sprite> foo;
-+
- /**********************************************************/
-
- template <class T>
-
+ 
-- 
cgit v1.2.3-65-gdbad