graphics/fontforge: Updated for version 20170731.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 28 insertions, 14 deletions

diff --git a/graphics/fontforge/README b/graphics/fontforge/README
index a5e9a0cbdf..441d7b41f3 100644
--- a/graphics/fontforge/README
+++ b/graphics/fontforge/README
@@ -1,11 +1,11 @@
-FontForge is an outline font editor that lets you create your own postscript, 
-truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap (bdf, FON, 
-NFNT) fonts, or edit existing ones. It also lets you convert one format to 
+FontForge is an outline font editor that lets you create your own postscript,
+truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap (bdf, FON,
+NFNT) fonts, or edit existing ones. It also lets you convert one format to
 another. FontForge has support for many Macintosh font formats.
 
-You can specify an alternate version of freetype on the command line when 
+You can specify an alternate version of freetype on the command line when
 running the script with e.g.   FREETYPE=2.4.5 ./fontforge.SlackBuild
-but you will need to manually place that freetype tarball in the slackbuild 
+but you will need to manually place that freetype tarball in the slackbuild
 directory.
 
 NOTE: please remove previous version before building new version.
diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild
index 7e4df26c90..c098553cd2 100644
--- a/graphics/fontforge/fontforge.SlackBuild
+++ b/graphics/fontforge/fontforge.SlackBuild
@@ -25,16 +25,18 @@
 # Currently maintained by David Woodfall <dave@dawoodfall.net>
 
 PRGNAM=fontforge
-VERSION=${VERSION:-20150824}
+VERSION=${VERSION:-20170731}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ENABLE_BCINT=${ENABLE_BCINT:-yes}
 FREETYPE=${FREETYPE:-"2.6.3"}
+GNULIB=${GNULIB:-"20140202"}
+UTHASH=${UTHASH:-"1.9.9"}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +47,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -70,6 +72,14 @@ tar xvf $CWD/freetype-$FREETYPE.tar.xz
 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/uthash-$UTHASH.tar.gz
+mv gnulib-${GNULIB}-stable gnulib
+mv uthash-$UTHASH uthash
+chown -R root:root gnulib uthash
+chmod -R u+w,go+r-w,a-s gnulib uthash
+
+./bootstrap
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/graphics/fontforge/fontforge.info b/graphics/fontforge/fontforge.info
index 5d457341ea..94b61108fc 100644
--- a/graphics/fontforge/fontforge.info
+++ b/graphics/fontforge/fontforge.info
@@ -1,12 +1,16 @@
 PRGNAM="fontforge"
-VERSION="20150824"
+VERSION="20170731"
 HOMEPAGE="http://fontforge.sourceforge.net/"
-DOWNLOAD="https://github.com/fontforge/fontforge/releases/download/20150824/fontforge-20150824.tar.gz \
+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"
-MD5SUM="74c49c73822d642b0511718d8eeb2210 \
+          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="b6d3a357856ebb9944a32a85c13443cb \
         063691163e592515b31514515bb3ce8c \
-        c806890db47d8ad8887253a926377e33"
+        c806890db47d8ad8887253a926377e33 \
+        5fc03f07046c2349449db963602b9522 \
+        c3ce9197c818dcb7ca85b59912f310a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""