terminus-font 4.47

[skip-ci]

terminus-font/PKGBUILD

@@ -2,30 +2,44 @@
 # contributions from Arch: https://www.archlinux.org/packages/community/any/terminus-font/
 
 pkgname=terminus-font
-pkgver=4.38
-pkgrel=2
+pkgver=4.47
+pkgrel=1
 pkgdesc="A superb, monospace bitmap font (for X11 and console)"
 depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
+makedepends=('xorg-bdftopcf' 'xorg-mkfontscale' 'xorg-mkfontdir' 'python3')
 arch=('x86_64')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz")
-url="http://sourceforge.net/projects/terminus-font/"
-license=('GPL-2')
-md5sums=('a8e792fe6e84c86ed2b6ed3e2a12ba66')
+source=("https://downloads.sourceforge.net/project/terminus-font/terminus-font-$pkgver/terminus-font-$pkgver.tar.gz"
+        fix-75-yes-terminus.patch)
 
-build() { 
-  cd "${srcdir}/${pkgname}-${pkgver}"
+sha256sums=('0f1b205888e4e26a94878f746b8566a65c3e3742b33cf9a4e6517646d5651297'
+            'ddd86485cf6d54e020e36f1c38c56e8b21b57c23a5d76250e15c1d16fed9caa5')
 
-  sh ./configure --prefix=/usr \
-              --x11dir=/usr/share/fonts/local \
-              --psfdir=/usr/share/kbd/consolefonts
+prepare() {
+  cd "terminus-font-$pkgver"
+
+  chmod +x configure
+  patch -p1 <"$srcdir"/fix-75-yes-terminus.patch
+}
+
+build() {
+  cd "terminus-font-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --x11dir=/usr/share/fonts/misc \
+    --psfdir=/usr/share/kbd/consolefonts
   make
 }
 
 package() {
-  make -C "${pkgname}-${pkgver}" DESTDIR="${pkgdir}" install
+  make -C "terminus-font-$pkgver" DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/terminus-font-$pkgver/75-yes-terminus.conf" \
+    "$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf"
+  install -Dm644 "$srcdir/terminus-font-$pkgver/OFL.TXT" \
+    "$pkgdir/usr/share/licenses/terminus-font/LICENSE"
+  install -d "$pkgdir/etc/fonts/conf.d"
 
-  install -Dm644 "$srcdir/$pkgname-$pkgver/75-yes-terminus.conf" \
-                 "$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf"
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/OFL.TXT" \
-                 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd "$pkgdir/etc/fonts/conf.d"
+  ln -s ../conf.avail/75-yes-terminus.conf .
 }

terminus-font/fix-75-yes-terminus.patch

+--- a/75-yes-terminus.conf	2019-01-01 19:32:47.000000000 +0100
++++ b/75-yes-terminus.conf	2019-01-01 19:41:28.323308293 +0100
+@@ -5,7 +5,7 @@
+  <selectfont>
+   <acceptfont>
+    <pattern>
+-     <patelt name="family"><string>Terminus</string></patelt>
++     <patelt name="family"><string>xos4 Terminus</string></patelt>
+    </pattern>
+   </acceptfont>
+  </selectfont>