mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
grub: update to 2.02~beta3.
This commit is contained in:
parent
e042704061
commit
4f38ebdeeb
3 changed files with 3 additions and 48 deletions
|
@ -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");
|
|
|
@ -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 <config.h>
|
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
+#ifdef __GLIBC__
|
|
||||||
#include <error.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
--- 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 <sys/ioctl.h> /* ioctl */
|
|
||||||
# include <sys/mount.h>
|
|
||||||
-# 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 <linux/unistd.h> /* _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)
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'grub'
|
# Template file for 'grub'
|
||||||
pkgname=grub
|
pkgname=grub
|
||||||
version=2.02~beta2
|
version=2.02~beta3
|
||||||
revision=2
|
revision=1
|
||||||
hostmakedepends="flex"
|
hostmakedepends="flex"
|
||||||
makedepends="libusb-compat-devel ncurses-devel freetype-devel
|
makedepends="libusb-compat-devel ncurses-devel freetype-devel
|
||||||
liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel"
|
liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel"
|
||||||
|
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
license="GPL-3"
|
license="GPL-3"
|
||||||
homepage="http://www.gnu.org/software/grub/"
|
homepage="http://www.gnu.org/software/grub/"
|
||||||
distfiles="http://alpha.gnu.org/gnu/grub/grub-${version}.tar.xz"
|
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"
|
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
|
||||||
nopie=yes
|
nopie=yes
|
||||||
|
|
Loading…
Add table
Reference in a new issue