From 797fa6b64490081da4f2930c15c62d8438ec9dba Mon Sep 17 00:00:00 2001
From: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Date: Sun, 21 Jun 2020 18:40:53 +0100
Subject: [PATCH] xap/fontforge:  Upgraded to fontforge-20200314.

---
 .../fontforge-20190801.tar.gz.sha256          |  1 -
 .../fontforge-20200314.tar.xz.sha256          |  1 +
 xap/fontforge/fontforge.SlackBuild            | 39 +++++++++++--------
 3 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100644 xap/fontforge/fontforge-20190801.tar.gz.sha256
 create mode 100644 xap/fontforge/fontforge-20200314.tar.xz.sha256

diff --git a/xap/fontforge/fontforge-20190801.tar.gz.sha256 b/xap/fontforge/fontforge-20190801.tar.gz.sha256
deleted file mode 100644
index 0e57afc6..00000000
--- a/xap/fontforge/fontforge-20190801.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-d92075ca783c97dc68433b1ed629b9054a4b4c74ac64c54ced7f691540f70852  fontforge-20190801.tar.gz
diff --git a/xap/fontforge/fontforge-20200314.tar.xz.sha256 b/xap/fontforge/fontforge-20200314.tar.xz.sha256
new file mode 100644
index 00000000..bcc0f04c
--- /dev/null
+++ b/xap/fontforge/fontforge-20200314.tar.xz.sha256
@@ -0,0 +1 @@
+cd190b237353dc3f48ddca7b0b3439da8ec4fcf27911d14cc1ccc76c1a47c861  fontforge-20200314.tar.xz
diff --git a/xap/fontforge/fontforge.SlackBuild b/xap/fontforge/fontforge.SlackBuild
index 3dc0bc75..e1f5c0a3 100755
--- a/xap/fontforge/fontforge.SlackBuild
+++ b/xap/fontforge/fontforge.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Build script for Slackware
-# Copyright (C) 2008-2013,2015,2016,2019 Damien Goutte-Gattat
+# Copyright (C) 2008-2013,2015,2016,2019,2020 Damien Goutte-Gattat
 #
 # Redistribution and use of this script, with or without modifications,
 # is permitted provided that the following conditions are met:
@@ -27,8 +27,8 @@
 
 # Source package infos
 NAMESRC=${NAMESRC:-fontforge}
-VERSION=${VERSION:-20190801}
-ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
+VERSION=${VERSION:-20200314}
+ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.xz}
 WGET=${WGET:-https://github.com/fontforge/fontforge/releases/download/$VERSION/$ARCHIVE}
 
 # Build infos
@@ -84,26 +84,33 @@ cd $TMP
 echo "Building $ARCHIVE..."
 tar xf $CWD/$ARCHIVE
 cd $NAME
+mkdir build && cd build
 CFLAGS=$CPUOPT \
 CXXFLAGS=$CPUOPT \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib$LIBDIRSUFFIX \
-  --mandir=/usr/man \
-  --disable-static \
-  --enable-python-scripting=3 \
-  --enable-gdk=yes \
-  --without-libuninameslist \
-  --disable-dependency-tracking \
-  --build=$ARCH-slackware-linux
-make -j $JOBS
-make install-strip DESTDIR=$PKG docdir=/usr/doc/$NAMEPKG-$VERSION/html
+cmake -GNinja \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_MANDIR=/usr/man \
+  -DENABLE_FONTFORGE_EXTRAS=ON \
+  -DENABLE_LIBSPIRO=OFF \
+  -DENABLE_LIBUNINAMESLIST=OFF \
+  -DENABLE_DOCS=OFF \
+  ..
+ninja -j $JOBS
+DESTDIR=$PKG ninja install
+cd ..
+
+# Strip binaries
+find $PKG | xargs file | grep "ELF \(32\|64\)-bit LSB" | cut -d : -f 1 | \
+  xargs strip --strip-unneeded 2> /dev/null
 
 # Compress man pages
 find $PKG/usr/man -type f -exec gzip -9 '{}' \;
 
 # Install the documentation
-install -m 644 AUTHORS COPYING.gplv3 LICENSE $PKG/usr/doc/$NAMEPKG-$VERSION
+mkdir -p $PKG/usr/doc/$NAMEPKG-$VERSION
+install -m 644 AUTHORS CONTRIBUTING.md COPYING.gplv3 LICENSE README.md \
+  $PKG/usr/doc/$NAMEPKG-$VERSION
 
 # Copy slack-desc and file doinst.sh files
 install -D -m 644 $CWD/slack-desc $PKG/install/slack-desc