rpms/grub2
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-27 23:34:51 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

Add location of DejaVu Sans font

Browse source 
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-01-18 19:46:15 +00:00
parent e602a0629d
commit 357489e3ea
3 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
0202-Add-Fedora-location-of-DejaVu-SANS-font.patch Normal file
View file

@ -0,0 +1,33 @@
From 8c68222cbb8e7527c447bd6908578b72b7302f80 Mon Sep 17 00:00:00 2001
From: fluteze <fluteze@gmail.com>
Date: Sat, 27 Nov 2021 10:54:44 -0600
Subject: [PATCH] Add Fedora location of DejaVu SANS font
In Fedora 35, and possibly earlier, grub would fail to configure with a
complaint about DejaVu being "not found" even though it was installed.
The DejaVu sans font search path is updated to reflect the
distribution's current install path.
Signed-off-by: Erik Edwards <fluteze@gmail.com>
[rharwood@redhat.com: slight commit message edits]
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 3c808a722..3527f069a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1812,7 +1812,7 @@ fi
if test x"$starfield_excuse" = x; then
for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
- for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
+ for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype /usr/share/fonts/dejavu-sans-fonts; do
if test -f "$dir/DejaVuSans.$ext"; then
DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
break 2
--
2.34.1

1
grub.patches
View file

@ -199,3 +199,4 @@ Patch0198: 0198-Print-module-name-on-license-check-failure.patch
Patch0199: 0199-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
Patch0200: 0200-grub-mkconfig-restore-umask-for-grub.cfg.patch
Patch0201: 0201-fs-btrfs-Use-full-btrfs-bootloader-area.patch
Patch0202: 0202-Add-Fedora-location-of-DejaVu-SANS-font.patch

3
grub2.spec
View file

@ -523,6 +523,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif
%changelog
* Tue Jan 18 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-14
- Add location of DejaVu Sans font
* Mon Jan 17 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-13
- Update patches; minor changes at most, if correct