diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-07-22 16:43:04 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-07-22 16:43:04 +0000 |
| commit | fe7d9bf8cb9384e4cffc5145a8d57c71c57c5992 (patch) | |
| tree | fdbe50425749e334c50c3215186e6a40ffed93c4 /sys-boot/grub | |
| parent | mask nvidia-drivers causing screen blanking issues (diff) | |
| download | gentoo-2-fe7d9bf8cb9384e4cffc5145a8d57c71c57c5992.tar.gz gentoo-2-fe7d9bf8cb9384e4cffc5145a8d57c71c57c5992.tar.bz2 gentoo-2-fe7d9bf8cb9384e4cffc5145a8d57c71c57c5992.zip | |
Fix problem with single quotes in translated messages in grub-mkconfig. Bug 426364 by Alex Domingo.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot/grub')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-boot/grub/files/grub-2.00-gettext_printf.patch | 14 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.00.ebuild | 3 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 3 |
4 files changed, 24 insertions, 3 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 85b929dc9ce6..daa172ac1276 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.229 2012/07/18 16:34:36 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.230 2012/07/22 16:43:04 floppym Exp $ + + 22 Jul 2012; Mike Gilbert <floppym@gentoo.org> + +files/grub-2.00-gettext_printf.patch, grub-2.00.ebuild, grub-9999.ebuild: + Fix problem with single quotes in translated messages in grub-mkconfig. Bug + 426364 by Alex Domingo. 18 Jul 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild, grub-9999.ebuild: diff --git a/sys-boot/grub/files/grub-2.00-gettext_printf.patch b/sys-boot/grub/files/grub-2.00-gettext_printf.patch new file mode 100644 index 000000000000..41068c42216e --- /dev/null +++ b/sys-boot/grub/files/grub-2.00-gettext_printf.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/show_bug.cgi?id=426364 +https://savannah.gnu.org/bugs/index.php?36839 +--- util/grub-mkconfig_lib.in ++++ util/grub-mkconfig_lib.in +@@ -273,7 +273,7 @@ + gettext_printf () { + gettext_printf_format="$1" + shift +- printf "$(gettext "$gettext_printf_format")" "$@" ++ printf "$(gettext_quoted "$gettext_printf_format")" "$@" + } + + uses_abstraction () { + diff --git a/sys-boot/grub/grub-2.00.ebuild b/sys-boot/grub/grub-2.00.ebuild index ac7b745e4c8d..0140ab3acc89 100644 --- a/sys-boot/grub/grub-2.00.ebuild +++ b/sys-boot/grub/grub-2.00.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.14 2012/07/18 16:34:36 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.15 2012/07/22 16:43:04 floppym Exp $ EAPI=4 @@ -219,6 +219,7 @@ src_prepare() { if [[ ${PV} != 9999 ]]; then epatch "${FILESDIR}/${P}-parallel-make.patch" #424231 epatch "${FILESDIR}/${P}-no-gets.patch" #424703 + epatch "${FILESDIR}/${P}-gettext_printf.patch" #426364 fi # fix texinfo file name, bug 416035 diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index ee5cf6a95f1b..9e9aab40d9e6 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.79 2012/07/18 16:34:36 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.80 2012/07/22 16:43:04 floppym Exp $ EAPI=4 @@ -219,6 +219,7 @@ src_prepare() { if [[ ${PV} != 9999 ]]; then epatch "${FILESDIR}/${P}-parallel-make.patch" #424231 epatch "${FILESDIR}/${P}-no-gets.patch" #424703 + epatch "${FILESDIR}/${P}-gettext_printf.patch" #426364 fi # fix texinfo file name, bug 416035 |