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 | 598e06e5cafd34369a465569c545f1fbbba44d4e (patch) | |
| tree | 25ef9a1fc1fdba0e7f400910418f8b36e0beba10 /x11-terms | |
| parent | Fixed build issue with 2.6.34 kernels, bug #317119, thank Rion for report. (diff) | |
| download | historical-598e06e5cafd34369a465569c545f1fbbba44d4e.tar.gz historical-598e06e5cafd34369a465569c545f1fbbba44d4e.tar.bz2 historical-598e06e5cafd34369a465569c545f1fbbba44d4e.zip | |
Apply upstream patch to fix bug 304091
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'x11-terms')
4 files changed, 39 insertions, 7 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/Manifest b/x11-terms/gnome-terminal/Manifest index 1a065823de7a..563885e6177c 100644 --- a/x11-terms/gnome-terminal/Manifest +++ b/x11-terms/gnome-terminal/Manifest @@ -6,16 +6,17 @@ AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba75 AUX gnome-terminal-2.24.2-restore-switch-to-tab.patch 15041 RMD160 5860f46b1379dd40cd8ca9c9e23b30be5ef3e7cb SHA1 3ab937c566c401ad1ee82313cc6989338209fc47 SHA256 7edf095b8e037bcb2d41807eb3d26a6d4c9413088e1c9b58e4ef5eebf4c3a36e AUX gnome-terminal-2.26.3.1-cwd-on-new-tab.patch 7074 RMD160 36deb7b2808fe5db59fa3f3ae75c141d02d8c511 SHA1 64ac74d3eecff49416f93f02dc957b7fc00a91ce SHA256 7603ff478f8882816cc26f401f5dceca160bdab99878aa615eee34259efb93dd AUX gnome-terminal-2.26.3.1-partial-fix-dbus-error.patch 2667 RMD160 b1f3ce54c8a90a54d1c2e5f1f87195c8d3c7f8fa SHA1 6c0b4d0a35c04b88b7219cd09f246fd489ec4808 SHA256 6b3fd92d3dced996fe09718873b007335fac14171fb667e7c04c9dc883d121a7 +AUX gnome-terminal-2.26.3.1-remove-plural.patch 624 RMD160 5b260d0407b8824aed762af5d387ac3532431355 SHA1 2f2386bb930b3cc61a7a99990996c12a2c1a2ab8 SHA256 3adfefbe62233b37c373fd49e5ab0c58055d25ff4b937f386f994240b2d7894c DIST gnome-terminal-2.26.3.1.tar.bz2 2176049 RMD160 db6b5ba601c3c74e3424e88119501b9414e1f37d SHA1 68dc9739b4d35c0647596b1773c5da76782f1164 SHA256 40d97f983363002d6da574b35f3e4d44d4e8db38b776b226626f1e83d6fde1dc DIST gnome-terminal-2.28.2.tar.bz2 2194820 RMD160 10b3cea1f57d7775c1209103cdf88e738ea4ac28 SHA1 d5437aa0cb8e30315f18a4f8b694fa21387cfe3a SHA256 ccf2547c579755ec9b6f727add6bb327bbda95ac621aa6e0738fbd37ab6c9c78 -EBUILD gnome-terminal-2.26.3.1-r2.ebuild 1678 RMD160 fcf842a0dbb1f1d5348d9c490d8c8b3269c29f65 SHA1 255103a79dcf5fda57a211928306a462504a8193 SHA256 a9031113bcf133e773248a29502c1075380b6f60f9d5e5a872ef4ab0357d0d2a +EBUILD gnome-terminal-2.26.3.1-r2.ebuild 1826 RMD160 2e5676cbefc66c7ef2b6feb8c72b03106680eec8 SHA1 cbe6333ef37331ad3db845ceb086aaac84d8019e SHA256 f0c6eb65ac324e94da35feb363f2a0e9e139834aa9b9e50846527695d15678f4 EBUILD gnome-terminal-2.28.2.ebuild 1320 RMD160 f28e674b7e072594f63805355d0f437e77c6ba19 SHA1 895dda1ff25e52213698846fd68ccdf5f1de8c06 SHA256 2842068a8ea6425400770b2600930b19e99aa46c2c1170f6318bfcc0306bdb42 -MISC ChangeLog 29574 RMD160 bdcfe19d42152696b35e9b927678b39f1018c5e9 SHA1 da3ab14f9463c4c5e14985bb9884562154d84e73 SHA256 0a00f3424a1729b69b2a0d4b3873d805f390371895ce01dfdd3eae988db84b16 +MISC ChangeLog 29892 RMD160 9eeb1a059adcbbb71a4023ab6e7d29411e19b77d SHA1 15f59ed677cfdc36e042a7fc54b6d8e6330b8138 SHA256 fbdc621f7ccb694fd91fb48fa40f4905bc42bf6f90650c414f7c836e520c30ba MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuFqi0ACgkQ1fmVwcYIWAZ13wCgoUOJIslFIJm/5odAEG1kg0Eb -h3YAoN3Hf0uT1NodGGfg9f6N7EM3nLkE -=BlVF +iEYEARECAAYFAkvV7OUACgkQCaWpQKGI+9TDCACfW7g33yPcRp9GvbfoBV8LgMDX +JZsAn23YD/qupt5dHkGJDiSsvZBtsotc +=0Lu1 -----END PGP SIGNATURE----- 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 |