1 files changed, 12 insertions, 16 deletions
diff --git a/desktop/adwaita-qt/adwaita-qt.SlackBuild b/desktop/adwaita-qt/adwaita-qt.SlackBuild
index 945faecd2f506..9339733821f9e 100644
--- a/desktop/adwaita-qt/adwaita-qt.SlackBuild
+++ b/desktop/adwaita-qt/adwaita-qt.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for adwaita-qt
 
-# Copyright 2017 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA
+# Copyright 2021 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=adwaita-qt
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -79,33 +79,29 @@ 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 {} \;
 
-
-# Fix install directory
-if [ "$ARCH" = "x86_64" ]; then
-  sed -i 's,${QT_PLUGINS_DIR}/styles,/usr/lib64/kde4/plugins/styles,g' style/CMakeLists.txt
-else
-  sed -i 's,${QT_PLUGINS_DIR}/styles,/usr/lib/kde4/plugins/styles,g' style/CMakeLists.txt
-fi
-
-
-mkdir build
+mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DUSE_QT4=ON \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
     -DCMAKE_BUILD_TYPE=Release ..
-
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 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 LICENSE.GPL2 README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING LICENSE.GPL2 README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir $PKG/install