[packages/warmux] - fix building with gcc 4.7+ - rel 6

[baggins]

commit 8cd29fcb47b53b87169b6b6a386ffeec5ab717ac
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Nov 8 01:18:12 2013 +0100

    - fix building with gcc 4.7+
    - rel 6

 warmux-gcc47.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 warmux.spec        |  4 +++-
 2 files changed, 45 insertions(+), 1 deletion(-)
---
diff --git a/warmux.spec b/warmux.spec
index 2221d5b..daf9efb 100644
--- a/warmux.spec
+++ b/warmux.spec
@@ -3,7 +3,7 @@ Summary(de.UTF-8):	Ein kostenloser Team17 Worms-Klon
 Summary(pl.UTF-8):	Wolnodostępny klon Worms z Team17
 Name:		warmux
 Version:	11.04.1
-Release:	5
+Release:	6
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	http://download.gna.org/warmux/%{name}-%{version}.tar.bz2
@@ -11,6 +11,7 @@ Source0:	http://download.gna.org/warmux/%{name}-%{version}.tar.bz2
 Patch0:		desktop.patch
 Patch1:		optflags.patch
 Patch2:		%{name}-libpng15.patch
+Patch3:		%{name}-gcc47.patch
 URL:		http://www.warmux.org/
 BuildRequires:	SDL-devel >= 1.2.6
 BuildRequires:	SDL_gfx-devel >= 2.0.13
@@ -45,6 +46,7 @@ Wolnodostępny klon gry Worms z Team17.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # disable building unsupported locales
 %{__sed} -i -e 's|cpf||g;s|ua||g' po/LINGUAS
diff --git a/warmux-gcc47.patch b/warmux-gcc47.patch
new file mode 100644
index 0000000..8c948e6
--- /dev/null
+++ b/warmux-gcc47.patch
@@ -0,0 +1,42 @@
+diff -up warmux-11.04/lib/warmux/action/action.cpp.gcc47 warmux-11.04/lib/warmux/action/action.cpp
+--- warmux-11.04/lib/warmux/action/action.cpp.gcc47	2011-04-28 21:03:14.000000000 +0200
++++ warmux-11.04/lib/warmux/action/action.cpp	2012-02-27 11:20:35.571676046 +0100
+@@ -85,7 +85,7 @@ Action::Action(const char *buffer, Dista
+ {
+   m_creator = _creator;
+ 
+-  m_header.len = SDLNet_Read32(buffer);
++  m_header.len = SDLNet_Read32((void *)buffer);
+   ASSERT(m_header.len >= sizeof(Header));
+   buffer += 4;
+   // All of the following could be skipped for the actions we now,
+@@ -225,7 +225,7 @@ int Action::PopInt()
+     return 0;
+   }
+ 
+-  uint32_t tmp = SDLNet_Read32(m_read); m_read += 4;
++  uint32_t tmp = SDLNet_Read32((void *)m_read); m_read += 4;
+ 
+   return *((int32_t*)&tmp);
+ }
+@@ -247,9 +247,9 @@ Double Action::PopDouble()
+   static const uint len = sizeof(fp::fint_t)/4;
+   for (uint i=0; i<len; i++) {
+ #  if SDL_BYTEORDER == SDL_LIL_ENDIAN
+-    tmp.u32[i] = SDLNet_Read32(m_read);
++    tmp.u32[i] = SDLNet_Read32((void *)m_read);
+ #  else
+-    tmp.u32[len-1-i] = SDLNet_Read32(m_read);
++    tmp.u32[len-1-i] = SDLNet_Read32((void* )m_read);
+ #  endif
+     m_read += 4;
+   }
+diff -up warmux-11.04/tools/list_games/main.cpp.gcc47 warmux-11.04/tools/list_games/main.cpp
+--- warmux-11.04/tools/list_games/main.cpp.gcc47	2011-04-28 21:03:12.000000000 +0200
++++ warmux-11.04/tools/list_games/main.cpp	2012-02-27 11:31:33.764447500 +0100
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <unistd.h>
+ #include <WARMUX_types.h>
+ #include <WARMUX_network.h>
+ #include <WARMUX_index_server.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/warmux.git/commitdiff/8cd29fcb47b53b87169b6b6a386ffeec5ab717ac