diff options
| -rw-r--r-- | games/glob2/SConstruct_boost.patch | 17 | ||||
| -rw-r--r-- | games/glob2/TextStream_headers.patch | 15 | ||||
| -rw-r--r-- | games/glob2/fix-ftbfs-gcc49.diff | 15 | ||||
| -rw-r--r-- | games/glob2/fixes.patch | 47 | ||||
| -rw-r--r-- | games/glob2/glob2.SlackBuild | 16 |
5 files changed, 54 insertions, 56 deletions
diff --git a/games/glob2/SConstruct_boost.patch b/games/glob2/SConstruct_boost.patch deleted file mode 100644 index 0867016d6f..0000000000 --- a/games/glob2/SConstruct_boost.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- glob2-0.9.4.4/SConstruct.original 2014-04-09 06:25:12.710804438 +0300 -+++ glob2-0.9.4.4/SConstruct 2014-04-09 06:47:08.010360930 +0300 -@@ -109,6 +109,14 @@ - else: - print "Could not find libz or zlib1.dll" - missing.append("zlib") -+ -+ boost_system = '' -+ if conf.CheckLib("boost_system"): -+ boost_system="boost_system" -+ else: -+ print "Could not find libboost_system" -+ missing.append("libboost_system") -+ env.Append(LIBS=[boost_system]) - - boost_thread = '' - if conf.CheckLib("boost_thread") and conf.CheckCXXHeader("boost/thread/thread.hpp"): diff --git a/games/glob2/TextStream_headers.patch b/games/glob2/TextStream_headers.patch deleted file mode 100644 index 56a5707a2c..0000000000 --- a/games/glob2/TextStream_headers.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- glob2-0.9.4.4/libgag/src/TextStream.original.cpp 2014-04-06 22:37:28.204008827 +0300 -+++ glob2-0.9.4.4/libgag/src/TextStream.cpp 2014-04-06 22:37:59.509617453 +0300 -@@ -17,11 +17,11 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include <TextStream.h> - #include <assert.h> - #include <fstream> - #include <iostream> - #include <stack> -+#include <TextStream.h> - #ifdef WIN32 - #define snprintf _snprintf - #define vsnprintf _vsnprintf diff --git a/games/glob2/fix-ftbfs-gcc49.diff b/games/glob2/fix-ftbfs-gcc49.diff deleted file mode 100644 index 061146a468..0000000000 --- a/games/glob2/fix-ftbfs-gcc49.diff +++ /dev/null @@ -1,15 +0,0 @@ -Index: glob2-0.9.4.4/src/Game.h -=================================================================== ---- glob2-0.9.4.4.orig/src/Game.h 2014-07-14 10:36:36.705074927 +0800 -+++ glob2-0.9.4.4/src/Game.h 2014-07-14 10:38:28.733077827 +0800 -@@ -148,7 +148,8 @@ - TOP_TO_BOTTOM, - BOTTOM_TO_TOP - }; -- -+ -+public: - struct BuildProject - { - int posX; - diff --git a/games/glob2/fixes.patch b/games/glob2/fixes.patch new file mode 100644 index 0000000000..50f4998ac5 --- /dev/null +++ b/games/glob2/fixes.patch @@ -0,0 +1,47 @@ +--- glob2-0.9.4.4/libgag/src/TextStream.original.cpp 2014-04-06 22:37:28.204008827 +0300 ++++ glob2-0.9.4.4/libgag/src/TextStream.cpp 2014-04-06 22:37:59.509617453 +0300 +@@ -17,11 +17,11 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include <TextStream.h> + #include <assert.h> + #include <fstream> + #include <iostream> + #include <stack> ++#include <TextStream.h> + #ifdef WIN32 + #define snprintf _snprintf + #define vsnprintf _vsnprintf +--- glob2-0.9.4.4/SConstruct.original 2014-04-09 06:25:12.710804438 +0300 ++++ glob2-0.9.4.4/SConstruct 2014-04-09 06:47:08.010360930 +0300 +@@ -109,6 +109,14 @@ + else: + print "Could not find libz or zlib1.dll" + missing.append("zlib") ++ ++ boost_system = '' ++ if conf.CheckLib("boost_system"): ++ boost_system="boost_system" ++ else: ++ print "Could not find libboost_system" ++ missing.append("libboost_system") ++ env.Append(LIBS=[boost_system]) + + boost_thread = '' + if conf.CheckLib("boost_thread") and conf.CheckCXXHeader("boost/thread/thread.hpp"): +Index: glob2-0.9.4.4/src/Game.h +=================================================================== +--- glob2-0.9.4.4.orig/src/Game.h 2014-07-14 10:36:36.705074927 +0800 ++++ glob2-0.9.4.4/src/Game.h 2014-07-14 10:38:28.733077827 +0800 +@@ -148,7 +148,8 @@ + TOP_TO_BOTTOM, + BOTTOM_TO_TOP + }; +- ++ ++public: + struct BuildProject + { + int posX; + diff --git a/games/glob2/glob2.SlackBuild b/games/glob2/glob2.SlackBuild index 1e62ddebd4..6bb719cd26 100644 --- a/games/glob2/glob2.SlackBuild +++ b/games/glob2/glob2.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for glob2 -# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada +# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,12 +24,12 @@ PRGNAM=glob2 VERSION=${VERSION:-0.9.4.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -67,11 +67,9 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/TextStream_headers.patch -patch -p1 < $CWD/SConstruct_boost.patch -patch -p1 < $CWD/fix-ftbfs-gcc49.diff +patch -p1 < $CWD/fixes.patch mkdir -p $PKG/usr/bin \ $PKG/usr/share/games/$PRGNAM |