[PR PATCH] mkinitcpio: fix consolefont hook

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages mkinitcpio/setfont
https://github.com/void-linux/void-packages/pull/46069

mkinitcpio: fix consolefont hook
draft until upstream merges this

#### Testing the changes
- I tested the changes in this PR: **YES**



A patch file from https://github.com/void-linux/void-packages/pull/46069.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mkinitcpio/setfont-46069.patch --]
[-- Type: text/x-diff, Size: 2102 bytes --]

From 54ed2fffb97f81517730e07d9c258f7053b3682d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 15 Sep 2023 15:52:36 -0400
Subject: [PATCH] mkinitcpio: fix consolefont hook

---
 srcpkgs/mkinitcpio/patches/setfont.patch | 31 ++++++++++++++++++++++++
 srcpkgs/mkinitcpio/template              |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mkinitcpio/patches/setfont.patch

diff --git a/srcpkgs/mkinitcpio/patches/setfont.patch b/srcpkgs/mkinitcpio/patches/setfont.patch
new file mode 100644
index 0000000000000..f4042fc133758
--- /dev/null
+++ b/srcpkgs/mkinitcpio/patches/setfont.patch
@@ -0,0 +1,31 @@
+https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/merge_requests/259
+
+From 889b1c39653e66b5492b01cd34892506a9a5e9ee Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Tue, 12 Sep 2023 22:31:36 -0400
+Subject: [PATCH] install/consolefont: include setfont binary
+
+if not using the sd-vconsole hook (like on Void Linux, where there is no
+systemd), setfont is not available unless manually added to BINARIES.
+This also ensures this hook is fully modular and does not rely on other
+hooks to work.
+---
+ install/consolefont | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/install/consolefont b/install/consolefont
+index 0ec554e1..36451912 100644
+--- a/install/consolefont
++++ b/install/consolefont
+@@ -6,6 +6,8 @@ build() {
+     # shellcheck disable=SC2034
+     local KEYMAP KEYMAP_TOGGLE FONT FONT_MAP FONT_UNIMAP XKBLAYOUT XKBMODEL XKBVARIANT XKBOPTIONS
+ 
++    add_binary setfont
++
+     # subshell to avoid namespace pollution
+     (
+         # shellcheck disable=SC1091
+-- 
+GitLab
+
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index 925c690011aa6..0271589ea115b 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=36
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"