1 files changed, 29 insertions, 7 deletions
diff --git a/office/goldendict/goldendict.SlackBuild b/office/goldendict/goldendict.SlackBuild
index 2d1e6b478f..088823db1b 100644
--- a/office/goldendict/goldendict.SlackBuild
+++ b/office/goldendict/goldendict.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for GoldenDict
 
@@ -26,11 +26,14 @@
 # Contacts: Damien Goutte-Gattat <dgouttegattat@incenp.org> (original author)
 #           Andrey Butirsky <butirsky@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=goldendict
-VERSION=${VERSION:-1.5.0_RC2}
+VERSION=${VERSION:-1.5.0}
 SRCVER=$(echo $VERSION | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,7 +43,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -53,18 +63,30 @@ cd $TMP
 rm -rf $PRGNAM-$SRCVER
 tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
 cd $PRGNAM-$SRCVER
-chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fixing QMake in goldendict.pro file (source: aur.archlinux.org)
+echo "QMAKE_CFLAGS_RELEASE = ${SLKCFLAGS}"   >> goldendict.pro
+echo "QMAKE_CXXFLAGS_RELEASE = ${SLKCFLAGS}" >> goldendict.pro
+sed -i '/VERSION/ s/+git//' goldendict.pro
 
-$(type -p qmake-qt5 || echo qmake) PREFIX=/usr \
+qmake-qt5 PREFIX=/usr \
   CONFIG+=no_epwing_support \
   CONFIG+=zim_support \
-  DISABLE_INTERNAL_PLAYER=$DISABLE_INTERNAL_PLAYER
+  QMAKE_CXXFLAGS+=-std=c++14 \
+  DISABLE_INTERNAL_PLAYER=$DISABLE_INTERNAL_PLAYER \
+  goldendict.pro
 make install INSTALL_ROOT=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   CREDITS.txt LICENSE.txt README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
+chmod -x $PKG/usr/share/applications/*.desktop
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -72,4 +94,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE