From 4f38ebdeebf8908e099341394527fed859e2fc97 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 3 Mar 2016 07:27:43 +0100 Subject: [PATCH] grub: update to 2.02~beta3. --- .../patches/error-maybe-uninitialized.patch | 11 ------ srcpkgs/grub/patches/musl.patch | 34 ------------------- srcpkgs/grub/template | 6 ++-- 3 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 srcpkgs/grub/patches/error-maybe-uninitialized.patch delete mode 100644 srcpkgs/grub/patches/musl.patch diff --git a/srcpkgs/grub/patches/error-maybe-uninitialized.patch b/srcpkgs/grub/patches/error-maybe-uninitialized.patch deleted file mode 100644 index 9d993ec63f9..00000000000 --- a/srcpkgs/grub/patches/error-maybe-uninitialized.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- util/grub-gen-asciih.c.orig 2015-12-18 15:55:41.000754229 +0100 -+++ util/grub-gen-asciih.c 2015-12-18 15:56:14.296668022 +0100 -@@ -128,7 +128,7 @@ add_glyph (FT_UInt glyph_idx, FT_Face fa - static void - write_font_ascii_bitmap (FILE *file, FT_Face face) - { -- struct grub_glyph_info glyph; -+ struct grub_glyph_info glyph = {}; - int char_code; - - fprintf (file, "/* THIS CHUNK OF BYTES IS AUTOMATICALLY GENERATED */\n"); diff --git a/srcpkgs/grub/patches/musl.patch b/srcpkgs/grub/patches/musl.patch deleted file mode 100644 index a0e73110537..00000000000 --- a/srcpkgs/grub/patches/musl.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- grub-core/kern/emu/misc.c.orig 2015-12-18 15:48:01.279947005 +0100 -+++ grub-core/kern/emu/misc.c 2015-12-18 15:48:54.974805473 +0100 -@@ -20,7 +20,9 @@ - #include - - #include -+#ifdef __GLIBC__ - #include -+#endif - #include - #include - #include ---- grub-core/osdep/unix/hostdisk.c.orig 2015-12-18 15:50:27.584565696 +0100 -+++ grub-core/osdep/unix/hostdisk.c 2015-12-18 15:51:43.424369339 +0100 -@@ -48,8 +48,7 @@ - #ifdef __linux__ - # include /* ioctl */ - # include --# if !defined(__GLIBC__) || \ -- ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))) -+#if ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))) - /* Maybe libc doesn't have large file support. */ - # include /* _llseek */ - # endif /* (GLIBC < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR < 1)) */ -@@ -79,8 +78,7 @@ grub_util_get_fd_size (grub_util_fd_t fd - return st.st_size; - } - --#if defined(__linux__) && (!defined(__GLIBC__) || \ -- ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1)))) -+#if (defined(__linux__) && defined(__GLIBC__)) && (((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1)))) - /* Maybe libc doesn't have large file support. */ - int - grub_util_fd_seek (grub_util_fd_t fd, grub_uint64_t off) diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index ee444d11430..71dc54c76af 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -1,7 +1,7 @@ # Template file for 'grub' pkgname=grub -version=2.02~beta2 -revision=2 +version=2.02~beta3 +revision=1 hostmakedepends="flex" makedepends="libusb-compat-devel ncurses-devel freetype-devel liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/grub/" distfiles="http://alpha.gnu.org/gnu/grub/grub-${version}.tar.xz" -checksum=f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d +checksum=30ec3d555e52a702c3eef449872ef874eff28b320f40b55ffc47f70db8e5ada1 only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes