terminus-font-patched: update terminus, rip boxdraw.diff

terminus-font-patched/PKGBUILD

@@ -17,42 +17,46 @@
 
 pkgname=terminus-font-patched
 _pkgname=terminus-font
-pkgver=4.47
+pkgver=4.49.1
-pkgrel=3
+pkgrel=1
+
 pkgdesc='Monospace bitmap font (for X11 and console)'
+url='http://terminus-font.sourceforge.net/'
 arch=('any')
-url='http://sourceforge.net/projects/terminus-font/'
 license=('GPL2' 'custom:OFL')
-makedepends=('xorg-bdftopcf' 'fontconfig' 'xorg-mkfontscale' 'xorg-mkfontdir' 'python3')
+makedepends=('xorg-bdftopcf' 'python')
-optdepends=('xorg-fonts-alias')
-depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
-install='terminus-font-patched.install'
-source=("http://downloads.sourceforge.net/project/$_pkgname/$_pkgname-$pkgver/$_pkgname-$pkgver.tar.gz"
-        'boxdraw.diff')
 provides=($_pkgname)
 conflicts=($_pkgname)
-sha256sums=('0f1b205888e4e26a94878f746b8566a65c3e3742b33cf9a4e6517646d5651297'
+install='terminus-font-patched.install'
-            'e247c997ef9dc135cdd3ed84b2cbdeb9c47b6bb9f951dff9aa9cb1661f30b0d6')
+source=("http://downloads.sourceforge.net/project/$_pkgname/$_pkgname-${pkgver%.1}/$_pkgname-$pkgver.tar.gz"
+        fix-75-yes-terminus.patch)
+sha256sums=('d961c1b781627bf417f9b340693d64fc219e0113ad3a3af1a3424c7aa373ef79'
+            'ddd86485cf6d54e020e36f1c38c56e8b21b57c23a5d76250e15c1d16fed9caa5')
 
 prepare() {
-  chmod +x "$_pkgname-$pkgver/configure"
+  cd "terminus-font-$pkgver"
+  patch -p1 <"$srcdir"/fix-75-yes-terminus.patch
 }
 
 build() {
   cd "$_pkgname-$pkgver"
+
   patch -p0 -i alt/br1.diff
   patch -p0 -i alt/dv1.diff
   patch -p0 -i alt/ij1.diff
   patch -p0 -i alt/ll2.diff
   patch -p0 -i alt/td1.diff
-  patch -p1 -i ../boxdraw.diff
+
-  ./configure --prefix=/usr --x11dir=/usr/share/fonts/misc \
+  ./configure \
+    --prefix=/usr \
+    --x11dir=/usr/share/fonts/misc \
+    --otbdir=/usr/share/fonts/misc \
     --psfdir=/usr/share/kbd/consolefonts
-  make
+  make all otb
 }
 
 package() {
-  make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install
+  make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install install-otb
 
   install -Dm644 "$srcdir/$_pkgname-$pkgver/75-yes-terminus.conf" \
     "$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf"

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

@@ -0,0 +1,11 @@
+--- 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>