summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-terms/gnome-terminal/ChangeLog5
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-2.6.1-gcc34_eggcell.patch20
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-2.6.0.ebuild5
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-2.6.1.ebuild5
4 files changed, 32 insertions, 3 deletions
diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 523302fb097b..2dc8bb8b86f3 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-terms/gnome-terminal
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.57 2004/04/19 16:33:49 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.58 2004/04/27 14:49:10 foser Exp $
+
+ 27 Apr 2004; foser <foser@gentoo.org> gnome-terminal-2.6.{0,1}.ebuild :
+ Add gcc 3.4 fix, patch provided by Robert Moss <robert.moss@jesus.ox.ac.uk> in #48425
*gnome-terminal-2.6.1 (19 Apr 2004)
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.6.1-gcc34_eggcell.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.6.1-gcc34_eggcell.patch
new file mode 100644
index 000000000000..1644bf1363b8
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.6.1-gcc34_eggcell.patch
@@ -0,0 +1,20 @@
+--- src/eggcellrendererkeys.c.old 2004-04-20 03:33:32.931179224 +0100
++++ src/eggcellrendererkeys.c 2004-04-20 03:34:32.984049800 +0100
+@@ -584,7 +584,7 @@
+ void
+ egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
+ guint keyval,
+- GdkModifierType mask)
++ EggVirtualModifierType mask)
+ {
+ char *text;
+ gboolean changed;
+@@ -626,7 +626,7 @@
+ void
+ egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
+ guint *keyval,
+- GdkModifierType *mask)
++ EggVirtualModifierType *mask)
+ {
+ g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
+
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.6.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.6.0.ebuild
index 0d67e1ac5548..92b187ab5037 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.6.0.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.6.0.ebuild,v 1.1 2004/03/23 15:06:29 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.6.0.ebuild,v 1.2 2004/04/27 14:49:10 foser Exp $
inherit gnome2 eutils
@@ -39,6 +39,9 @@ src_unpack() {
# patch by Zach Bagnall <yem@y3m.net> in #13801
epatch ${FILESDIR}/${PN}-2-dnd_url_add_space.patch
+ # gcc 3.4 fix
+ epatch ${FILESDIR}/${PN}-2.6.1-gcc34_eggcell.patch
+
}
DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.6.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.6.1.ebuild
index b05212182fc8..a390babe220e 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.6.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.6.1.ebuild,v 1.1 2004/04/19 16:33:49 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.6.1.ebuild,v 1.2 2004/04/27 14:49:10 foser Exp $
inherit gnome2 eutils
@@ -39,6 +39,9 @@ src_unpack() {
# patch by Zach Bagnall <yem@y3m.net> in #13801
epatch ${FILESDIR}/${PN}-2-dnd_url_add_space.patch
+ # gcc 3.4 fix
+ epatch ${FILESDIR}/${P}-gcc34_eggcell.patch
+
}
DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"