3 files changed, 25 insertions, 20 deletions
diff --git a/games/zsdx/doinst.sh b/games/zsdx/doinst.sh
index 5fb28930db0b..3e5691a052b5 100644
--- a/games/zsdx/doinst.sh
+++ b/games/zsdx/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/zsdx/zsdx.SlackBuild b/games/zsdx/zsdx.SlackBuild
index 0af528d4af33..811d974a1070 100644
--- a/games/zsdx/zsdx.SlackBuild
+++ b/games/zsdx/zsdx.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Zelda: Mystery of Solarus DX
 
-# 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,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zsdx
-VERSION=${VERSION:-1.10.3}
+VERSION=${VERSION:-1.11.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
@@ -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"
@@ -75,37 +75,36 @@ cd build
     -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 ..
 
-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: Mystery of Solarus DX
 Exec=$PRGNAM
-Icon=${PRGNAM}_icon
+Icon=$PRGNAM-logo
 Type=Application
 Comment=Zelda: Mystery of Solarus DX (action rpg game)
 Categories=Game;ActionGame;
 EOF
 
 # Add missing icons to package
-for size in $(find /usr/share/icons/hicolor -type d -mindepth 1 -maxdepth 1 -exec basename {} \; | cut -f1 -d"x"); do
-    if ls build/icons/*${size}* 1>/dev/null 2>/dev/null; then
-	mkdir -p $PKG/usr/share/icons/hicolor/${size}x${size}/apps
-	cp -a build/icons/*${size}*.png \
-	   $PKG/usr/share/icons/hicolor/${size}x${size}/apps/${PRGNAM}_icon.png
-    fi
+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 license.txt readme.txt work/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a changelog.txt license.txt readme.md work/*.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/zsdx/zsdx.info b/games/zsdx/zsdx.info
index a85d59260391..5c7efe013ebb 100644
--- a/games/zsdx/zsdx.info
+++ b/games/zsdx/zsdx.info
@@ -1,10 +1,10 @@
 PRGNAM="zsdx"
-VERSION="1.10.3"
+VERSION="1.11.0"
 HOMEPAGE="http://www.solarus-games.org/"
-DOWNLOAD="https://github.com/christopho/zsdx/archive/zsdx-1.10.3.tar.gz"
-MD5SUM="616e0f67b3ce4266a0036271804cbd92"
+DOWNLOAD="https://github.com/christopho/zsdx/archive/zsdx-1.11.0.tar.gz"
+MD5SUM="6f145d0e6e39f8446a750c30bf0fd061"
 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"