| 1 |
tupone 10/01/05 15:18:23 |
| 2 |
|
| 3 |
Modified: wop-0.4.3-gcc43.patch |
| 4 |
Log: |
| 5 |
Fix build with gcc-4.4.2. Bug #298900 |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 games-arcade/wop/files/wop-0.4.3-gcc43.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/wop/files/wop-0.4.3-gcc43.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/wop/files/wop-0.4.3-gcc43.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/wop/files/wop-0.4.3-gcc43.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: wop-0.4.3-gcc43.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/games-arcade/wop/files/wop-0.4.3-gcc43.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- wop-0.4.3-gcc43.patch 27 Jan 2009 14:42:15 -0000 1.1 |
| 22 |
+++ wop-0.4.3-gcc43.patch 5 Jan 2010 15:18:23 -0000 1.2 |
| 23 |
@@ -1,31 +1,32 @@ |
| 24 |
---- src/scusibot.cpp.old 2009-01-27 15:22:39.000000000 +0100 |
| 25 |
-+++ src/scusibot.cpp 2009-01-27 15:23:10.000000000 +0100 |
| 26 |
+--- src/scusibot.cpp.old 2010-01-05 15:41:23.000000000 +0100 |
| 27 |
++++ src/scusibot.cpp 2010-01-05 15:41:46.000000000 +0100 |
| 28 |
@@ -5,6 +5,7 @@ |
| 29 |
#include "stationarygun.hpp" |
| 30 |
#include "global.hpp" |
| 31 |
#include <vector> |
| 32 |
+#include <algorithm> |
| 33 |
- |
| 34 |
+ |
| 35 |
ScusiBot::ScusiBot() |
| 36 |
- : m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) { |
| 37 |
---- src/spriteset.cpp.old 2009-01-27 15:26:39.000000000 +0100 |
| 38 |
-+++ src/spriteset.cpp 2009-01-27 15:27:51.000000000 +0100 |
| 39 |
-@@ -2,6 +2,7 @@ |
| 40 |
- |
| 41 |
- #include "spriteset.hpp" |
| 42 |
- #include "global.hpp" |
| 43 |
-+#include "sprite.hpp" |
| 44 |
- |
| 45 |
+ : m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) { |
| 46 |
+--- src/gameinfowindow.cpp.old 2010-01-05 15:45:09.000000000 +0100 |
| 47 |
++++ src/gameinfowindow.cpp 2010-01-05 15:46:08.000000000 +0100 |
| 48 |
+@@ -10,6 +10,8 @@ |
| 49 |
+ #include "avatarworm.hpp" |
| 50 |
+ #include "wopsprites.hpp" |
| 51 |
+ #include "wopsprites.cpp" |
| 52 |
++#include "spriteset.cpp" |
| 53 |
++#include "spritesequence.cpp" |
| 54 |
+ #include "scorekeeper.hpp" |
| 55 |
+ #include "wopgui.hpp" |
| 56 |
+ |
| 57 |
+--- src/map.cpp.old 2010-01-05 15:46:35.000000000 +0100 |
| 58 |
++++ src/map.cpp 2010-01-05 15:47:06.000000000 +0100 |
| 59 |
+@@ -9,6 +9,8 @@ |
| 60 |
+ #include "world.hpp" |
| 61 |
+ #include "wopsettings.hpp" |
| 62 |
+ #include "objectpaths.hpp" |
| 63 |
++#include "spriteset.cpp" |
| 64 |
++#include "spritesequence.cpp" |
| 65 |
+ |
| 66 |
/**********************************************************/ |
| 67 |
- |
| 68 |
-@@ -17,6 +18,9 @@ |
| 69 |
- #endif // SUPPRESS_COLORING |
| 70 |
- #endif // BLACK_ |
| 71 |
- |
| 72 |
-+/* force creation of an implementation of SpriteSet<Sprite> */ |
| 73 |
-+static SpriteSet<Sprite> foo; |
| 74 |
-+ |
| 75 |
- /**********************************************************/ |
| 76 |
- |
| 77 |
- template <class T> |
| 78 |
- |
| 79 |
+ |
Archives