New revision, including the text-selection algorithm patch, supplied in bug #52952

5 files changed, 115 insertions, 4 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index dc64f6cb99e5..237f205cce3c 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.67 2004/08/05 22:35:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.68 2004/08/18 06:57:04 obz Exp $
+
+  18 Aug 2004; Mike Gardiner <obz@gentoo.org>
+  +files/gnome-terminal-2.6.1-select.patch:
+  New revision, including the text-selection algorithm patch, supplied in bug
+  #52952
 
   05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   gnome-terminal-2.6.1.ebuild:
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index e529ee011dc5..78c19448476b 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,12 +1,15 @@
-MD5 d23f6600e3b70bfe30f99e8f8a229ff6 ChangeLog 8274
-MD5 2793c4049916cbc600a5625f1bbb1c4c gnome-terminal-2.4.2.ebuild 1185
 MD5 a98e78f25185fd007d7c1dc34dc216e4 gnome-terminal-2.6.0.ebuild 1232
+MD5 360cadae40b6adb1e629216761637df7 gnome-terminal-2.6.1-r1.ebuild 1319
+MD5 645c52d6092cd9f4043c3d81d2ff55cf ChangeLog 8447
 MD5 5bd990dac2917a20f497a009db1d6aca gnome-terminal-2.6.1.ebuild 1228
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 2793c4049916cbc600a5625f1bbb1c4c gnome-terminal-2.4.2.ebuild 1185
 MD5 0992c11acfb7df9271bd526a65b6f1bb files/digest-gnome-terminal-2.4.2 74
 MD5 b3a6b960b39b9070746d366be76739f9 files/digest-gnome-terminal-2.6.0 74
 MD5 552d1014c29f7ae4902e4c25041d6c5d files/digest-gnome-terminal-2.6.1 74
 MD5 1c5aaf13eb2a8bd0b2b03c529d5c8740 files/gnome-terminal-2-default_shell.patch 490
-MD5 206e36d5520f43272f029d6411af6332 files/gnome-terminal-2-dnd_url_add_space.patch 1000
+MD5 552d1014c29f7ae4902e4c25041d6c5d files/digest-gnome-terminal-2.6.1-r1 74
 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 e0fc64188ba086229362c19960003ffc files/gnome-terminal-2.6.1-select.patch 2071
 MD5 235667e1b2901cfe549fc106471ecc38 files/gnome-terminal-2.6.1-gcc34_eggcell.patch 850
diff --git a/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.1-r1 b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.1-r1
new file mode 100644
index 000000000000..c2538ac851c3
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/digest-gnome-terminal-2.6.1-r1
@@ -0,0 +1 @@
+MD5 43e04260410e66e767a4b247d0af8b46 gnome-terminal-2.6.1.tar.bz2 1999378
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.6.1-select.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.6.1-select.patch
new file mode 100644
index 000000000000..2b10eb1f55ef
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.6.1-select.patch
@@ -0,0 +1,52 @@
+diff -urN gnome-terminal-2.6.1/src/terminal-screen.c gnome-terminal-2.6.1/src/terminal-screen.c
+--- gnome-terminal-2.6.1/src/terminal-screen.c	2004-05-17 19:59:47.850620000 -0700
++++ gnome-terminal-2.6.1/src/terminal-screen.c	2004-05-17 20:05:56.833560000 -0700
+@@ -1599,10 +1599,6 @@
+   terminal_widget_get_cell_size (term, &char_width, &char_height);
+   
+   g_free (screen->priv->matched_string);
+-  screen->priv->matched_string =
+-    terminal_widget_check_match (term,
+-                                 event->x / char_width,
+-                                 event->y / char_height);
+   dingus_button = ((event->button == 1) || (event->button == 2));
+ 
+   if (dingus_button &&
+@@ -1624,20 +1620,30 @@
+     }
+ 
+   if (dingus_button &&
+-      (event->state & GDK_CONTROL_MASK) &&
+-      (screen->priv->matched_string != NULL))
++      (event->state & GDK_CONTROL_MASK))
+     {
+       gtk_widget_grab_focus (widget);
+       
+-      open_url (screen, screen->priv->matched_string);
+-      g_free (screen->priv->matched_string);
+-      screen->priv->matched_string = NULL;
+-      return TRUE; /* don't do anything else such as select with the click */
++      screen->priv->matched_string =
++        terminal_widget_check_match (term,
++                                     event->x / char_width,
++                                     event->y / char_height);
++      if (screen->priv->matched_string != NULL)
++      {
++        open_url (screen, screen->priv->matched_string);
++        g_free (screen->priv->matched_string);
++        screen->priv->matched_string = NULL;
++        return TRUE; /* don't do anything else such as select with the click */
++      }
+     }
+       
+   if ((event->button == 3) &&
+       !(event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)))
+     {
++      screen->priv->matched_string =
++        terminal_widget_check_match (term,
++                                     event->x / char_width,
++                                     event->y / char_height);
+       terminal_screen_do_popup (screen, event);
+       return TRUE;
+     }
+
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.6.1-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..fea0d7791f5d
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.6.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2004 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.6.1-r1.ebuild,v 1.1 2004/08/18 06:57:04 obz Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="The Gnome Terminal"
+IUSE=""
+HOMEPAGE="http://www.gnome.org/"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPEND="virtual/xft
+	>=x11-libs/gtk+-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/gconf-1.2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-vfs-2.4
+	>=x11-libs/startup-notification-0.4
+	>=x11-libs/vte-0.11"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.29
+	!gnome-base/gnome-core"
+# gnome-core overwrite /usr/bin/gnome-terminal
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# Use login shell by default (#12900) 
+	epatch ${FILESDIR}/${PN}-2-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
+
+	# gcc 3.4 fix
+	epatch ${FILESDIR}/${P}-gcc34_eggcell.patch
+
+	# patch for text-selection performance, (#52952)
+	epatch ${FILESDIR}/${P}-select.patch
+
+}
+
+DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"