[vegastrike] Fix building with boost 1.54

[Hans de Goede]

commit 220ff651eeb3c9bc95f622f2fe8d2bec1a5db680
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Aug 5 11:05:10 2013 +0200

    Fix building with boost 1.54

 vegastrike-0.5.1-boost146.patch |   11 -----------
 vegastrike-0.5.1-boost154.patch |   11 +++++++++++
 vegastrike.spec                 |    9 ++++++---
 3 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/vegastrike-0.5.1-boost154.patch b/vegastrike-0.5.1-boost154.patch
new file mode 100644
index 0000000..e30f46f
--- /dev/null
+++ b/vegastrike-0.5.1-boost154.patch
@@ -0,0 +1,11 @@
+diff -up vegastrike-src-0.5.1.r1/objconv/basemaker/base_maker_texture.cpp~ vegastrike-src-0.5.1.r1/objconv/basemaker/base_maker_texture.cpp
+--- vegastrike-src-0.5.1.r1/objconv/basemaker/base_maker_texture.cpp~	2010-03-10 03:56:23.000000000 +0100
++++ vegastrike-src-0.5.1.r1/objconv/basemaker/base_maker_texture.cpp	2013-08-05 08:52:40.776311438 +0200
+@@ -1,6 +1,7 @@
+ #include "hashtable.h"
+ #include "base_maker_texture.h"
+ #include <stdio.h>
++#include <string.h>
+ #include <png.h>
+ #ifdef _WIN32
+ #define XMD_H
diff --git a/vegastrike.spec b/vegastrike.spec
index d66694e..da6086c 100644
--- a/vegastrike.spec
+++ b/vegastrike.spec
@@ -1,6 +1,6 @@
 Name:           vegastrike
 Version:        0.5.1
-Release:        12.r1%{?dist}
+Release:        13.r1%{?dist}
 Summary:        3D OpenGL spaceflight simulator
 Group:          Amusements/Games
 License:        GPLv2+
@@ -20,10 +20,10 @@ Patch5:         vegastrike-0.5.1-openal.patch
 Patch6:         vegastrike-0.5.1-sys-python.patch
 Patch8:         vegastrike-0.5.1-gcc44.patch
 Patch9:         vegastrike-0.5.0-glext.patch
-Patch12:        vegastrike-0.5.1-boost146.patch
 Patch14:        vegastrike-0.5.1-gcc47.patch
 Patch15:        vegastrike-0.5.1-music.patch
 Patch16:        vegastrike-0.5.1-gcc48.patch
+Patch17:        vegastrike-0.5.1-boost154.patch
 BuildRequires:  libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel
 BuildRequires:  libjpeg-devel libpng-devel boost-devel expat-devel python-devel
 BuildRequires:  SDL_mixer-devel openal-soft-devel freealut-devel
@@ -49,10 +49,10 @@ Yet danger lurks in the space beyond.
 %patch6 -p0
 %patch8 -p0
 %patch9 -p1
-%patch12 -p0
 %patch14 -p1
 %patch15 -p3
 %patch16 -p0
+%patch17 -p1
 iconv -f ISO-8859-1 -t UTF-8 README > README.tmp
 touch -r README README.tmp
 mv README.tmp README
@@ -102,6 +102,9 @@ desktop-file-install            \
 
 
 %changelog
+* Mon Aug 05 2013 Hans de Goede <hdegoede at redhat.com> - 0.5.1-13.r1
+- Fix building with boost 1.54
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-12.r1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild