- merged 2.06 from PLD

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

diff --git a/grub2-fonts_path.patch b/grub2-fonts_path.patch
index f5dbe8ca015db1758f9c43e171daae8633e13172..d9fd2ad784a6123f31cade2275b60951bf08097c 100644 (file)
--- a/grub2-fonts_path.patch
+++ b/grub2-fonts_path.patch
@@ -1,7 +1,7 @@
-diff -ur grub-2.04.orig/configure.ac grub-2.04/configure.ac
---- grub-2.04.orig/configure.ac        2019-08-18 15:50:10.737000000 +0200
-+++ grub-2.04/configure.ac     2019-08-18 15:50:22.087000000 +0200
-@@ -1649,7 +1649,7 @@
+diff -dur -x '*~' grub-2.00.orig/configure.ac grub-2.00/configure.ac
+--- grub-2.00.orig/configure.ac        2012-10-28 09:47:24.000000000 +0100
++++ grub-2.00/configure.ac     2012-10-28 09:48:06.438240771 +0100
+@@ -940,7 +940,7 @@
  
  if test x"$starfield_excuse" = x; then
     for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
@@ -10,12 +10,3 @@ diff -ur grub-2.04.orig/configure.ac grub-2.04/configure.ac
          if test -f "$dir/DejaVuSans.$ext"; then
            DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
            break 2
-@@ -1671,7 +1671,7 @@
- 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.