- merged 2.12 from PLD

[packages/grub2.git] / grub2-fonts_path.patch

diff --git a/grub2-fonts_path.patch b/grub2-fonts_path.patch
index 0acce4f61fb70f6a15e6811ceb6cf935c63a212d..e5f5300937c3a448a34e295a1e67410c7d09a962 100644 (file)
--- a/grub2-fonts_path.patch
+++ b/grub2-fonts_path.patch
@@ -1,21 +1,11 @@
-diff -urNp grub-2.02-rc1.orig/configure.ac grub-2.02-rc1/configure.ac
---- grub-2.02-rc1.orig/configure.ac    2017-02-08 15:05:29.599317850 +0000
-+++ grub-2.02-rc1/configure.ac 2017-02-08 15:05:43.268317696 +0000
-@@ -1622,7 +1622,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/share/fonts/TTF /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
-         if test -f "$dir/DejaVuSans.$ext"; then
-           DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
-           break 2
-@@ -1644,7 +1644,7 @@ AC_SUBST([DJVU_FONT_SOURCE])
- FONT_SOURCE=
- 
- 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/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
-+  for dir in . /usr/share/fonts/TTF /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
-     if test -f "$dir/unifont.$ext"; then
-       md5="$(md5sum "$dir/unifont.$ext"|awk '{ print $1; }')"
-       # PCF and BDF from version 6.3 isn't hanled properly by libfreetype.
+--- grub-2.12/configure.ac.orig        2023-12-20 18:27:11.057068695 +0100
++++ grub-2.12/configure.ac     2023-12-20 18:28:25.454952491 +0100
+@@ -1847,7 +1847,7 @@
+   # search in well-known directories
+   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 /usr/pkg/share/fonts/X11/TTF /usr/local/share/fonts/dejavu /usr/X11R6/lib/X11/fonts/TTF; do
++       for dir in . /usr/share/fonts/TTF /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype /usr/pkg/share/fonts/X11/TTF /usr/local/share/fonts/dejavu /usr/X11R6/lib/X11/fonts/TTF; do
+           if test -f "$dir/DejaVuSans.$ext"; then
+             DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
+             break 2