From a31c4baf07db2082d964ed3f6157d01f08557183 Mon Sep 17 00:00:00 2001
From: Dave Woodfall <dave@tty1.uk>
Date: Wed, 10 Apr 2019 06:35:10 +0100
Subject: graphics/fontforge: Update to 20190317

---
 graphics/fontforge/fontforge.SlackBuild | 19 ++++++++++---------
 graphics/fontforge/fontforge.info       | 24 ++++++++++++------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild
index c098553cd2..0c4e2a6ebc 100644
--- a/graphics/fontforge/fontforge.SlackBuild
+++ b/graphics/fontforge/fontforge.SlackBuild
@@ -22,17 +22,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Currently maintained by David Woodfall <dave@dawoodfall.net>
+# Currently maintained by David Woodfall <dave@tty1.uk>
 
 PRGNAM=fontforge
-VERSION=${VERSION:-20170731}
+VERSION=${VERSION:-20190317}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ENABLE_BCINT=${ENABLE_BCINT:-yes}
-FREETYPE=${FREETYPE:-"2.6.3"}
-GNULIB=${GNULIB:-"20140202"}
-UTHASH=${UTHASH:-"1.9.9"}
+#FREETYPE=${FREETYPE:-2.6.3}
+FREETYPE=${FREETYPE:-2.10.0}
+GNULIB=${GNULIB:-20180621~6979c25}
+UTHASH=${UTHASH:-2.1.0}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -68,18 +69,18 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION freetype-$FREETYPE
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-tar xvf $CWD/freetype-$FREETYPE.tar.xz
+tar xvf $CWD/freetype-$FREETYPE.tar.?z
 chown -R root:root $PRGNAM-$VERSION freetype-$FREETYPE
 chmod -R u+w,go+r-w,a-s $PRGNAM-$VERSION freetype-$FREETYPE
 cd $PRGNAM-$VERSION
-tar xvf $CWD/gnulib_$GNULIB+stable.orig.tar.gz
+tar xvf $CWD/gnulib_$GNULIB.orig.tar.gz
 tar xvf $CWD/uthash-$UTHASH.tar.gz
-mv gnulib-${GNULIB}-stable gnulib
+mv gnulib-6979c25 gnulib
 mv uthash-$UTHASH uthash
 chown -R root:root gnulib uthash
 chmod -R u+w,go+r-w,a-s gnulib uthash
 
-./bootstrap
+./bootstrap -f
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/graphics/fontforge/fontforge.info b/graphics/fontforge/fontforge.info
index 1001cdeb72..6bc646ca78 100644
--- a/graphics/fontforge/fontforge.info
+++ b/graphics/fontforge/fontforge.info
@@ -1,18 +1,18 @@
 PRGNAM="fontforge"
-VERSION="20170731"
+VERSION="20190317"
 HOMEPAGE="http://fontforge.sourceforge.net/"
-DOWNLOAD="https://github.com/fontforge/fontforge/archive/20170731/fontforge-20170731.tar.gz \
-          http://fontforge.sf.net/cidmaps.tgz \
-          http://mirrors.slackware.com/slackware/slackware-14.2/source/l/freetype/freetype-2.6.3.tar.xz \
-          http://http.debian.net/debian/pool/main/g/gnulib/gnulib_20140202+stable.orig.tar.gz \
-          https://github.com/troydhanson/uthash/archive/v1.9.9/uthash-1.9.9.tar.gz"
-MD5SUM="bb900084aa890eca7cc216e740091b0b \
+DOWNLOAD="https://github.com/fontforge/fontforge/archive/20190317/fontforge-20190317.tar.gz \
+          http://unrealize.co.uk/source/cidmaps.tgz \
+          http://mirrors.slackware.com/slackware/slackware-current/source/l/freetype/freetype-2.10.0.tar.lz \
+          http://http.debian.net/debian/pool/main/g/gnulib/gnulib_20180621~6979c25.orig.tar.gz \
+          https://github.com/troydhanson/uthash/archive/v2.1.0/uthash-2.1.0.tar.gz"
+MD5SUM="e461181fb446b90b96fcb773da6d87ce \
         063691163e592515b31514515bb3ce8c \
-        c806890db47d8ad8887253a926377e33 \
-        5fc03f07046c2349449db963602b9522 \
-        c3ce9197c818dcb7ca85b59912f310a4"
+        e145b2905dc11c118df75d908d8896d6 \
+        508cba1d9bf589eefe2979a21a41e80e \
+        4d0a33f6393260926032f1fad4bad39a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
-EMAIL="dave@dawoodfall.net"
+MAINTAINER="Dave Woodfall"
+EMAIL="dave@tty1.uk"
-- 
cgit v1.2.3