[SCM] WarMUX PKG branch, master, updated. 26a7d763eca94a4a08530e93f95f950d1441712c

[Felix Geyer]

The following commit has been merged in the master branch:
commit 6617dbd75d802088170b471180122a38536146d9
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sat Mar 10 17:25:01 2012 +0100

    Fix FTBFS with libsdl-net 1.2.8.

diff --git a/debian/changelog b/debian/changelog
index 982e0f8..5c35092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ warmux (1:11.04.1+repack-2) UNRELEASED; urgency=low
   * Fix FTBFS with libpng 1.5. (Closes: #649788)
     - Add 05_fix_build_libpng15.patch
   * Build-depend on libpng-dev instead of libpng12-dev. (Closes: #662543)
+  * Fix FTBFS with libsdl-net 1.2.8.
+    - Add 06_fix_build_sdlnet.patch
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Sun, 16 Oct 2011 10:22:32 +0200
 
diff --git a/debian/patches/06_fix_build_sdlnet.patch b/debian/patches/06_fix_build_sdlnet.patch
new file mode 100644
index 0000000..ece948c
--- /dev/null
+++ b/debian/patches/06_fix_build_sdlnet.patch
@@ -0,0 +1,14 @@
+Description: Fix FTBFS with libsdl-net 1.2.8.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+
+--- warmux-11.04.1+repack.orig/lib/warmux/action/action.cpp
++++ warmux-11.04.1+repack/lib/warmux/action/action.cpp
+@@ -85,7 +85,7 @@
+ {
+   m_creator = _creator;
+ 
+-  m_header.len = SDLNet_Read32(buffer);
++  m_header.len = SDLNet_Read32(const_cast<char*>(buffer));
+   ASSERT(m_header.len >= sizeof(Header));
+   buffer += 4;
+   // All of the following could be skipped for the actions we now,
diff --git a/debian/patches/series b/debian/patches/series
index eedd87c..23035eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_respect_build_flags_from_env.patch
 04_fix_build_kfreebsd.patch
 05_fix_build_libpng15.patch
+06_fix_build_sdlnet.patch

-- 
WarMUX PKG