games/solarus: Updated for version 1.6.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 12 insertions, 20 deletions

diff --git a/games/solarus/cmake.patch.gz b/games/solarus/cmake.patch.gz
deleted file mode 100644
index 0b254752b8..0000000000
--- a/games/solarus/cmake.patch.gz
+++ /dev/null
diff --git a/games/solarus/slack-desc b/games/solarus/slack-desc
index 8b25b29592..bbc9e09ffd 100644
--- a/games/solarus/slack-desc
+++ b/games/solarus/slack-desc
@@ -12,7 +12,7 @@ solarus: Solarus is a free and open-source Action-RPG game engine, licensed
 solarus: under GPL, and written in C++. It runs quests in Lua, and can work on
 solarus: a great number of platforms.
 solarus:
-solarus: Homepage: http://www.solarus-games.org/
+solarus: Homepage: https://www.solarus-games.org/
 solarus:
 solarus:
 solarus:
diff --git a/games/solarus/solarus.SlackBuild b/games/solarus/solarus.SlackBuild
index 77f6f5ac07..dac61ebeb8 100644
--- a/games/solarus/solarus.SlackBuild
+++ b/games/solarus/solarus.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for solarus
 
-# Copyright 2015-2018 Hunter Sezen California, USA
+# Copyright 2015-2019 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=solarus
-VERSION=${VERSION:-1.5.3}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,14 +75,6 @@ else
   GUI=OFF
 fi
 
-# Add SOLARUS_MANUAL_INSTALL_DESTINATION
-# Remove SOLARUS_BUNDLE in cmake/AddInstallTargets.cmake
-# Install solarus-run.6 when the gui is not compiled
-# https://gitlab.com/solarus-games/solarus/commit/a7822b3a523a7985defbe1c9daca1401c98dc7a7
-# https://gitlab.com/solarus-games/solarus/commit/1d5cb589cc532e477d784907e776d5ce3d6fed3a
-# https://gitlab.com/solarus-games/solarus/commit/2b3a54137fbb124f87eec40ad406291acb63cf3b
-zcat $CWD/cmake.patch.gz | patch -p1
-
 mkdir -p build
 cd build
   cmake \
@@ -99,15 +91,15 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
+  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-DOCS='changelog.txt compilation.txt README.md license.txt license_gpl.txt'
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a changelog.txt readme.md license.txt license_gpl.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/solarus/solarus.info b/games/solarus/solarus.info
index 8f9d90e27d..380e103910 100644
--- a/games/solarus/solarus.info
+++ b/games/solarus/solarus.info
@@ -1,10 +1,10 @@
 PRGNAM="solarus"
-VERSION="1.5.3"
-HOMEPAGE="http://www.solarus-games.org/"
-DOWNLOAD="https://gitlab.com/solarus-games/solarus/-/archive/v1.5.3/solarus-v1.5.3.tar.gz"
-MD5SUM="4953477094e7e0505c27733a19e74d99"
+VERSION="1.6.0"
+HOMEPAGE="https://www.solarus-games.org/"
+DOWNLOAD="https://gitlab.com/solarus-games/solarus/-/archive/v1.6.0/solarus-v1.6.0.tar.gz"
+MD5SUM="c5ecc1254d61a2af4b85c15259e95a76"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL SDL2_image SDL2_ttf libmodplug luajit physfs"
 MAINTAINER="Hunter Sezen"
-EMAIL="orbea@fredslev.dk"
+EMAIL="orbea@riseup.net"