From 357489e3ead94d22106631900dd667949d99563e Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Tue, 18 Jan 2022 19:46:15 +0000 Subject: [PATCH] Add location of DejaVu Sans font Signed-off-by: Robbie Harwood --- ...-Fedora-location-of-DejaVu-SANS-font.patch | 33 +++++++++++++++++++ grub.patches | 1 + grub2.spec | 3 ++ 3 files changed, 37 insertions(+) create mode 100644 0202-Add-Fedora-location-of-DejaVu-SANS-font.patch diff --git a/0202-Add-Fedora-location-of-DejaVu-SANS-font.patch b/0202-Add-Fedora-location-of-DejaVu-SANS-font.patch new file mode 100644 index 0000000..bac9f53 --- /dev/null +++ b/0202-Add-Fedora-location-of-DejaVu-SANS-font.patch @@ -0,0 +1,33 @@ +From 8c68222cbb8e7527c447bd6908578b72b7302f80 Mon Sep 17 00:00:00 2001 +From: fluteze +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 +[rharwood@redhat.com: slight commit message edits] +Signed-off-by: Robbie Harwood +--- + 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 + diff --git a/grub.patches b/grub.patches index f12bbe6..a5a0b0d 100644 --- a/grub.patches +++ b/grub.patches @@ -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 diff --git a/grub2.spec b/grub2.spec index 47f48e7..b2f14c0 100644 --- a/grub2.spec +++ b/grub2.spec @@ -523,6 +523,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Tue Jan 18 2022 Robbie Harwood - 2.06-14 +- Add location of DejaVu Sans font + * Mon Jan 17 2022 Robbie Harwood - 2.06-13 - Update patches; minor changes at most, if correct