system/ft2demos: Updated for version 2.11.1.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 14 insertions, 18 deletions

diff --git a/system/ft2demos/ft2demos.SlackBuild b/system/ft2demos/ft2demos.SlackBuild
index 16cfbb7403..dc0be0feb8 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
 
diff --git a/system/ft2demos/ft2demos.info b/system/ft2demos/ft2demos.info
index 50c3bc2ea5..76ddbecf77 100644
--- a/system/ft2demos/ft2demos.info
+++ b/system/ft2demos/ft2demos.info
@@ -1,14 +1,12 @@
 PRGNAM="ft2demos"
-VERSION="2.6.3"
+VERSION="2.11.1"
 HOMEPAGE="http://www.freetype.org"
-DOWNLOAD="https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-2.6.3.tar.bz2 \
-          https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype-2.6.3.tar.xz \
-          https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype.CVE-2017-8287.diff.gz \
-          https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype.illadvisederror.diff.gz"
-MD5SUM="f7c6102f29834a80456264fe4edd81d1 \
-        c806890db47d8ad8887253a926377e33 \
-        eea2e24cf46314d716d0668f5fdbbf08 \
-        419295091bb684f531c3ba9614fea3a0"
+DOWNLOAD="https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-2.11.1.tar.xz \
+          https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz \
+          https://slackware.uk/~urchlay/src/freetype.subpixel.rendering.diff.gz"
+MD5SUM="9efff227779626d46c3d7334712c15a3 \
+        24e79233d607ded439ef36ff1f3ab68f \
+        2e307a3cab2ef1fc52580e817d857cd2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""