diff options
| author | BlackNoxis <steven.darklight@gmail.com> | 2014-10-27 18:38:05 +0200 |
|---|---|---|
| committer | BlackNoxis <steven.darklight@gmail.com> | 2014-10-27 18:38:05 +0200 |
| commit | 24934e623441310f644e5f72855b0f2bf9f3cd1a (patch) | |
| tree | a453939bf58199bc2c3ff27bcf0accf2b221c6c4 /sys-boot/grub/files | |
| parent | 687f45092b4f4ccf33765cee7427f054bae22344 (diff) | |
Incoming! Moving Rogento.git to kogaion-desktop. Finally
Diffstat (limited to 'sys-boot/grub/files')
| -rw-r--r-- | sys-boot/grub/files/101-freetype2_fix_mkfont.patch | 11 | ||||
| -rw-r--r-- | sys-boot/grub/files/grub-2.00-fix-locale-en.mo.gz-not-found-error-message.patch | 38 |
2 files changed, 49 insertions, 0 deletions
diff --git a/sys-boot/grub/files/101-freetype2_fix_mkfont.patch b/sys-boot/grub/files/101-freetype2_fix_mkfont.patch new file mode 100644 index 00000000..fc9f146d --- /dev/null +++ b/sys-boot/grub/files/101-freetype2_fix_mkfont.patch @@ -0,0 +1,11 @@ +--- a/util/grub-mkfont.c ++++ b/util/grub-mkfont.c +@@ -39,7 +39,7 @@ + #include FT_FREETYPE_H + #include FT_TRUETYPE_TAGS_H + #include FT_TRUETYPE_TABLES_H +-#include <freetype/ftsynth.h> ++#include FT_SYNTHESIS_H + + #undef __FTERRORS_H__ + #define FT_ERROR_START_LIST const char *ft_errmsgs[] = { diff --git a/sys-boot/grub/files/grub-2.00-fix-locale-en.mo.gz-not-found-error-message.patch b/sys-boot/grub/files/grub-2.00-fix-locale-en.mo.gz-not-found-error-message.patch new file mode 100644 index 00000000..0e20f8a1 --- /dev/null +++ b/sys-boot/grub/files/grub-2.00-fix-locale-en.mo.gz-not-found-error-message.patch @@ -0,0 +1,38 @@ +From e7500166b343874447e6abf385a791998c77f4c4 Mon Sep 17 00:00:00 2001 +From: Michael Chang <mchang@suse.com> +Date: Wed, 26 Sep 2012 15:55:44 +0800 +Subject: [PATCH] Silence error messages when translations are unavailable + +From: Colin Watson <cjwatson@ubuntu.com> + +References: bnc#771393 + https://savannah.gnu.org/bugs/?35880 +Patch-Mainline: no + +Signed-off-by: Michael Chang <mchang@suse.com> +--- + grub-core/gettext/gettext.c | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c +index 569f985..eb4bb5d 100644 +--- a/grub-core/gettext/gettext.c ++++ b/grub-core/gettext/gettext.c +@@ -412,6 +412,14 @@ grub_gettext_init_ext (struct grub_gettext_context *ctx, + + grub_free (lang); + } ++ ++ /* If no translations are available, fall back to untranslated text. */ ++ if (err == GRUB_ERR_FILE_NOT_FOUND) ++ { ++ grub_errno = GRUB_ERR_NONE; ++ return 0; ++ } ++ + return err; + } + +-- +1.7.3.4 + |