1 files changed, 7 insertions, 9 deletions
diff --git a/system/ft2demos/ft2demos.SlackBuild b/system/ft2demos/ft2demos.SlackBuild
index 16cfbb74038e6..dc0be0feb8251 100644
--- a/system/ft2demos/ft2demos.SlackBuild
+++ b/system/ft2demos/ft2demos.SlackBuild
@@ -16,10 +16,12 @@
 
 # Note to self: keep VERSION in sync with Pat's patches/freetype.
 
+# 20211208 bkw: updated for v2.11.1.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ft2demos
-VERSION=${VERSION:-2.6.3}
+VERSION=${VERSION:-2.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -34,9 +36,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -69,20 +68,19 @@ rm -rf $PRGNAM-build
 mkdir -p $PRGNAM-build
 cd $PRGNAM-build
 tar xvf $CWD/$LIBNAM-$VERSION.tar.xz
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Build process wants this symlink.
-ln -s $LIBNAM-$VERSION ${LIBNAM}2
+ln -s $LIBNAM-$VERSION ${LIBNAM}
 
 ### First, build FreeType, since ft2demos needs the whole source tree.
 cd $LIBNAM-$VERSION
 
 # Apply Pat's patches
-zcat $CWD/freetype.illadvisederror.diff.gz | patch -p1
-zcat $CWD/freetype.CVE-2017-8287.diff.gz | patch -p1
+zcat $CWD/freetype.subpixel.rendering.diff.gz | patch -p1
 
 # Enable the validators needed by the ftvalid command. Part 1 of a
 # DIRTY_HACK to make ftvalid work.
@@ -149,7 +147,7 @@ strip $PKG/usr/bin/*
 # For whatever reason, the Arch and Debian packages don't install the
 # man pages.
 mkdir -p $PKG/usr/man/man1
-for i in src/*.1; do
+for i in man/*.1; do
   gzip -9c < $i > $PKG/usr/man/man1/$( basename $i).gz
 done