commit d77eb9346fbedeb9c29f7a8117ba2b4c5e36a67b Author: Matt Housh <jaeger@morpheus.net> Date: Sat Sep 20 14:30:17 2014 -0500 grub2-efi: removed duplicated unifont diff --git a/grub2-efi/.footprint b/grub2-efi/.footprint index 150beff..d2672ff 100644 --- a/grub2-efi/.footprint +++ b/grub2-efi/.footprint @@ -1,8 +1,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/grub/ -drwxr-xr-x root/root usr/lib/grub/fonts/ --rw-r--r-- root/root usr/lib/grub/fonts/unifont.pf2 -rw-r--r-- root/root usr/lib/grub/grub2-i386.efi -rw-r--r-- root/root usr/lib/grub/grub2-x86_64.efi drwxr-xr-x root/root usr/lib/grub/i386-efi/ diff --git a/grub2-efi/.md5sum b/grub2-efi/.md5sum index c13d23b..57126e6 100644 --- a/grub2-efi/.md5sum +++ b/grub2-efi/.md5sum @@ -1,2 +1 @@ a1043102fbc7bcedbf53e7ee3d17ab91 grub-2.00.tar.xz -8c28087c5fcb3188f1244b390efffdbe unifont-5.1.20080820.pcf.gz diff --git a/grub2-efi/Pkgfile b/grub2-efi/Pkgfile index b6b06ad..7bc94e8 100644 --- a/grub2-efi/Pkgfile +++ b/grub2-efi/Pkgfile @@ -5,9 +5,8 @@ name=grub2-efi version=2.00 -release=2 -source=(http://ftp.gnu.org/gnu/grub/grub-$version.tar.xz \ - http://unifoundry.com/unifont-5.1.20080820.pcf.gz) +release=3 +source=(http://ftp.gnu.org/gnu/grub/grub-$version.tar.xz) build() { export CFLAGS="${CFLAGS} -Wno-error" @@ -15,6 +14,9 @@ build() { # fix for glibc 'gets' removal sed -i -e '/gets is a/d' grub-$version/grub-core/gnulib/stdio.in.h + # fix for ftsynth.h path + sed -i -e 's|freetype/ftsynth.h|freetype2/ftsynth.h|' grub-$version/util/grub-mkfont.c + MODLIST="boot chain configfile fat ext2 linux normal ntfs part_gpt part_msdos" for ARCH in i386 x86_64 @@ -32,10 +34,5 @@ build() { cd ../.. done - gzip -d $SRC/unifont-5.1.20080820.pcf.gz - mkdir -p $PKG/usr/lib/grub/fonts - x86_64/grub-mkfont -o ${PKG}/usr/lib/grub/fonts/unifont.pf2 \ - $SRC/unifont-5.1.20080820.pcf - rm -r $PKG/usr/{bin,etc,sbin,share} }