From e78098c34f61a4c23ce486650df2cea66de75d17 Mon Sep 17 00:00:00 2001 From: Alexey Minnekhanov Date: Mon, 24 Oct 2022 12:51:40 +0300 Subject: [PATCH] main/postmarketos-ui-fbkeyboard: fix dejavu font path (MR 3582) Alpine has changed location and package name of ttf-dejavu fonts, adjust to new location. Without this, fbkeyboard service crashes with error: unable to load font file: No such file or directory Default font path is hardcoded [1] to "/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf". Luckily there is a CLI switch to change default, use it. [1] https://github.com/bakonyiferenc/fbkeyboard/blob/master/fbkeyboard.c#L37 --- main/postmarketos-ui-fbkeyboard/APKBUILD | 8 +++++--- main/postmarketos-ui-fbkeyboard/fbkeyboard.init | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/main/postmarketos-ui-fbkeyboard/APKBUILD b/main/postmarketos-ui-fbkeyboard/APKBUILD index 30ccea8c6..9f429976a 100644 --- a/main/postmarketos-ui-fbkeyboard/APKBUILD +++ b/main/postmarketos-ui-fbkeyboard/APKBUILD @@ -1,8 +1,8 @@ # Reference: https://postmarketos.org/uipkg # Maintainer: Ferenc Bakonyi pkgname=postmarketos-ui-fbkeyboard -pkgver=1 -pkgrel=6 +pkgver=2 +pkgrel=0 pkgdesc="Plain framebuffer console with touchscreen keyboard support" url="https://github.com/bakonyiferenc/fbkeyboard" arch="all" @@ -26,4 +26,6 @@ package() { install -Dm755 "$srcdir"/fbkeyboard.init "$pkgdir"/etc/init.d/fbkeyboard } -sha512sums="1341e2a4ba9187f2538f210c3c4bcd8e2e79341552391b3ce57fb2f0d9a8c99a4d7c182d82d2d8f73caea22ace25530fe42e6b16040e8aa7dc62b4e96a5db81d fbkeyboard.init" +sha512sums=" +db617546a5d8de1307e3b45bd3dbf07b62f0b6f2cb25b486dd0c46533d21af0cd6e7c97ade3074f57d982922ad148344909096803df9faa56be00b348c53c8c5 fbkeyboard.init +" diff --git a/main/postmarketos-ui-fbkeyboard/fbkeyboard.init b/main/postmarketos-ui-fbkeyboard/fbkeyboard.init index 01dc7cea0..abbc4b855 100644 --- a/main/postmarketos-ui-fbkeyboard/fbkeyboard.init +++ b/main/postmarketos-ui-fbkeyboard/fbkeyboard.init @@ -2,7 +2,7 @@ name="fbkeyboard" command="/usr/bin/fbkeyboard" -command_args="-r $(cat /sys/class/graphics/fbcon/rotate)" +command_args="-r $(cat /sys/class/graphics/fbcon/rotate) -f /usr/share/fonts/dejavu/DejaVuSans.ttf" pidfile="/var/run/fbkeyboard.pid" command_background=true