3 files changed, 29 insertions, 16 deletions
diff --git a/source/l/glibmm/glibmm.SlackBuild b/source/l/glibmm/glibmm.SlackBuild
index aa1432bb..51a5abe9 100755
--- a/source/l/glibmm/glibmm.SlackBuild
+++ b/source/l/glibmm/glibmm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2015, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2015, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -74,22 +74,27 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=c++11" \
-  ./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/libexec \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --includedir=/usr/include \
+  --datadir=/usr/share \
+  --mandir=/usr/man \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --enable-static=no \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+  --buildtype=release \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -107,6 +112,14 @@ if [ -r ChangeLog ]; then
   touch -r ChangeLog $DOCSDIR/ChangeLog
 fi
 
+# If there's a NEWS file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r NEWS ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat NEWS | head -n 1000 > $DOCSDIR/NEWS
+  touch -r NEWS $DOCSDIR/NEWS
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/qt/slack-desc b/source/l/qt/slack-desc
index 955b3af1..f8051460 100644
--- a/source/l/qt/slack-desc
+++ b/source/l/qt/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
   |-----handy-ruler------------------------------------------------------|
-qt: qt (a multi-platform C++ graphical user interface toolkit)
+qt: qt (a C++ graphical user interface toolkit)
 qt:
 qt: Qt is a complete and well-developed object-oriented framework for
 qt: developing graphical user interface (GUI) applications using C++.
diff --git a/source/l/qt5/slack-desc b/source/l/qt5/slack-desc
index d9b24602..9dbcba20 100644
--- a/source/l/qt5/slack-desc
+++ b/source/l/qt5/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-qt5: qt5 (a multi-platform C++ graphical user interface toolkit)
+qt5: qt5 (a C++ graphical user interface toolkit)
 qt5:
 qt5: Qt is a complete and well-developed object-oriented framework for
 qt5: developing graphical user interface (GUI) applications using C++.