1 |
pacho 10/04/26 19:43:21 |
2 |
|
3 |
Modified: ChangeLog gnome-terminal-2.26.3.1-r2.ebuild |
4 |
Log: |
5 |
Apply upstream patch to fix bug 304091 |
6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.214 x11-terms/gnome-terminal/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-terms/gnome-terminal/ChangeLog?rev=1.214&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-terms/gnome-terminal/ChangeLog?rev=1.214&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-terms/gnome-terminal/ChangeLog?r1=1.213&r2=1.214 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v |
18 |
retrieving revision 1.213 |
19 |
retrieving revision 1.214 |
20 |
diff -u -r1.213 -r1.214 |
21 |
--- ChangeLog 24 Feb 2010 22:37:04 -0000 1.213 |
22 |
+++ ChangeLog 26 Apr 2010 19:43:21 -0000 1.214 |
23 |
@@ -1,6 +1,13 @@ |
24 |
# ChangeLog for x11-terms/gnome-terminal |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.213 2010/02/24 22:37:04 eva Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.214 2010/04/26 19:43:21 pacho Exp $ |
28 |
+ |
29 |
+ 26 Apr 2010; Pacho Ramos <pacho@g.o> |
30 |
+ gnome-terminal-2.26.3.1-r2.ebuild, |
31 |
+ +files/gnome-terminal-2.26.3.1-remove-plural.patch: |
32 |
+ Apply upstream patch to drop useless Plural-Forms line causing build to |
33 |
+ fail with current stable gnome-doc-utils. Thanks to Peter Volkov for |
34 |
+ finding the fix in bug #304091 |
35 |
|
36 |
24 Feb 2010; Gilles Dartiguelongue <eva@g.o> |
37 |
-gnome-terminal-2.24.2-r1.ebuild, -gnome-terminal-2.28.1.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.10 x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild?rev=1.10&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild?rev=1.10&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild?r1=1.9&r2=1.10 |
46 |
|
47 |
Index: gnome-terminal-2.26.3.1-r2.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild,v |
50 |
retrieving revision 1.9 |
51 |
retrieving revision 1.10 |
52 |
diff -u -r1.9 -r1.10 |
53 |
--- gnome-terminal-2.26.3.1-r2.ebuild 16 Jan 2010 17:14:45 -0000 1.9 |
54 |
+++ gnome-terminal-2.26.3.1-r2.ebuild 26 Apr 2010 19:43:21 -0000 1.10 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2010 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $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 $ |
59 |
+# $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 $ |
60 |
|
61 |
inherit eutils gnome2 |
62 |
|
63 |
@@ -49,6 +49,10 @@ |
64 |
# daemon. Patch is from upstream git repository, included in 2.28 |
65 |
epatch "${FILESDIR}"/${P}-partial-fix-dbus-error.patch |
66 |
|
67 |
+ # Remove useless Plural-Forms line which breaks build with new |
68 |
+ # gnome-doc-utils. See bug #304091 |
69 |
+ epatch "${FILESDIR}"/${P}-remove-plural.patch |
70 |
+ |
71 |
# patch gnome terminal to report as GNOME rather than xterm |
72 |
# This needs to resolve a few bugs (#120294,) |
73 |
# Leave out for now; causing too many problems |