games/einstein: Updated for version 2.0

4 files changed, 48 insertions, 3 deletions

diff --git a/games/einstein/einstein.SlackBuild b/games/einstein/einstein.SlackBuild
index b3a53e319d..f5964a1e5c 100644
--- a/games/einstein/einstein.SlackBuild
+++ b/games/einstein/einstein.SlackBuild
@@ -1,7 +1,26 @@
 #!/bin/sh
-
+#
 # Slackware build script for einstein
-# Written by Erik Hanson  erik@slackbuilds.org
+#
+# Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=einstein
 VERSION=2.0
@@ -18,6 +37,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -eu
@@ -59,4 +80,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/einstein/einstein.info b/games/einstein/einstein.info
index 70c44e12ae..0a49b33be8 100644
--- a/games/einstein/einstein.info
+++ b/games/einstein/einstein.info
@@ -2,7 +2,9 @@ PRGNAM="einstein"
 VERSION="2.0"
 HOMEPAGE="http://games.flowix.com/en/index.html"
 DOWNLOAD="http://games.flowix.com/files/einstein/einstein-2.0-src.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="c1d98e761c10af63f03462ead625f80c"
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
 APPROVED="rworkman"
diff --git a/games/einstein/patches/08_gcc43.diff b/games/einstein/patches/08_gcc43.diff
new file mode 100644
index 0000000000..c0c7a80fc7
--- /dev/null
+++ b/games/einstein/patches/08_gcc43.diff
@@ -0,0 +1,12 @@
+Patch by Martin Michlmayr <tbm@cyrius.com> via bug 421127.
+
+--- ../orig/einstein-2.0.dfsg.2/convert.h	2005-08-14 04:40:58.000000000 +0200
++++ convert.h	2007-08-31 11:33:06.000000000 +0200
+@@ -5,6 +5,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <string>
++#include <typeinfo>
+ 
+ #include "exceptions.h"
+ #include "unicode.h"
diff --git a/games/einstein/patches/10_gcc43.diff b/games/einstein/patches/10_gcc43.diff
new file mode 100644
index 0000000000..f378500531
--- /dev/null
+++ b/games/einstein/patches/10_gcc43.diff
@@ -0,0 +1,10 @@
+diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/einstein-2.0.dfsg.2/unicode.cpp ./unicode.cpp
+--- ../orig/einstein-2.0.dfsg.2/unicode.cpp	2005-08-14 04:40:58.000000000 +0200
++++ ./unicode.cpp	2008-01-26 11:49:10.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include <wchar.h>
+ #include <stdlib.h>
++#include <string.h>
+ #ifdef WIN32
+ #include <windows.h>
+ #endif