desktop/adwaita-qt: Updated for version 1.3.1.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

3 files changed, 19 insertions, 25 deletions

diff --git a/desktop/adwaita-qt/README b/desktop/adwaita-qt/README
index 266b332fea848..90bbb8a65c60a 100644
--- a/desktop/adwaita-qt/README
+++ b/desktop/adwaita-qt/README
@@ -1,6 +1,4 @@
-adwaita-qt (KDE/QT Theme)
-
-A Qt style to make Qt applications look like they belong in GNOME
-Shell.  This is useful for achieveing a uniform look btween QT
-and GTK-2.0/3.0 apps.  Adwaita is the default GTK 2.0 and 3.0
-theme in Slackware, this package only installs the QT4 theme.
+adwaita-qt is KDE/QT theme styled to make Qt applications look like
+they belong in GNOME Shell.  This is useful for achieveing a uniform
+look between QT and GTK-2.0/3.0 apps.  Adwaita is the default GTK 2.0
+and 3.0 theme in Slackware; this package only installs the QT4 theme.
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
diff --git a/desktop/adwaita-qt/adwaita-qt.info b/desktop/adwaita-qt/adwaita-qt.info
index 2d1be4df5168f..cd2bdb968f45f 100644
--- a/desktop/adwaita-qt/adwaita-qt.info
+++ b/desktop/adwaita-qt/adwaita-qt.info
@@ -1,8 +1,8 @@
 PRGNAM="adwaita-qt"
-VERSION="1.0"
+VERSION="1.3.1"
 HOMEPAGE="https://github.com/MartinBriza/adwaita-qt"
-DOWNLOAD="https://github.com/MartinBriza/adwaita-qt/archive/1.0/adwaita-qt-1.0.tar.gz"
-MD5SUM="0a3fc451fb2cd75a72aef8ae65b8515c"
+DOWNLOAD="https://github.com/MartinBriza/adwaita-qt/archive/1.3.1/adwaita-qt-1.3.1.tar.gz"
+MD5SUM="d9b598d33cbe7f5c04b9bc296a1b4691"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""