4 files changed, 35 insertions, 20 deletions
diff --git a/games/zelda-roth-se/cmake.diff.gz b/games/zelda-roth-se/cmake.diff.gz
new file mode 100644
index 0000000000000..fd6f1164809cf
--- /dev/null
+++ b/games/zelda-roth-se/cmake.diff.gz
diff --git a/games/zelda-roth-se/doinst.sh b/games/zelda-roth-se/doinst.sh
index 5fb28930db0b9..3e5691a052b5b 100644
--- a/games/zelda-roth-se/doinst.sh
+++ b/games/zelda-roth-se/doinst.sh
@@ -1,3 +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 usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/zelda-roth-se/zelda-roth-se.SlackBuild b/games/zelda-roth-se/zelda-roth-se.SlackBuild
index 3c106a5ede027..9c47704759e68 100644
--- a/games/zelda-roth-se/zelda-roth-se.SlackBuild
+++ b/games/zelda-roth-se/zelda-roth-se.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Zelda Return of the Hylian Solarus Edition
 
-# Copyright 2015 Hunter Sezen California, USA
+# Copyright 2015-2016 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,14 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zelda-roth-se
-SRCNAM=$(echo $PRGNAM | tr - _)
-VERSION=${VERSION:-1.0.8}
+VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 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
@@ -41,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"
@@ -60,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,34 +69,44 @@ 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 {} \;
 
+# Update cmake file to previous fixes from zsdx
+# https://github.com/solarus-games/zelda-roth-se/commit/e9b5bd907f5b50b17d65ebe2fa50760d322c537c
+zcat $CWD/cmake.diff | patch -p1
+
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSOLARUS_INSTALL_BINDIR:PATH=games \
+    -DSOLARUS_INSTALL_DATADIR:PATH=share/games/solarus \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
 cd ..
 
-install -Dm0644 ${SRCNAM}_title_small.png $PKG/usr/share/pixmaps/${SRCNAM}_title_small.png
-
-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
-
 # Write a desktop file
 mkdir -p $PKG/usr/share/applications
 cat > $PKG/usr/share/applications/$PRGNAM.desktop <<EOF
 [Desktop Entry]
 Name=Zelda Return of the Hylian
-Exec=$SRCNAM
-Icon=${SRCNAM}_title_small.png
+Exec=$PRGNAM
+Icon=$PRGNAM-logo
 Type=Application
 Comment=Zelda Return of the Hylian (action rpg game)
 Categories=Game;ActionGame;
 EOF
 
+# Add missing icons to package
+for pngicon in data/logos/icon_*.png ; do
+  if [ -f $pngicon ]; then
+    size=$(basename $pngicon .png | tr -dc 0-9)
+    install -Dm0644 $pngicon $PKG/usr/share/icons/hicolor/${size}x${size}/apps/$PRGNAM.png
+  fi
+done
+install -Dm0644 data/logos/logo@2x.png $PKG/usr/share/pixmaps/$PRGNAM-logo.png
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a changelog.txt readme.md todo.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/games/zelda-roth-se/zelda-roth-se.info b/games/zelda-roth-se/zelda-roth-se.info
index 7c4e438ab6396..0d198ff8fee47 100644
--- a/games/zelda-roth-se/zelda-roth-se.info
+++ b/games/zelda-roth-se/zelda-roth-se.info
@@ -1,10 +1,10 @@
 PRGNAM="zelda-roth-se"
-VERSION="1.0.8"
+VERSION="1.1.0"
 HOMEPAGE="http://www.solarus-games.org/"
-DOWNLOAD="https://github.com/christopho/zelda_roth_se/archive/v1.0.8.tar.gz"
-MD5SUM="b7f80e228f86ab85b32b8b6631ba094f"
+DOWNLOAD="https://github.com/christopho/zelda_roth_se/archive/v1.1.0/zelda-roth-se-1.1.0.tar.gz"
+MD5SUM="b0d6f332d2c8c4542217c4cf469fb3e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="solarus"
 MAINTAINER="Hunter Sezen"
-EMAIL="ovariegata@yahoo.com"
-\ No newline at end of file
+EMAIL="ovariegata@yahoo.com"