3 files changed, 50 insertions, 27 deletions
diff --git a/system/d-feet/d-feet.SlackBuild b/system/d-feet/d-feet.SlackBuild
index b0da3a0878..c2fe7e4e0a 100644
--- a/system/d-feet/d-feet.SlackBuild
+++ b/system/d-feet/d-feet.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for d-feet
 
-# Copyright 2010,2016,2017  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2010-2021  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add glib-compile-schemas to doinst.sh.
+# - use relative symlinks in /usr/share/help.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=d-feet
-VERSION=${VERSION:-0.3.11}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.3.15}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,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}
@@ -65,29 +76,36 @@ 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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-tests \
-  --build=$ARCH-slackware-linux
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --infodir=/usr/info \
+    --buildtype=release \
+    -Dstrip=true \
+    -Dtests=false
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
-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
+# 20220409 bkw: absolute symlinks suck.
+for i in $PKG/usr/share/help/??/$PRGNAM/figures; do
+  rm -f $i/icon.png
+  ln -s ../../../C/$PRGNAM/figures/icon.png $i/icon.png
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING HACKING NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -95,4 +113,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/d-feet/d-feet.info b/system/d-feet/d-feet.info
index d9756d1dc3..635aff86d6 100644
--- a/system/d-feet/d-feet.info
+++ b/system/d-feet/d-feet.info
@@ -1,8 +1,8 @@
 PRGNAM="d-feet"
-VERSION="0.3.11"
+VERSION="0.3.15"
 HOMEPAGE="http://live.gnome.org/DFeet/"
-DOWNLOAD="http://download.gnome.org/sources/d-feet/0.3/d-feet-0.3.11.tar.xz"
-MD5SUM="a31834a127892692061732f4b09da64c"
+DOWNLOAD="https://download.gnome.org/sources/d-feet/0.3/d-feet-0.3.15.tar.xz"
+MD5SUM="44f046c5c35256f346db516dab3f938a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/d-feet/doinst.sh b/system/d-feet/doinst.sh
index 4a25de5e6f..401d987795 100644
--- a/system/d-feet/doinst.sh
+++ b/system/d-feet/doinst.sh
@@ -8,3 +8,8 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   fi
 fi
 
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi