2 files changed, 29 insertions, 29 deletions
diff --git a/office/kchmviewer-qt/kchmviewer-qt.SlackBuild b/office/kchmviewer-qt/kchmviewer-qt.SlackBuild
index 7baa06a1be..1c3b573306 100644
--- a/office/kchmviewer-qt/kchmviewer-qt.SlackBuild
+++ b/office/kchmviewer-qt/kchmviewer-qt.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kchmviewer-qt
 
@@ -23,12 +23,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0,
+# by updating to v8.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kchmviewer-qt
-VERSION=${VERSION:-7.7}
+VERSION=${VERSION:-8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ORIG_PRGNAM=${PRGNAM%-qt}
+SRCVER=RELEASE_${VERSION//./_}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,48 +45,44 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+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}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-else
-  SLKCFLAGS="-O2"
-fi
+# 20220224 bkw: no need for SLKCFLAGS, qmake-qt5 uses the flags
+# qt5 was built with (which are the same ones we use).
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $ORIG_PRGNAM-$VERSION
-tar xvf $CWD/$ORIG_PRGNAM-$VERSION.tar.gz
-cd $ORIG_PRGNAM-$VERSION
+rm -rf $ORIG_PRGNAM-$SRCVER
+tar xvf $CWD/$ORIG_PRGNAM-$SRCVER.tar.gz
+cd $ORIG_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 \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 sed -i "s/$ORIG_PRGNAM/$PRGNAM/g;
         /^Categories/s/KDE;//;
         /^Name/s/$/ (Qt-only)/" packages/$ORIG_PRGNAM.desktop
 
-qmake \
-  QMAKE_CFLAGS+="$SLKCFLAGS" \
-  QMAKE_CXXFLAGS+="$SLKCFLAGS" \
-    $ORIG_PRGNAM.pro
+sed -i "/^Icon/s,=.*,=/usr/share/pixmaps/$PRGNAM.png," packages/$ORIG_PRGNAM.desktop
+
+qmake-qt5
 make
 
 mkdir -p $PKG/usr/bin
-install -m 0755 -o root -g root bin/$ORIG_PRGNAM $PKG/usr/bin/$PRGNAM
+install -s -m 0755 -o root -g root bin/$ORIG_PRGNAM $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 install -m 0644 -o root -g root packages/$ORIG_PRGNAM.desktop \
@@ -87,9 +90,6 @@ install -m 0644 -o root -g root packages/$ORIG_PRGNAM.desktop \
 install -m 0644 -o root -g root packages/$ORIG_PRGNAM.png \
   $PKG/usr/share/pixmaps/$PRGNAM.png
 
-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
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING ChangeLog DBUS-bindings FAQ README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -99,4 +99,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
diff --git a/office/kchmviewer-qt/kchmviewer-qt.info b/office/kchmviewer-qt/kchmviewer-qt.info
index 16fd637eed..922bfeedc3 100644
--- a/office/kchmviewer-qt/kchmviewer-qt.info
+++ b/office/kchmviewer-qt/kchmviewer-qt.info
@@ -1,8 +1,8 @@
 PRGNAM="kchmviewer-qt"
-VERSION="7.7"
+VERSION="8.0"
 HOMEPAGE="http://www.ulduzsoft.com/kchmviewer"
-DOWNLOAD="http://downloads.sourceforge.net/kchmviewer/kchmviewer-7.7.tar.gz"
-MD5SUM="abf60f0cff69d2903600ecd372624cae"
+DOWNLOAD="https://github.com/gyunaev/kchmviewer/archive/RELEASE_8_0/kchmviewer-RELEASE_8_0.tar.gz"
+MD5SUM="581fac4d97042b0cc32bf683a39458eb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""