diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-04-26 19:43:21 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-04-26 19:43:21 +0000 |
| commit | d0eaf75672ca6688d6450901d0a01e0f343bdf36 (patch) | |
| tree | 619a4cb8dfeb87ea21aae096fea0b36aba664549 /x11-terms | |
| parent | Fixed build issue with 2.6.34 kernels, bug #317119, thank Rion for report. (diff) | |
| download | gentoo-2-d0eaf75672ca6688d6450901d0a01e0f343bdf36.tar.gz gentoo-2-d0eaf75672ca6688d6450901d0a01e0f343bdf36.tar.bz2 gentoo-2-d0eaf75672ca6688d6450901d0a01e0f343bdf36.zip | |
Apply upstream patch to fix bug 304091
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-terms')
3 files changed, 33 insertions, 2 deletions
diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog index 63cfceb3cd6d..6cde80b87334 100644 --- a/x11-terms/gnome-terminal/ChangeLog +++ b/x11-terms/gnome-terminal/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-terms/gnome-terminal # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.213 2010/02/24 22:37:04 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.214 2010/04/26 19:43:21 pacho Exp $ + + 26 Apr 2010; Pacho Ramos <pacho@gentoo.org> + gnome-terminal-2.26.3.1-r2.ebuild, + +files/gnome-terminal-2.26.3.1-remove-plural.patch: + Apply upstream patch to drop useless Plural-Forms line causing build to + fail with current stable gnome-doc-utils. Thanks to Peter Volkov for + finding the fix in bug #304091 24 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org> -gnome-terminal-2.24.2-r1.ebuild, -gnome-terminal-2.28.1.ebuild: diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-remove-plural.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-remove-plural.patch new file mode 100644 index 000000000000..0358ed8a64d6 --- /dev/null +++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-remove-plural.patch @@ -0,0 +1,20 @@ +From 30f29e7d8e1b67c40cd18a7155ba30c4382692d5 Mon Sep 17 00:00:00 2001 +From: Seán de Búrca <leftmostcat@gmail.com> +Date: Fri, 07 Aug 2009 00:38:52 +0000 +Subject: Remove useless Plural-Forms line which breaks build with gnome-doc-utils master + +--- +diff --git a/help/el/el.po b/help/el/el.po +index ab77264..635b68f 100644 +--- a/help/el/el.po ++++ b/help/el/el.po +@@ -10,7 +10,6 @@ msgstr "" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: 2\n" + "X-Poedit-Language: Greek\n" + "X-Poedit-Country: GREECE\n" + "X-Generator: Lokalize 0.2\n" +-- +cgit v0.8.3.1 diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild index 95ff4ae57d31..08390d365363 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild,v 1.9 2010/01/16 17:14:45 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild,v 1.10 2010/04/26 19:43:21 pacho Exp $ inherit eutils gnome2 @@ -49,6 +49,10 @@ src_unpack() { # daemon. Patch is from upstream git repository, included in 2.28 epatch "${FILESDIR}"/${P}-partial-fix-dbus-error.patch + # Remove useless Plural-Forms line which breaks build with new + # gnome-doc-utils. See bug #304091 + epatch "${FILESDIR}"/${P}-remove-plural.patch + # patch gnome terminal to report as GNOME rather than xterm # This needs to resolve a few bugs (#120294,) # Leave out for now; causing too many problems |