games/glestae: Included patches for gcc47 and libpng15

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

6 files changed, 40 insertions, 13 deletions

diff --git a/games/glestae/README b/games/glestae/README
index b3dfba8570..7c446aa1c0 100644
--- a/games/glestae/README
+++ b/games/glestae/README
@@ -2,7 +2,5 @@ Glest Advanced Engine is a community driven project which extends and
 improves on Glest. It aims to provide features and tools that help people
 develop higher quality 3D real-time strategy games for all major platforms.
 
-Glest Advanced Engine requires lua, OpenAL and physfs.
-
-Optionally glestae can use wxGTK/wxPython and cppunit. wxGTK/wxPython will
-build the optional gae_mapeditor and gae_g3dviewer.
+This requires lua, OpenAL, and physfs.
+cppunit and wxGTK or wxPython are optional dependencies.
diff --git a/games/glestae/gcc-4.7.patch b/games/glestae/gcc-4.7.patch
new file mode 100644
index 0000000000..7650137340
--- /dev/null
+++ b/games/glestae/gcc-4.7.patch
@@ -0,0 +1,11 @@
+diff -Naur glestae-src-0.3.93.orig/source/shared_lib/sources/physfs/MemFileOps.cpp glestae-src-0.3.93/source/shared_lib/sources/physfs/MemFileOps.cpp
+--- glestae-src-0.3.93.orig/source/shared_lib/sources/physfs/MemFileOps.cpp	2011-10-05 17:48:30.000000000 +0000
++++ glestae-src-0.3.93/source/shared_lib/sources/physfs/MemFileOps.cpp	2012-07-04 03:02:22.835956987 +0000
+@@ -16,6 +16,7 @@
+ #include <stdexcept>
+ #include "leak_dumper.h"
+ #include <string.h>
++#include <stdio.h> // for SEEK_SET, SEEK_...
+ 
+ namespace Shared { namespace PhysFS {
+ 
diff --git a/games/glestae/glestae.SlackBuild b/games/glestae/glestae.SlackBuild
index 12f8573796..39bd287962 100644
--- a/games/glestae/glestae.SlackBuild
+++ b/games/glestae/glestae.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for glestae
 
-# Copyright 2009-2010 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2009-2012 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=glestae
-VERSION=0.3.93
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.3.93}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,6 +69,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Fixes from upstream for libpng 1.5 and gcc 4.7.x.
+patch -p1 < $CWD/libpng-1.5.patch
+patch -p1 < $CWD/gcc-4.7.patch
+
 # This is the new cmake install.  New in version 0.3.
 mkdir -p build
 cd build
diff --git a/games/glestae/glestae.info b/games/glestae/glestae.info
index 222fb01366..f8cafa1fd9 100644
--- a/games/glestae/glestae.info
+++ b/games/glestae/glestae.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/games/glestae/libpng-1.5.patch b/games/glestae/libpng-1.5.patch
new file mode 100644
index 0000000000..a5032866c9
--- /dev/null
+++ b/games/glestae/libpng-1.5.patch
@@ -0,0 +1,14 @@
+diff -Naur glestae-src-0.3.93.orig/source/shared_lib/sources/graphics/pixmap.cpp glestae-src-0.3.93/source/shared_lib/sources/graphics/pixmap.cpp
+--- glestae-src-0.3.93.orig/source/shared_lib/sources/graphics/pixmap.cpp	2011-10-05 17:48:29.000000000 +0000
++++ glestae-src-0.3.93/source/shared_lib/sources/graphics/pixmap.cpp	2012-07-04 02:54:14.252629579 +0000
+@@ -12,6 +12,10 @@
+ #include "pch.h"
+ #include "pixmap.h"
+ 
++#ifndef Z_DEFAULT_COMPRESSION
++#   include "zlib.h"
++#endif
++
+ #include <stdexcept>
+ #include <cstdio>
+ #include <cassert>
diff --git a/games/glestae/slack-desc b/games/glestae/slack-desc
index e9c59e14b6..a8e6fb66d8 100644
--- a/games/glestae/slack-desc
+++ b/games/glestae/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
 glestae: glestae (Glest Advanced Engine)