3 files changed, 22 insertions, 5 deletions
diff --git a/audio/guitarix/doinst.sh b/audio/guitarix/doinst.sh
index 65c7e2eeb9..8db197337e 100644
--- a/audio/guitarix/doinst.sh
+++ b/audio/guitarix/doinst.sh
@@ -7,3 +7,7 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f usr/share/fonts/TTF
+fi
diff --git a/audio/guitarix/guitarix.SlackBuild b/audio/guitarix/guitarix.SlackBuild
index 7e4018c173..bf682a7d2d 100644
--- a/audio/guitarix/guitarix.SlackBuild
+++ b/audio/guitarix/guitarix.SlackBuild
@@ -6,6 +6,10 @@
 # Modified by B. Watson <yalhcru@gmail.com>. Modified version released
 # under the WTFPL, for details see http://www.wtfpl.net/txt/copying/
 
+# 20170825 bkw:
+# - Updated for 0.35.6
+# - Install the bundled roboto font.
+
 # 20170725 bkw:
 # - Updated for 0.35.5
 
@@ -87,7 +91,7 @@
 # - Add guitarix's README to /usr/doc
 
 PRGNAM=guitarix
-VERSION=${VERSION:-0.35.5}
+VERSION=${VERSION:-0.35.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -137,15 +141,20 @@ 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 {} \+
 
+# guitarix wants to install the roboto font in the wrong place for
+# slackware.
+sed -i '/fonts/s,\<truetype\>,TTF,' wscript tools/undiag
+
 # this is no longer documented in README, but still here for debugging.
 if [ "${LV2:-yes}" = "no" ]; then
   LV2OPT=--no-lv2
 fi
 
+# grrr, -DNDEBUG doesn't get added to the flags automatically...
 LIBDIR="/usr/lib${LIBDIRSUFFIX}"
 ./waf configure \
   --prefix=/usr \
-  --cxxflags-release="$SLKCFLAGS" \
+  --cxxflags-release="$SLKCFLAGS -DNDEBUG" \
   --ladspadir="$LIBDIR/ladspa/" \
   --lv2dir="$LIBDIR/lv2/" \
   --libdir="$LIBDIR" \
@@ -157,6 +166,10 @@ LIBDIR="/usr/lib${LIBDIRSUFFIX}"
 ./waf build # -v # verbose, shows actual commands
 ./waf install --destdir=$PKG
 
+# --install-roboto-font does the wrong thing, we'll install it manually.
+mkdir -p $PKG/usr/share/fonts/TTF
+install -m0644 fonts/* $PKG/usr/share/fonts/TTF
+
 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
 
diff --git a/audio/guitarix/guitarix.info b/audio/guitarix/guitarix.info
index 564017cf14..14d856ec24 100644
--- a/audio/guitarix/guitarix.info
+++ b/audio/guitarix/guitarix.info
@@ -1,8 +1,8 @@
 PRGNAM="guitarix"
-VERSION="0.35.5"
+VERSION="0.35.6"
 HOMEPAGE="http://guitarix.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/guitarix/guitarix2-0.35.5.tar.xz"
-MD5SUM="945ce769b2338c0fc7422f485282e91e"
+DOWNLOAD="http://downloads.sourceforge.net/guitarix/guitarix2-0.35.6.tar.xz"
+MD5SUM="d9856cd84d2e1de62adbbda9fada9570"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack-audio-connection-kit liblrdf lilv"