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

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

4 files changed, 27 insertions, 11 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/Manifest b/x11-libs/vte/Manifest
index 7927bd071e29..c2c2183fe165 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,5 +1,5 @@
 AUX vte-0.13.2-no-lazy-bindings.patch 356 RMD160 42555101f894ee6dea01cb792d4c631110f42150 SHA1 a21e7dd7e8aac7d7930f0501c303d53f6b7275d3 SHA256 7e666e1ea32cb99549218c77ffbc0ac73ed9d24c4885b02df676f6ecac458fce
-AUX vte-0.17.4-fix-selecting-on-activity.patch 1277 RMD160 a27cff960b9c7f4f6dffd86248c456be5c036595 SHA1 ed70f97641e305c94f53507ea3046c81707bac57 SHA256 1ee99ecf03941c58e3438e9dd1b34ffbf8c4ec378446bd07c0ff2e80e4561433
+AUX vte-0.17.4-fix-highlighting-on-activity.patch 1536 RMD160 bd992b58360d082877039962dea019df7bc3fbfc SHA1 1ac3675bd937b734ebfaee04c6b56b389a0f5326 SHA256 a3ae37d0d8753a11058b9a0c3809d20384c6a5a74a1610ad89935465cb66c7c7
 DIST vte-0.16.13.tar.bz2 1114585 RMD160 093e40ea7032b887cd1b12a97e060aeb8e8dd052 SHA1 5dc98cf5e2a5c96236ae8daa1bd53017e89adb71 SHA256 edfb74b0bef469ee122ab67c3e4562043e97803c8a32899caf5bd3a71c464a6d
 DIST vte-0.16.14.tar.bz2 1120379 RMD160 8ac4cc778ebbc0c2831692ca251bc50d5db8d4e8 SHA1 4d3ff513d4b0ebeb89babb284260b7fdc2dcd752 SHA256 40cf321980d3139c8f084e818504e1366be81bed817eeeec9021257e04c1c0db
 DIST vte-0.16.8.tar.bz2 1112410 RMD160 dc6a5b95596d02c5e55ecbb9e1e58bc64a02e9a8 SHA1 600db1aa27094aaf56241a1e2f8f0476f97ffd40 SHA256 1dc06ad4224c18061b000de0435b81b7c249215da4163edecb62a8d46090098f
@@ -7,7 +7,7 @@ DIST vte-0.17.4.tar.bz2 1084847 RMD160 8fa3ccc35bc9ef8c204b058b180f532ba6fe7a1a
 EBUILD vte-0.16.13.ebuild 1250 RMD160 b732364627d8450797e2c9877d76ffa3211bbd21 SHA1 a897ab40aa3111fb78bb9ef9a40fc4f63f90e588 SHA256 0c12fe898a9f19c852d7e0f7fa3e836b96d437251828fc20cbdf2e2901363f8a
 EBUILD vte-0.16.14.ebuild 1259 RMD160 517720b26901f76be316dd297ccdb1a0167e52b9 SHA1 9dd30ce24d729f0aa29c04d8ba6cbaf39599b2d8 SHA256 3c2d9d1b7414d6afe57487fb5c86e146a8744d7afbbdd51ed1bff62d78d59544
 EBUILD vte-0.16.8.ebuild 1363 RMD160 ca7b33c1cc5ba8721cec64c406143e357126df00 SHA1 c5fceba04f78689d75c94d34a4f07cacaedb1468 SHA256 a6ea4ab4f15c625c49e6b868e75ad00cd901e4ae0f33f5b2f5d2adf2e720bdbe
-EBUILD vte-0.17.4-r1.ebuild 1167 RMD160 66b3065912f59b066699c72634730c4eb6aa2394 SHA1 39cfe9783f04b18b8d0a673adc3095c46a25e37c SHA256 fa1e4edb67ba4dd7fcb156c8a24f2426a967e818259f6229eca40063de2ad5ef
+EBUILD vte-0.17.4-r2.ebuild 1170 RMD160 f957ed98a1b8689ecf831f38da4663cf30dc5e97 SHA1 3a8b7684a8f623e3e3efdded9502349b58bacbcc SHA256 6ef74c784a5b94800818189789fb7986c0a6deac9069cd1dade7228020f6cac3
 EBUILD vte-0.17.4.ebuild 1060 RMD160 de9935f1f53cb2c98d4563d67cfc2df07ab8cb8d SHA1 f070abf4d8938f736e3aad5c259da712d182ad84 SHA256 747867f4c7877be838e7564a8c5db8e6340977a076f5c70bc1e2e9ead87ea0d5
-MISC ChangeLog 26304 RMD160 6a4f15d38865046ea6e1e6e724fe28c2d9722e9d SHA1 9dee0236d54e34fa0e84d536c4f08cb9ae118344 SHA256 833c36f85b9720226f056226f0abf62a3772f3d0c601615829910002d4fba4f7
+MISC ChangeLog 26657 RMD160 c8217df10cb06038e91225d8d53d89e80d6e7295 SHA1 b3242e962d21f54f8356522abea7e0f27a19850c SHA256 d0fa763d106f405f43bf877f1869510348f7e5f0417f347bd7b893a83c022879
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
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"
 }