From 0fb858bd223422aa38de53c16a2644da8772f8b9 Mon Sep 17 00:00:00 2001
From: Tomasz Bywalec <t.bywalec@gmail.com>
Date: Sun, 15 May 2022 10:48:56 +0200
Subject: system/gnu-unifont: Updated for version 14.0.03.

Also, replaced TTF with OTF in default formats list (TTF is no longer
default, but still can be included in the package by adding this format
to the FONTFORMATS environment variable when running the script).

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/gnu-unifont/README                 | 17 +++++++++--------
 system/gnu-unifont/doinst.sh              |  1 +
 system/gnu-unifont/gnu-unifont.SlackBuild | 11 +++++++++--
 system/gnu-unifont/gnu-unifont.info       |  6 +++---
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/system/gnu-unifont/README b/system/gnu-unifont/README
index 3c761f9f50..6928b7fe42 100644
--- a/system/gnu-unifont/README
+++ b/system/gnu-unifont/README
@@ -3,21 +3,22 @@ Unicode Basic Multilinguial Plane(BMP). The BMP is the first Unicode
 "plane" of 65,536(16bit) code points, and includes character encoding
 for most of the world's modern scripts.
 
-By default, the package will include precompiled versions of the
-font in TTF (TrueType), PCF (X Window bitmap) and PSF (console)
-formats. This can be changed using FONTFORMATS environment variable,
-which should be set to comma-separated list of font formats to include
-in the package.
+By default, the package will include precompiled versions of the font in OTF
+(OpenType), PCF (X Window bitmap), PSF (console) and OTB (OpenType Bitmap)
+formats. This can be changed using FONTFORMATS environment variable, which
+should be set to comma-separated list of font formats to include in the
+package.
 
 Available formats are:
 
+otf = OpenType
 ttf = TrueType
 pcf = X Window bitmap
 psf = Console fonts
 otb = OpenType Bitmap fonts, compatible with recent versions of Pango
-      which don't support PCF fonts. Fonts in this format are generated
-      by converting precompiled PCF fonts using fonttosfnt tool.
+      which don't support BDF/PCF fonts. Fonts in this format are generated
+      by converting precompiled BDF/PCF fonts using fonttosfnt tool.
 
 For example, setting FONTFORMATS=pcf,psf will include only PCF and
 PSF fonts. If FONTFORMATS variable is not set the default value
-"ttf,pcf,psf" is assumed.
+"otf,pcf,psf,otb" is assumed.
diff --git a/system/gnu-unifont/doinst.sh b/system/gnu-unifont/doinst.sh
index 2822cf238c..47ed4e784f 100644
--- a/system/gnu-unifont/doinst.sh
+++ b/system/gnu-unifont/doinst.sh
@@ -1,6 +1,7 @@
 # Update the X font indexes:
 if [ -x /usr/bin/mkfontdir ]; then
   ( cd /usr/share/fonts/misc ; mkfontscale . ; mkfontdir . )
+  ( cd /usr/share/fonts/OTF ; mkfontscale . ; mkfontdir . )
   ( cd /usr/share/fonts/TTF ; mkfontscale . ; mkfontdir . )
 fi
 
diff --git a/system/gnu-unifont/gnu-unifont.SlackBuild b/system/gnu-unifont/gnu-unifont.SlackBuild
index 4888a8b074..f8e3a29224 100644
--- a/system/gnu-unifont/gnu-unifont.SlackBuild
+++ b/system/gnu-unifont/gnu-unifont.SlackBuild
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gnu-unifont
-VERSION=${VERSION:-14.0.02}
+VERSION=${VERSION:-14.0.03}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -48,7 +48,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 SRCNAM=unifont
 DOCFILES="ChangeLog COPYING INSTALL NEWS README"
-FONTFORMATS=${FONTFORMATS:-ttf,pcf,psf,otb}
+FONTFORMATS=${FONTFORMATS:-otf,pcf,psf,otb}
 
 contains()
 {
@@ -81,6 +81,13 @@ if contains "$FONTFORMATS" "pcf"; then
     FONTSCOPIED=1
 fi
 
+if contains "$FONTFORMATS" "otf"; then
+    mkdir -p $PKG/usr/share/fonts/OTF
+    cp -a *.otf $PKG/usr/share/fonts/OTF
+
+    FONTSCOPIED=1
+fi
+
 if contains "$FONTFORMATS" "ttf"; then
     mkdir -p $PKG/usr/share/fonts/TTF
     cp -a *.ttf $PKG/usr/share/fonts/TTF
diff --git a/system/gnu-unifont/gnu-unifont.info b/system/gnu-unifont/gnu-unifont.info
index fbaf53f823..c5c20912ef 100644
--- a/system/gnu-unifont/gnu-unifont.info
+++ b/system/gnu-unifont/gnu-unifont.info
@@ -1,8 +1,8 @@
 PRGNAM="gnu-unifont"
-VERSION="14.0.02"
+VERSION="14.0.03"
 HOMEPAGE="http://unifoundry.com/unifont/index.html"
-DOWNLOAD="https://ftpmirror.gnu.org/unifont/unifont-14.0.02/unifont-14.0.02.tar.gz"
-MD5SUM="8da4a699c4b90b95a71b7aba02347184"
+DOWNLOAD="https://ftpmirror.gnu.org/unifont/unifont-14.0.03/unifont-14.0.03.tar.gz"
+MD5SUM="dd2e9a7e6b406da75c0c8030a9e2f4db"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3