4 files changed, 31 insertions, 11 deletions
diff --git a/games/solarus/cmake.patch.gz b/games/solarus/cmake.patch.gz
new file mode 100644
index 0000000000..0b254752b8
--- /dev/null
+++ b/games/solarus/cmake.patch.gz
diff --git a/games/solarus/doinst.sh b/games/solarus/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/games/solarus/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/solarus/solarus.SlackBuild b/games/solarus/solarus.SlackBuild
index 10c029c8f9..b9a583304e 100644
--- a/games/solarus/solarus.SlackBuild
+++ b/games/solarus/solarus.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=solarus
-VERSION=${VERSION:-1.5.1}
+VERSION=${VERSION:-1.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,13 +54,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,10 +69,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if ! pkg-config --exists Qt5Core; then
-  GUI="-DSOLARUS_GUI=OFF"
+if pkg-config --exists Qt5Core; then
+  GUI=ON
+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://github.com/solarus-games/solarus/commit/a7822b3a523a7985defbe1c9daca1401c98dc7a7
+# https://github.com/solarus-games/solarus/commit/1d5cb589cc532e477d784907e776d5ce3d6fed3a
+# https://github.com/solarus-games/solarus/commit/2b3a54137fbb124f87eec40ad406291acb63cf3b
+zcat $CWD/cmake.patch.gz | patch -p1
+
 mkdir -p build
 cd build
   cmake \
@@ -80,9 +90,10 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSOLARUS_EXECUTABLE_INSTALL_DESTINATION:PATH=games \
+    -DSOLARUS_MANUAL_INSTALL_DESTINATION:PATH=man \
     -DSOLARUS_LIBRARY_INSTALL_DESTINATION:PATH=lib${LIBDIRSUFFIX} \
     -DSOLARUS_DEFAULT_QUEST=/usr/share/games/$PRGNAM/zsdx \
-    $GUI \
+    -DSOLARUS_GUI=$GUI \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
@@ -91,17 +102,17 @@ 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
 
-install -Dm0644 $PRGNAM.6 $PKG/usr/man/man6/$PRGNAM.6
 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"
+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
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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.${PKGTYPE:-tgz}
diff --git a/games/solarus/solarus.info b/games/solarus/solarus.info
index cb443cdf4f..63afbbeb98 100644
--- a/games/solarus/solarus.info
+++ b/games/solarus/solarus.info
@@ -1,8 +1,8 @@
 PRGNAM="solarus"
-VERSION="1.5.1"
+VERSION="1.5.3"
 HOMEPAGE="http://www.solarus-games.org/"
-DOWNLOAD="http://www.solarus-games.org/downloads/solarus/solarus-1.5.1-src.tar.gz"
-MD5SUM="647a5908e33721febf3b7dce1dbd9c39"
+DOWNLOAD="https://github.com/solarus-games/solarus/archive/v1.5.3/solarus-1.5.3.tar.gz"
+MD5SUM="a89ef1c29d4ebd171d3e77e46fb90e0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL SDL2_image SDL2_ttf libmodplug luajit physfs"