From 0c437a2753fb1c8f20194dfa649d480f7a781b2b Mon Sep 17 00:00:00 2001 From: Marinus Schraal Date: Tue, 27 Apr 2004 14:49:10 +0000 Subject: add gcc 3.4 patch --- x11-terms/gnome-terminal/ChangeLog | 5 ++++- x11-terms/gnome-terminal/Manifest | 7 ++++--- .../files/gnome-terminal-2.6.1-gcc34_eggcell.patch | 20 ++++++++++++++++++++ x11-terms/gnome-terminal/gnome-terminal-2.6.0.ebuild | 5 ++++- x11-terms/gnome-terminal/gnome-terminal-2.6.1.ebuild | 5 ++++- 5 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-2.6.1-gcc34_eggcell.patch (limited to 'x11-terms/gnome-terminal') 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 gnome-terminal-2.6.{0,1}.ebuild : + Add gcc 3.4 fix, patch provided by Robert Moss in #48425 *gnome-terminal-2.6.1 (19 Apr 2004) diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest index 544abe047065..00deddadaca1 100644 --- a/x11-terms/gnome-terminal/Manifest +++ b/x11-terms/gnome-terminal/Manifest @@ -1,6 +1,6 @@ -MD5 f172347fc596ff00ff0c141a3bdaf3c4 gnome-terminal-2.6.0.ebuild 1170 -MD5 4cb5fd583d5f3ac97b80cb530951e33a ChangeLog 7262 -MD5 07d24fbf4b528f2e7901da2171d72940 gnome-terminal-2.6.1.ebuild 1170 +MD5 d37a83f622945794cb482ea6f58677d8 gnome-terminal-2.6.0.ebuild 1238 +MD5 bb35e223b7debd60bd40a4e6e2b2e63c ChangeLog 7425 +MD5 0a6d8a54a12e10f6aba9b1ce7968e32e gnome-terminal-2.6.1.ebuild 1231 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 a26b382b3d1db3b9d751ca8c1a705c37 gnome-terminal-2.4.2.ebuild 1181 MD5 0992c11acfb7df9271bd526a65b6f1bb files/digest-gnome-terminal-2.4.2 74 @@ -9,3 +9,4 @@ MD5 552d1014c29f7ae4902e4c25041d6c5d files/digest-gnome-terminal-2.6.1 74 MD5 1c5aaf13eb2a8bd0b2b03c529d5c8740 files/gnome-terminal-2-default_shell.patch 490 MD5 307641ad0c36aecafbe97053c944098f files/gnome-terminal-2.4.2-shortcuts_fix.patch 1037 MD5 206e36d5520f43272f029d6411af6332 files/gnome-terminal-2-dnd_url_add_space.patch 1000 +MD5 235667e1b2901cfe549fc106471ecc38 files/gnome-terminal-2.6.1-gcc34_eggcell.patch 850 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 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 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" -- cgit v1.2.3-65-gdbad