Subject: [PATCH 2/2] v2 main/terminus-font: Add pango >=1.44 support

From: VÖRÖSKŐI András <[email-masked]>
Date: Fri, 27 Mar 2020 06:27:55 +0100

Pango dropped FreeType support for HarfBuzz, which do not support bdf/pcf fonts.
Use fonttosfnt to convert pcf font files to OpenType bitmap fonts.

remove empty variables
remove manual return values
---
 main/terminus-font/APKBUILD | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/main/terminus-font/APKBUILD b/main/terminus-font/APKBUILD
index 5ef3a264aa..24e56c062c 100644
--- a/main/terminus-font/APKBUILD
+++ b/main/terminus-font/APKBUILD
@@ -3,16 +3,13 @@
 # Maintainer: Sören Tempel <[email-masked]>
 pkgname=terminus-font
 pkgver=4.48
-pkgrel=0
+pkgrel=1
 pkgdesc="Monospace bitmap font (for X11 and console)"
 url="http://terminus-font.sourceforge.net/"
 arch="noarch"
 license="custom"
-depends=""
-depends_dev=""
-makedepends="bdftopcf fontconfig mkfontscale mkfontdir python3"
+makedepends="bdftopcf fontconfig mkfontscale mkfontdir python3 fonttosfnt"
 options="!check"
-install=""
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz"
 
@@ -31,12 +28,11 @@ package() {
 		prefix=/usr \
 		x11dir=/usr/share/fonts/misc \
 		psfdir=/usr/share/consolefonts \
-		DESTDIR="$pkgdir" install \
-		|| return 1
+		DESTDIR="$pkgdir" install
 
 	install -d "$pkgdir"/usr/share/doc/$pkgname
 	install -Dm655 README README-BG \
-		"$pkgdir"/usr/share/doc/$pkgname/ || return 1
+		"$pkgdir"/usr/share/doc/$pkgname/
 
 	install -Dm644 75-yes-terminus.conf \
 		"$pkgdir"/etc/fonts/conf.avail/75-yes-terminus.conf
@@ -45,7 +41,11 @@ package() {
 
 	install -d "$pkgdir/etc/fonts/conf.d"
 	cd "$pkgdir/etc/fonts/conf.d"
-	ln -s ../conf.avail/75-yes-terminus.conf . || return 1
+	ln -s ../conf.avail/75-yes-terminus.conf .
+
+	fonttosfnt -b -c -o $pkgdir/usr/share/fonts/misc/terminus-n.otb $pkgdir/usr/share/fonts/misc/ter-*n.pcf.gz
+	fonttosfnt -b -c -o $pkgdir/usr/share/fonts/misc/terminus-b.otb $pkgdir/usr/share/fonts/misc/ter-*b.pcf.gz
+	rm $pkgdir/usr/share/fonts/misc/ter-*.pcf.gz
 }
 
 sha512sums="5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4  terminus-font-4.48.tar.gz"
-- 
2.24.1