Include a fix for the previous patch, fixing selection clipboard retention from alternate screen (less, vim, etc)

(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64)

3 files changed, 24 insertions, 8 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index e3c3bf023882..3f84e284f191 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/vte
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.211 2008/10/28 11:57:46 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.212 2008/11/01 17:41:23 leio Exp $
+
+*vte-0.17.4-r2 (01 Nov 2008)
+
+  01 Nov 2008; Mart Raudsepp <leio@gentoo.org>
+  +files/vte-0.17.4-fix-highlighting-on-activity.patch,
+  -files/vte-0.17.4-fix-selecting-on-activity.patch, -vte-0.17.4-r1.ebuild,
+  +vte-0.17.4-r2.ebuild:
+  Include a fix for the previous patch, fixing selection clipboard retention
+  from alternate screen (less, vim, etc)
 
 *vte-0.17.4-r1 (28 Oct 2008)
 
diff --git a/x11-libs/vte/files/vte-0.17.4-fix-selecting-on-activity.patch b/x11-libs/vte/files/vte-0.17.4-fix-highlighting-on-activity.patch
index 5cf9b91acfd6..96c09b474f67 100644
--- a/x11-libs/vte/files/vte-0.17.4-fix-selecting-on-activity.patch
+++ b/x11-libs/vte/files/vte-0.17.4-fix-highlighting-on-activity.patch
@@ -1,4 +1,4 @@
-Upstream revision 2134 with useless whitespace change hunks removed:
+Upstream revisions 2134 and 2135 with useless whitespace change hunks removed:
 
 2008-10-23  Chris Wilson
 
@@ -11,8 +11,15 @@ it on the terminal. This ensures that after a screen redraw, we
 compare the contents of the selected region with the current
 selection, instead of stale data.
 
---- trunk/src/vte.c	2008/10/23 09:15:37	2133
-+++ trunk/src/vte.c	2008/10/23 09:43:21	2134
+2008-10-31  Chris Wilson
+
+* src/vte.c (vte_terminal_deselect_all):
+Preserve the copy of the selection until it is replace by a new
+selection, so that we can perform asynchronous copies from the
+clipboard.
+
+--- trunk/src/vte.c	2008/10/23 08:39:44	2130
++++ trunk/src/vte.c	2008/10/31 12:59:29	2135
 @@ -1018,10 +1018,16 @@
  {
  	if (terminal->pvt->has_selection) {
@@ -23,8 +30,8 @@ selection, instead of stale data.
  				"Deselecting all text.\n");
 +
 +		terminal->pvt->has_selection = FALSE;
-+		g_free (terminal->pvt->selection);
-+		terminal->pvt->selection = NULL;
++		/* Don't free the current selection, as we need to keep
++		 * hold of it for async copying from the clipboard. */
 +
  		vte_terminal_emit_selection_changed(terminal);
 +
diff --git a/x11-libs/vte/vte-0.17.4-r1.ebuild b/x11-libs/vte/vte-0.17.4-r2.ebuild
index fb3fd0839cd3..79e1ff71311f 100644
--- a/x11-libs/vte/vte-0.17.4-r1.ebuild
+++ b/x11-libs/vte/vte-0.17.4-r2.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-libs/vte/vte-0.17.4-r1.ebuild,v 1.1 2008/10/28 11:57:46 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.17.4-r2.ebuild,v 1.1 2008/11/01 17:41:23 leio Exp $
 
 inherit gnome2 eutils
 
@@ -48,5 +48,5 @@ pkg_setup() {
 
 src_unpack() {
 	gnome2_src_unpack
-	epatch "${FILESDIR}/${P}-fix-selecting-on-activity.patch"
+	epatch "${FILESDIR}/${P}-fix-highlighting-on-activity.patch"
 }