5 files changed, 30 insertions, 17 deletions
diff --git a/games/solarus-quest-editor/README b/games/solarus-quest-editor/README
index 93415b90c8901..e61716b5d7e62 100644
--- a/games/solarus-quest-editor/README
+++ b/games/solarus-quest-editor/README
@@ -1,3 +1,5 @@
 Solarus Quest Editor is a free and open-source game editor for Solarus, licensed
 under GPL. It is written in C++ with Qt. It helps you managing your project, and
 editing maps, sprites, tilesets, dialogs, scripts, musics and sounds.
+
+NOTE: solarus will need to be built with qt5.
diff --git a/games/solarus-quest-editor/cmake.diff.gz b/games/solarus-quest-editor/cmake.diff.gz
new file mode 100644
index 0000000000000..72d44e11e7493
--- /dev/null
+++ b/games/solarus-quest-editor/cmake.diff.gz
diff --git a/games/solarus-quest-editor/doinst.sh b/games/solarus-quest-editor/doinst.sh
index 5fb28930db0b9..3e5691a052b5b 100644
--- a/games/solarus-quest-editor/doinst.sh
+++ b/games/solarus-quest-editor/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/solarus-quest-editor/solarus-quest-editor.SlackBuild b/games/solarus-quest-editor/solarus-quest-editor.SlackBuild
index b332f2260afef..2947201d76122 100644
--- a/games/solarus-quest-editor/solarus-quest-editor.SlackBuild
+++ b/games/solarus-quest-editor/solarus-quest-editor.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for solarus-quest-editor
 
-# 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=solarus-quest-editor
-VERSION=${VERSION:-1.4.5}
+VERSION=${VERSION:-1.5.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"
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,15 +69,21 @@ 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 {} \;
 
+# Add DSOLARUS_INSTALL_BINDIR and DSOLARUS_INSTALL_DATADIR
+# https://github.com/solarus-games/solarus-quest-editor/commit/286fa0823c78e38f8fef128ca7f86e85dcf1ab3f
+zcat $CWD/cmake.diff.gz | 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/$PRGNAM \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  install -Dm0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+  make install DESTDIR=$PKG
 cd ..
 
 install -Dm0644 images/logo/sqe-logo.png $PKG/usr/share/pixmaps/sqe-logo.png
@@ -87,16 +93,15 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # 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 images/icon/*${size}* 1>/dev/null 2>/dev/null; then
-	mkdir -p $PKG/usr/share/icons/hicolor/${size}x${size}/apps
-	cp -a images/icon/*${size}*.png \
-	   $PKG/usr/share/icons/hicolor/${size}x${size}/apps
-    fi
+for pngicon in images/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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog README.md license*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a changelog.txt license*.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/solarus-quest-editor/solarus-quest-editor.info b/games/solarus-quest-editor/solarus-quest-editor.info
index bb3e6572ce68c..870e49944e589 100644
--- a/games/solarus-quest-editor/solarus-quest-editor.info
+++ b/games/solarus-quest-editor/solarus-quest-editor.info
@@ -1,8 +1,8 @@
 PRGNAM="solarus-quest-editor"
-VERSION="1.4.5"
+VERSION="1.5.0"
 HOMEPAGE="http://www.solarus-games.org/"
-DOWNLOAD="https://github.com/christopho/solarus-quest-editor/archive/v1.4.5.tar.gz"
-MD5SUM="2af8a97bb53aac488974e69d81972050"
+DOWNLOAD="https://github.com/christopho/solarus-quest-editor/archive/v1.5.0/solarus-quest-editor-1.5.0.tar.gz"
+MD5SUM="4db117734e76363bc37cb6e1412512e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="solarus qt5"