From 99eee08fbe50608d5f24b4af34405a65b832e926 Mon Sep 17 00:00:00 2001
From: Hunter Sezen <ovariegata@yahoo.com>
Date: Wed, 7 Mar 2018 13:28:51 +0000
Subject: games/zsdx: Patched.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 games/zsdx/zsdx.SlackBuild | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

(limited to 'games/zsdx/zsdx.SlackBuild')

diff --git a/games/zsdx/zsdx.SlackBuild b/games/zsdx/zsdx.SlackBuild
index 811d974a1070b..129bca7a05ad2 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-2016 Hunter Sezen California, USA
+# Copyright 2015-2016, 2018 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=zsdx
 VERSION=${VERSION:-1.11.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -69,6 +69,10 @@ 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 {} \;
 
+# Install icons and a desktop file.
+# https://github.com/solarus-games/zsdx/pull/122
+zcat $CWD/share.patch.gz | patch -p1
+
 mkdir -p build
 cd build
   cmake \
@@ -82,27 +86,6 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
-# 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-logo
-Type=Application
-Comment=Zelda: Mystery of Solarus DX (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 license.txt readme.md work/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-- 
cgit v1.2.3