3 files changed, 31 insertions, 9 deletions
diff --git a/system/gnu-unifont/README b/system/gnu-unifont/README
index 1e4ed63f18..1e7e3058f1 100644
--- a/system/gnu-unifont/README
+++ b/system/gnu-unifont/README
@@ -3,9 +3,20 @@ 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.
 
-This package installs precompiled fonts only.
+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 TTF (TrueType), PCF (X Window bitmap)
-and PSF (console) fonts. This can be changed using FONTFORMATS environment
-variable. Its default value is "ttf,pcf,psf". For example, setting
-FONTFORMATS=pcf,psf will include only PCF and PSF fonts.
+Available formats are:
+
+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.
+
+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.
diff --git a/system/gnu-unifont/gnu-unifont.SlackBuild b/system/gnu-unifont/gnu-unifont.SlackBuild
index 8fb1ec918f..ad05b4f6d3 100644
--- a/system/gnu-unifont/gnu-unifont.SlackBuild
+++ b/system/gnu-unifont/gnu-unifont.SlackBuild
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnu-unifont
-VERSION=${VERSION:-13.0.03}
+VERSION=${VERSION:-13.0.04}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -85,6 +85,17 @@ if contains "$FONTFORMATS" "psf"; then
     FONTSCOPIED=1
 fi
 
+if contains "$FONTFORMATS" "otb"; then
+    mkdir -p $PKG/usr/share/fonts/misc
+    for pcf_file in *.pcf.gz; do
+        echo "Converting '$pcf_file' to OTB format."
+        otb_file=$(echo "$pcf_file" | sed 's/\.pcf\.gz$/.otb/g')
+        fonttosfnt -o "$PKG/usr/share/fonts/misc/$otb_file" "$pcf_file"
+    done
+
+    FONTSCOPIED=1
+fi
+
 cd -
 
 if [ "$FONTSCOPIED" -eq 0 ]; then
diff --git a/system/gnu-unifont/gnu-unifont.info b/system/gnu-unifont/gnu-unifont.info
index 170cfc9bcc..91ca0c0843 100644
--- a/system/gnu-unifont/gnu-unifont.info
+++ b/system/gnu-unifont/gnu-unifont.info
@@ -1,8 +1,8 @@
 PRGNAM="gnu-unifont"
-VERSION="13.0.03"
+VERSION="13.0.04"
 HOMEPAGE="http://unifoundry.com/unifont/index.html"
-DOWNLOAD="https://ftpmirror.gnu.org/unifont/unifont-13.0.03/unifont-13.0.03.tar.gz"
-MD5SUM="ea585627fce8b5d798161403fbfaef06"
+DOWNLOAD="https://ftpmirror.gnu.org/unifont/unifont-13.0.04/unifont-13.0.04.tar.gz"
+MD5SUM="0b86fbd15a46bab3373c502bd94d93ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""