From abf25458c1bc42f7fc0c48901eacc57295301552 Mon Sep 17 00:00:00 2001
From: Hunter Sezen <ovariegata@yahoo.com>
Date: Wed, 7 Mar 2018 13:32:17 +0000
Subject: games/zelda-roth-se: Patched.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 games/zelda-roth-se/cmake.diff.gz            | Bin 611 -> 0 bytes
 games/zelda-roth-se/cmake.patch.gz           | Bin 0 -> 611 bytes
 games/zelda-roth-se/share.patch.gz           | Bin 0 -> 987 bytes
 games/zelda-roth-se/zelda-roth-se.SlackBuild |  33 +++++++--------------------
 4 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 games/zelda-roth-se/cmake.diff.gz
 create mode 100644 games/zelda-roth-se/cmake.patch.gz
 create mode 100644 games/zelda-roth-se/share.patch.gz

(limited to 'games/zelda-roth-se')

diff --git a/games/zelda-roth-se/cmake.diff.gz b/games/zelda-roth-se/cmake.diff.gz
deleted file mode 100644
index fd6f116480..0000000000
Binary files a/games/zelda-roth-se/cmake.diff.gz and /dev/null differ
diff --git a/games/zelda-roth-se/cmake.patch.gz b/games/zelda-roth-se/cmake.patch.gz
new file mode 100644
index 0000000000..fd6f116480
Binary files /dev/null and b/games/zelda-roth-se/cmake.patch.gz differ
diff --git a/games/zelda-roth-se/share.patch.gz b/games/zelda-roth-se/share.patch.gz
new file mode 100644
index 0000000000..d55a7a9b87
Binary files /dev/null and b/games/zelda-roth-se/share.patch.gz differ
diff --git a/games/zelda-roth-se/zelda-roth-se.SlackBuild b/games/zelda-roth-se/zelda-roth-se.SlackBuild
index e6783bbf8a..bfe1f94123 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-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=zelda-roth-se
 VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 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
@@ -71,7 +71,11 @@ find -L . \
 
 # Update cmake file to previous fixes from zsdx
 # https://github.com/solarus-games/zelda-roth-se/commit/e9b5bd907f5b50b17d65ebe2fa50760d322c537c
-zcat $CWD/cmake.diff | patch -p1
+zcat $CWD/cmake.patch.gz | patch -p1
+
+# Install icons and a desktop file.
+# https://github.com/solarus-games/zelda-roth-se/pull/102
+zcat $CWD/share.patch.gz | patch -p1
 
 mkdir -p build
 cd build
@@ -86,27 +90,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 Return of the Hylian
-Exec=$(echo $PRGNAM | tr - _)
-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
-- 
cgit v1.2.3-80-g2a13