rpms/wormsofprey/devel wop-0.4.3-gcc43.patch, 1.1, 1.2 wormsofprey.spec, 1.3, 1.4

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/free/rpms/wormsofprey/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20245

Modified Files:
	wop-0.4.3-gcc43.patch wormsofprey.spec 
Log Message:
* Wed Apr  1 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-5
- Fix building with gcc 4.4


wop-0.4.3-gcc43.patch:

Index: wop-0.4.3-gcc43.patch
===================================================================
RCS file: /cvs/free/rpms/wormsofprey/devel/wop-0.4.3-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wop-0.4.3-gcc43.patch	25 Jul 2008 19:43:47 -0000	1.1
+++ wop-0.4.3-gcc43.patch	1 Apr 2009 08:29:45 -0000	1.2
@@ -8,23 +8,25 @@
  
  ScusiBot::ScusiBot()
  	: m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) {
---- wop-0.4.3/src/spriteset.cpp	2006-03-27 12:27:53.000000000 +0200
-+++ wop-0.4.3.new/src/spriteset.cpp	2008-03-20 13:08:52.000000000 +0100
-@@ -2,6 +2,7 @@
+--- wop-0.4.3/src/gameinfowindow.cpp	2006-03-27 12:27:52.000000000 +0200
++++ wop-0.4.3.new/src/gameinfowindow.cpp	2009-04-01 10:10:11.000000000 +0200
+@@ -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"
  
- #include  "spriteset.hpp"
- #include  "global.hpp"
-+#include "sprite.hpp"
+--- wop-0.4.3/src/map.cpp	2006-01-20 12:23:30.000000000 +0100
++++ wop-0.4.3.new/src/map.cpp	2009-04-01 10:08:41.000000000 +0200
+@@ -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>


Index: wormsofprey.spec
===================================================================
RCS file: /cvs/free/rpms/wormsofprey/devel/wormsofprey.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wormsofprey.spec	29 Mar 2009 14:23:24 -0000	1.3
+++ wormsofprey.spec	1 Apr 2009 08:29:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           wormsofprey
 Version:        0.4.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Team based bomb / scorched like game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Wed Apr  1 2009 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-5
+- Fix building with gcc 4.4
+
 * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.4.3-4
 - rebuild for new F11 features