Re: [PATCH] configure.ac: Make the unifont FONT_SOURCE configurable as --with-unifont=FILE

[sorki <srk@48.io>]

On 10/18/23 18:37, Daniel Kiper wrote:
> On Tue, Oct 17, 2023 at 05:55:58PM +0200, Richard Marko wrote:
>> Revival of https://www.mail-archive.com/grub-devel@gnu.org/msg18492.html
>> by Mads Kiilerich stripped of setting DJVU_FONT_SOURCE.
> Please add more info about the patch to the commit message. I think one
> in the original email is good starting point.
>
> Please add Signed-off-by of original author here and CC him.
>
The email wasn't visible on the list archive page but wasn't that hard 
to find.

>> Signed-off-by: Richard Marko <srk@48.io>
>> ---
>>   configure.ac | 33 ++++++++++++++++++++-------------
>>   1 file changed, 20 insertions(+), 13 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index da9c8d560..7b8c3698c 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -1832,21 +1832,28 @@ fi
>>
>>   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
>> -    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.
>> -      if test "$md5" = 0a54834d2788c83886a3e1785a6a1e61 || test "$md5" = 28f2565c7a41d8d407e2551159385edb || test "$md5" = dae5e588461b3b92b87b6ffee734f936 || test "$md5" = 4a3d687aa5bb329ed05f4263a1016791 ; then
>> -        continue
>> +AC_ARG_WITH([unifont],
>> +            AS_HELP_STRING([--with-unifont=FILE],
>> +                           [set the unifont source [[guessed]]]))
>> +
>> +if test "x$with_unifont" = x; then
>> +  # search in well-known directories
>> +  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
>> +      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.
>> +        if test "$md5" = 0a54834d2788c83886a3e1785a6a1e61 || test "$md5" = 28f2565c7a41d8d407e2551159385edb || test "$md5" = dae5e588461b3b92b87b6ffee734f936 || test "$md5" = 4a3d687aa5bb329ed05f4263a1016791 ; then
>> +          continue
>> +        fi
>> +        FONT_SOURCE="$dir/unifont.$ext"
>> +        break 2
>>         fi
>> -      FONT_SOURCE="$dir/unifont.$ext"
>> -      break 2
>> -    fi
>> +    done
>>     done
>> -done
>> +else
>> +  FONT_SOURCE="$with_unifont"
>> +fi
> I would add similar option for DejaVu font in separate patch
> for completeness.

Added

Thank you,

Richard


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel