4 files changed, 59 insertions, 40 deletions
diff --git a/system/font-manager/README b/system/font-manager/README
index a95e34d424..39ced4b145 100644
--- a/system/font-manager/README
+++ b/system/font-manager/README
@@ -1,8 +1,7 @@
 A simple font management application for GTK+ Desktop Environments.
 
-Optional Dependency
+Optional dependency: webkit2gtk, autodetected at build time. This is
+required if you want Google Fonts integration.
 
-For file-roller support, install file-roller and call the SlackBuild
-with FILE_ROLLER=yes, for example
-
-  FILE_ROLLER=yes ./font-manager.SlackBuild
+Optional dependency: file-roller. This is a runtime dependency, not
+required at build time.
diff --git a/system/font-manager/doinst.sh b/system/font-manager/doinst.sh
index f6a6676883..ebb9ce16ff 100644
--- a/system/font-manager/doinst.sh
+++ b/system/font-manager/doinst.sh
@@ -8,3 +8,8 @@ if [ -e usr/share/glib-2.0/schemas ]; then
   fi
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/font-manager/font-manager.SlackBuild b/system/font-manager/font-manager.SlackBuild
index 45f86c4441..aa2ee5f0b8 100644
--- a/system/font-manager/font-manager.SlackBuild
+++ b/system/font-manager/font-manager.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for font-manager
 
@@ -22,10 +22,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - update icon cache in doinst.sh (no script changes).
+
+# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0,
+# by updating to v0.8.8.
+
+# 20220306 bkw: Modified by SlackBuilds.org again: add autodetection
+# for webkit2gtk dependency.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=font-manager
-VERSION=${VERSION:-0.7.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.8.8}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +47,11 @@ 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}
@@ -60,41 +76,40 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 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 {} \+
 
-FILE_ROLLER=${FILE_ROLLER:-no}
-if [ "$FILE_ROLLER" = "yes" ]; then
-  FILE_ROLLER_FLAG="--with-file-roller"
-fi
+WEBKIT=false
+pkg-config --exists webkit2gtk-4.0 && WEBKIT=true
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  $FILE_ROLLER_FLAG \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dthunar=true \
+    -Dwebkit=$WEBKIT \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
+gzip -9 $PKG/usr/man/man*/*
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md CHANGELOG $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -102,4 +117,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/system/font-manager/font-manager.info b/system/font-manager/font-manager.info
index 9d50a8a4fc..65904076ba 100644
--- a/system/font-manager/font-manager.info
+++ b/system/font-manager/font-manager.info
@@ -1,10 +1,10 @@
 PRGNAM="font-manager"
-VERSION="0.7.3"
+VERSION="0.8.8"
 HOMEPAGE="http://fontmanager.github.io/"
-DOWNLOAD="https://github.com/FontManager/master/releases/download/0.7.3/font-manager-0.7.3.tar.bz2"
-MD5SUM="3623327f516100f65a84a04ba1be39c9"
+DOWNLOAD="https://github.com/FontManager/font-manager/releases/download/0.8.8/font-manager-0.8.8.tar.xz"
+MD5SUM="1a898600f7153aa685694bd90c847c9c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="vala json-glib libgee yelp-tools"
+REQUIRES="yelp-tools"
 MAINTAINER="Azure Zanculmarktum"
 EMAIL="zanculmarktum@gmail.com"