New version for GNOME 2.22. Uses GtkNotebook provided reordable tabs for better effects and no code duplication, GOption instead of popt, many bug fixes and more. Also honors the desktop cursor blink setting, disabling of which in keyboard preferences is good for your laptops battery if you have one.

(Portage version: 2.1.4.4)

4 files changed, 119 insertions, 1 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index a59e8c604805..95f4f6bda672 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,18 @@
 # 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.164 2008/03/14 09:01:14 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.165 2008/03/22 01:08:28 leio Exp $
+
+*gnome-terminal-2.22.0 (22 Mar 2008)
+
+  22 Mar 2008; Mart Raudsepp <leio@gentoo.org>
+  +files/gnome-terminal-2.22.0-default_shell.patch,
+  +files/gnome-terminal-2.22.0-fix-detach-tab.patch,
+  +gnome-terminal-2.22.0.ebuild:
+  New version for GNOME 2.22. Uses GtkNotebook provided reordable tabs for
+  better effects and no code duplication, GOption instead of popt, many bug
+  fixes and more. Also honors the desktop cursor blink setting, disabling of
+  which in keyboard preferences is good for your laptops battery if you have
+  one.
 
   14 Mar 2008; Mart Raudsepp <leio@gentoo.org> gnome-terminal-2.18.2.ebuild,
   gnome-terminal-2.18.4.ebuild:
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.22.0-default_shell.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.22.0-default_shell.patch
new file mode 100644
index 000000000000..84bac04f0432
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.22.0-default_shell.patch
@@ -0,0 +1,11 @@
+--- src/gnome-terminal.schemas.in	2003-02-21 20:06:56.000000000 -0600
++++ src/gnome-terminal.schemas.in	2003-02-21 20:07:13.000000000 -0600
+@@ -341,7 +341,7 @@
+       <applyto>/apps/gnome-terminal/profiles/Default/login_shell</applyto>
+       <owner>gnome-terminal</owner>
+       <type>bool</type>
+-      <default>false</default>
++      <default>true</default>
+       <locale name="C">
+          <short>Whether to launch the command in the terminal as a login shell</short>
+          <long>
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.22.0-fix-detach-tab.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.22.0-fix-detach-tab.patch
new file mode 100644
index 000000000000..f4327726b786
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.22.0-fix-detach-tab.patch
@@ -0,0 +1,40 @@
+diff --git a/ChangeLog b/ChangeLog
+index 17d8ce3..43d1599 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2008-03-19  Christian Persch  <chpe@gnome.org>
++
++	* src/terminal.c: (terminal_app_new_terminal): Fix DetachTab action.
++	Bug #521193, regression from bug #353775.
++
+ 2008-03-10  Behdad Esfahbod  <behdad@gnome.org>
+ 
+ 	* NEWS:
+diff --git a/src/terminal.c b/src/terminal.c
+index 664c322..c06936a 100644
+--- a/src/terminal.c
++++ b/src/terminal.c
+@@ -1551,6 +1551,22 @@ terminal_app_new_terminal (TerminalApp     *app,
+       terminal_window_set_active (window, screen);
+       gtk_widget_grab_focus (GTK_WIDGET (screen));
+     }
++  else
++    {
++      TerminalWindow *source_window;
++
++      source_window = terminal_screen_get_window (screen);
++      if (source_window)
++        {
++          g_object_ref_sink (screen);
++          terminal_window_remove_screen (source_window, screen);
++          terminal_window_add_screen (window, screen, -1);
++          g_object_unref (screen);
++
++          terminal_window_set_active (window, screen);
++          gtk_widget_grab_focus (GTK_WIDGET (screen));
++        }
++    }
+ 
+   if (geometry)
+     {
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.22.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.22.0.ebuild
new file mode 100644
index 000000000000..6b7278ef8da3
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.22.0.ebuild
@@ -0,0 +1,55 @@
+# 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.22.0.ebuild,v 1.1 2008/03/22 01:08:28 leio Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="http://www.gnome.org/"
+
+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.15.2
+	>=x11-libs/gtk+-2.12
+	>=gnome-base/gconf-2.14
+	>=x11-libs/startup-notification-0.8
+	>=x11-libs/vte-0.15.3
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/libgnomeui-2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2
+	>=app-text/scrollkeeper-0.3.11"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Use login shell by default (#12900)
+	epatch "${FILESDIR}"/${P}-default_shell.patch
+
+	# terminal enhancement, inserts a space after a DND URL
+	# patch by Zach Bagnall <yem@y3m.net> in #13801
+	epatch "${FILESDIR}"/${PN}-2-dnd_url_add_space.patch
+
+	# Fix detach tab menu item. Upstream bug #521193, patch taken from SVN gnome-2-22 branch
+	epatch "${FILESDIR}/${P}-fix-detach-tab.patch"
+
+	# Fix deprecated API disabling in used libraries - this is not future-proof, bug 213340
+	# Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=523737
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		"${S}/src/Makefile.am" "${S}/src/Makefile.in"
+
+	# 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
+}