rpms/wormux/devel wormux-0.7.9-gcc43.patch, NONE, 1.1 wormux.spec, 1.11, 1.12

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/wormux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13450

Modified Files:
	wormux.spec 
Added Files:
	wormux-0.7.9-gcc43.patch 
Log Message:
rebuild for gcc 4.3


wormux-0.7.9-gcc43.patch:

--- NEW FILE wormux-0.7.9-gcc43.patch ---
--- wormux-0.7.9/src/network/distant_cpu.cpp.orig	2008-02-10 11:52:30.000000000 -0800
+++ wormux-0.7.9/src/network/distant_cpu.cpp	2008-02-10 11:52:43.000000000 -0800
@@ -30,6 +30,7 @@
 #include "../team/teams_list.h"
 #include "../tool/debug.h"
 #include "../tool/i18n.h"
+#include <bits/stl_algo.h>
 //-----------------------------------------------------------------------------
 
 DistantComputer::DistantComputer(TCPsocket new_sock)
--- wormux-0.7.9/src/weapon/launcher.cpp.orig	2008-02-10 12:10:59.000000000 -0800
+++ wormux-0.7.9/src/weapon/launcher.cpp	2008-02-10 12:11:11.000000000 -0800
@@ -22,6 +22,7 @@
 #include "launcher.h"
 
 #include <sstream>
+#include <typeinfo>
 
 #include "explosion.h"
 #include "../game/config.h"
--- wormux-0.7.9/src/weapon/anvil.cpp.orig	2008-02-10 12:14:32.000000000 -0800
+++ wormux-0.7.9/src/weapon/anvil.cpp	2008-02-10 12:14:45.000000000 -0800
@@ -22,6 +22,7 @@
 #include "anvil.h"
 //-----------------------------------------------------------------------------
 #include <sstream>
+#include <typeinfo>
 #include "../game/time.h"
 #include "../team/teams_list.h"
 #include "../graphic/video.h"
--- wormux-0.7.9/src/menu/map_selection_box.cpp.orig	2008-02-09 15:00:36.000000000 -0800
+++ wormux-0.7.9/src/menu/map_selection_box.cpp	2008-02-09 15:20:34.000000000 -0800
@@ -19,6 +19,8 @@
  * Map selection box
  *****************************************************************************/
 
+#include <algorithm>
+#include <functional>
 #include "map_selection_box.h"
 #include "../include/action_handler.h"
 #include "../map/maps_list.h"
--- wormux-0.7.9/src/menu/credits_menu.cpp.orig	2008-02-09 15:03:55.000000000 -0800
+++ wormux-0.7.9/src/menu/credits_menu.cpp	2008-02-09 15:12:24.000000000 -0800
@@ -23,6 +23,8 @@
 //-----------------------------------------------------------------------------
 #include <sstream>
 #include <iostream>
+#include <algorithm>
+#include <functional>
 #include "../game/config.h"
 #include "../include/app.h"
 //-----------------------------------------------------------------------------
--- wormux-0.7.9/src/game/config.cpp.orig	2008-02-09 14:49:55.000000000 -0800
+++ wormux-0.7.9/src/game/config.cpp	2008-02-09 14:51:19.000000000 -0800
@@ -373,7 +373,7 @@
  */
 std::string Config::GetEnv(const std::string & name, const std::string &default_value)
 {
-  const char *env = std::getenv(name.c_str());
+  const char *env = ::getenv(name.c_str());
   if (env != NULL) {
     return env;
   } else {
--- wormux-0.7.9/src/map/maps_list.cpp.orig	2008-02-09 15:31:53.000000000 -0800
+++ wormux-0.7.9/src/map/maps_list.cpp	2008-02-09 15:32:07.000000000 -0800
@@ -18,7 +18,8 @@
  ******************************************************************************
  * Maps list
  *****************************************************************************/
-
+#include <algorithm>
+#include <functional>
 #include "maps_list.h"
 #include "map.h"
 #include "../game/config.h"


Index: wormux.spec
===================================================================
RCS file: /cvs/extras/rpms/wormux/devel/wormux.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wormux.spec	22 Aug 2007 06:00:21 -0000	1.11
+++ wormux.spec	10 Feb 2008 21:02:49 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           wormux
 Version:        0.7.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        2D convivial mass murder game
 
 Group:          Amusements/Games
@@ -8,6 +8,7 @@
 URL:            http://www.wormux.org
 Source0:        http://download.gna.org/wormux/%{name}-%{version}.tar.gz
 Patch0:         wormux-0.7.9-cflags.patch
+Patch1:         wormux-0.7.9-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_image-devel SDL_gfx-devel SDL_mixer-devel
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -85,6 +87,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Fri Feb 8 2008 Wart <wart at kobold.org> 0.7.9-6
+- Rebuild for gcc 4.3
+
 * Tue Aug 21 2007 Wart <wart at kobold.org> 0.7.9-5
 - License tag clarification