summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2008-12-09 15:37:06 +0000
committerMart Raudsepp <leio@gentoo.org>2008-12-09 15:37:06 +0000
commita80501353b7ef05be4fdafbe8bff6a981d42a97e (patch)
tree38b0bb8a7658bdbede836dec016c37cd81b9d88d /x11-terms
parentMarking culmus-0.102 and culmus-0.102-r1 ~ppc64 for bug 168331 (diff)
downloadgentoo-2-a80501353b7ef05be4fdafbe8bff6a981d42a97e.tar.gz
gentoo-2-a80501353b7ef05be4fdafbe8bff6a981d42a97e.tar.bz2
gentoo-2-a80501353b7ef05be4fdafbe8bff6a981d42a97e.zip
Fix patch to not crash in certain situations with >10 tabs
(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r3 x86_64)
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/gnome-terminal/ChangeLog9
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-2.24.2-restore-switch-to-tab.patch3
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-2.24.2-r1.ebuild (renamed from x11-terms/gnome-terminal/gnome-terminal-2.24.2.ebuild)2
3 files changed, 10 insertions, 4 deletions
diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index e898497b77de..b1cf08726735 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-terms/gnome-terminal
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.183 2008/12/01 09:44:35 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.184 2008/12/09 15:37:06 leio Exp $
+
+*gnome-terminal-2.24.2-r1 (09 Dec 2008)
+
+ 09 Dec 2008; Mart Raudsepp <leio@gentoo.org>
+ files/gnome-terminal-2.24.2-restore-switch-to-tab.patch,
+ -gnome-terminal-2.24.2.ebuild, +gnome-terminal-2.24.2-r1.ebuild:
+ Fix patch to not crash in certain situations with >10 tabs
*gnome-terminal-2.24.2 (01 Dec 2008)
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.24.2-restore-switch-to-tab.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.24.2-restore-switch-to-tab.patch
index 04f067591c68..adc81ffa8f32 100644
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2.24.2-restore-switch-to-tab.patch
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.24.2-restore-switch-to-tab.patch
@@ -98,9 +98,8 @@ Index: src/terminal-tabs-menu.c
#define LABEL_WIDTH_CHARS 32
#define ACTION_VERB_FORMAT_PREFIX "JmpTab"
-#define ACTION_VERB_FORMAT_PREFIX_LEN (6) /* strlen (ACTION_VERB_FORMAT_PREFIX) */
--#define ACTION_VERB_FORMAT ACTION_VERB_FORMAT_PREFIX "%x"
+#define ACTION_VERB_FORMAT_PREFIX_LEN strlen (ACTION_VERB_FORMAT_PREFIX)
-+#define ACTION_VERB_FORMAT ACTION_VERB_FORMAT_PREFIX "%u"
+ #define ACTION_VERB_FORMAT ACTION_VERB_FORMAT_PREFIX "%x"
#define ACTION_VERB_FORMAT_LENGTH strlen (ACTION_VERB_FORMAT) + 14 + 1
#define ACTION_VERB_FORMAT_BASE (16) /* %x is hex */
-#define ACCEL_PATH_FORMAT "<Actions>/TabsActions/%s"
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.24.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.24.2-r1.ebuild
index 516bd4231a0e..813af292c9bd 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.24.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.24.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 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.24.2.ebuild,v 1.1 2008/12/01 09:44:35 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.24.2-r1.ebuild,v 1.1 2008/12/09 15:37:06 leio Exp $
inherit eutils gnome2