From a551fa5850a6745b938c2a891fe92982b0d8d03a Mon Sep 17 00:00:00 2001
From: Dugan Chen <thedoogster [at] gmail [dot] com>
Date: Sun, 13 Nov 2016 18:34:14 +0000
Subject: system/webcore-fonts: Updated for version 3.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 system/webcore-fonts/README                   | 10 +++++++++-
 system/webcore-fonts/webcore-fonts.SlackBuild | 13 +++++++++++--
 system/webcore-fonts/webcore-fonts.info       |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'system/webcore-fonts')

diff --git a/system/webcore-fonts/README b/system/webcore-fonts/README
index cba378e558..1537f1eb0a 100644
--- a/system/webcore-fonts/README
+++ b/system/webcore-fonts/README
@@ -5,11 +5,19 @@ The Webcore Fonts package contains:
 * Microsoft's new fonts for Windows Vista
 * Lucida Console
 
-Before installing these, please remove "/etc/fonts/conf.d/60-liberation.conf".
+Before installing these, please remove the following file:
+
+	/etc/fonts/conf.d/60-liberation.conf".
+
 That file causes Slackware to display Liberation fonts in the place of
 Microsoft fonts. If you have Microsoft fonts, you don't need the
 substitutions.
 
+FontForge is an optional dependency. The distribution includes the Cambria
+font as a .TTC file consisting of two fonts: cambria.ttf and cambria-math.ttf.
+If FontForge is available, then the Cambria font will be installed as these two
+TTF files. If not, then it will be installed as a single TTC file.
+
 The following Fontconfig setting (taken from infinality.net) is recommended.
 Put it in /etc/fonts/local.conf:
 
diff --git a/system/webcore-fonts/webcore-fonts.SlackBuild b/system/webcore-fonts/webcore-fonts.SlackBuild
index 575d7639f2..2af1637fa7 100644
--- a/system/webcore-fonts/webcore-fonts.SlackBuild
+++ b/system/webcore-fonts/webcore-fonts.SlackBuild
@@ -8,7 +8,7 @@
 PRGNAM=webcore-fonts
 VERSION=${VERSION:-3.0}
 ARCH=noarch
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -21,7 +21,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM
 chown -R root:root .
@@ -31,6 +31,15 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# The Cambria font is a TTC file. If FontForge is available, we use it to split it
+# into two TTFs.
+if type fontforge > /dev/null 2>&1; then
+	fontforge -lang=ff -c 'Open("vista/CAMBRIA.TTC(Cambria)"); \
+		Generate("vista/CAMBRIA.TTF");Close();Open("vista/CAMBRIA.TTC(Cambria Math)"); \
+		Generate("vista/CAMBRIA-MATH.TTF");Close();'
+	rm vista/CAMBRIA.TTC
+fi
+
 mkdir -p $PKG/usr/share/fonts/TTF
 cp fonts/* $PKG/usr/share/fonts/TTF
 cp vista/* $PKG/usr/share/fonts/TTF
diff --git a/system/webcore-fonts/webcore-fonts.info b/system/webcore-fonts/webcore-fonts.info
index cb91eed91b..9b306c1faa 100644
--- a/system/webcore-fonts/webcore-fonts.info
+++ b/system/webcore-fonts/webcore-fonts.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Dugan Chen"
-EMAIL="dugan [underscore] c [at] fastmail [dot] fm"
+EMAIL="thedoogster [at] gmail [dot] com"
-- 
cgit v1.2.3