From a80501353b7ef05be4fdafbe8bff6a981d42a97e Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Tue, 9 Dec 2008 15:37:06 +0000 Subject: 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) --- x11-terms/gnome-terminal/ChangeLog | 9 +++- ...ome-terminal-2.24.2-restore-switch-to-tab.patch | 3 +- .../gnome-terminal/gnome-terminal-2.24.2-r1.ebuild | 50 ++++++++++++++++++++++ .../gnome-terminal/gnome-terminal-2.24.2.ebuild | 50 ---------------------- 4 files changed, 59 insertions(+), 53 deletions(-) create mode 100644 x11-terms/gnome-terminal/gnome-terminal-2.24.2-r1.ebuild delete mode 100644 x11-terms/gnome-terminal/gnome-terminal-2.24.2.ebuild (limited to 'x11-terms') 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 + 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 "/TabsActions/%s" diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.24.2-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.24.2-r1.ebuild new file mode 100644 index 000000000000..813af292c9bd --- /dev/null +++ b/x11-terms/gnome-terminal/gnome-terminal-2.24.2-r1.ebuild @@ -0,0 +1,50 @@ +# 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-r1.ebuild,v 1.1 2008/12/09 15:37:06 leio Exp $ + +inherit eutils gnome2 + +DESCRIPTION="The Gnome Terminal" +HOMEPAGE="http://www.gnome.org/" + +SRC_URI="${SRC_URI} + mirror://gentoo/gnome-terminal-2.24.2-restore-switch-to-tab-i18n.patch.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND="virtual/xft + >=dev-libs/glib-2.16.0 + >=x11-libs/gtk+-2.13.6 + >=gnome-base/gconf-2.14 + >=x11-libs/startup-notification-0.8 + >=x11-libs/vte-0.17.0 + >=gnome-base/libgnome-2.14 + >=gnome-base/libgnomeui-2" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.9 + gnome-base/gnome-common + >=app-text/gnome-doc-utils-0.3.2 + >=app-text/scrollkeeper-0.3.11" + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +src_unpack() { + gnome2_src_unpack + + # Use login shell by default (#12900) + epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch + + # Restore switch to tab keybinding preferences ... + epatch "${FILESDIR}/${P}-restore-switch-to-tab.patch" + # ... and the translations for it + epatch "${DISTDIR}/${P}-restore-switch-to-tab-i18n.patch.bz2" + + # 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 + #epatch ${FILESDIR}/${PN}-2.13.90-TERM-gnome.patch +} diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.24.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.24.2.ebuild deleted file mode 100644 index 516bd4231a0e..000000000000 --- a/x11-terms/gnome-terminal/gnome-terminal-2.24.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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 $ - -inherit eutils gnome2 - -DESCRIPTION="The Gnome Terminal" -HOMEPAGE="http://www.gnome.org/" - -SRC_URI="${SRC_URI} - mirror://gentoo/gnome-terminal-2.24.2-restore-switch-to-tab-i18n.patch.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND="virtual/xft - >=dev-libs/glib-2.16.0 - >=x11-libs/gtk+-2.13.6 - >=gnome-base/gconf-2.14 - >=x11-libs/startup-notification-0.8 - >=x11-libs/vte-0.17.0 - >=gnome-base/libgnome-2.14 - >=gnome-base/libgnomeui-2" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.9 - gnome-base/gnome-common - >=app-text/gnome-doc-utils-0.3.2 - >=app-text/scrollkeeper-0.3.11" - -DOCS="AUTHORS ChangeLog HACKING NEWS README" - -src_unpack() { - gnome2_src_unpack - - # Use login shell by default (#12900) - epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch - - # Restore switch to tab keybinding preferences ... - epatch "${FILESDIR}/${P}-restore-switch-to-tab.patch" - # ... and the translations for it - epatch "${DISTDIR}/${P}-restore-switch-to-tab-i18n.patch.bz2" - - # 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 - #epatch ${FILESDIR}/${PN}-2.13.90-TERM-gnome.patch -} -- cgit v1.2.3-65-gdbad