Fix highlighting on activity, bug 242636

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

4 files changed, 103 insertions, 12 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index 0d0405fa704e..e3c3bf023882 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,12 @@
 # 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.210 2008/10/10 14:08:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.211 2008/10/28 11:57:46 leio Exp $
+
+*vte-0.17.4-r1 (28 Oct 2008)
+
+  28 Oct 2008; Mart Raudsepp <leio@gentoo.org>
+  +files/vte-0.17.4-fix-selecting-on-activity.patch, +vte-0.17.4-r1.ebuild:
+  Fix highlighting on activity, bug 242636
 
 *vte-0.17.4 (10 Oct 2008)
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index d80c4f93127f..7927bd071e29 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 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
@@ -9,13 +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.ebuild 1060 RMD160 de9935f1f53cb2c98d4563d67cfc2df07ab8cb8d SHA1 f070abf4d8938f736e3aad5c259da712d182ad84 SHA256 747867f4c7877be838e7564a8c5db8e6340977a076f5c70bc1e2e9ead87ea0d5
-MISC ChangeLog 26106 RMD160 64b8167b29ed4c993f247bb74e4c11eb11066aa5 SHA1 305ea6abc0434d476fd442f2d177d0de5f0b1cfa SHA256 271369dcbbca60b0eb13c37f019577167a00b55a02a4f72c4ce7b8bc467d54b1
+MISC ChangeLog 26304 RMD160 6a4f15d38865046ea6e1e6e724fe28c2d9722e9d SHA1 9dee0236d54e34fa0e84d536c4f08cb9ae118344 SHA256 833c36f85b9720226f056226f0abf62a3772f3d0c601615829910002d4fba4f7
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjvYeUACgkQ1fmVwcYIWAaD5QCggO2UjaYUC8zdLyIBPi/OjE9K
-3ugAoIqbJaPexnC8w/Zl1cL9KXZlI6Q9
-=gGQC
------END PGP SIGNATURE-----
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-selecting-on-activity.patch
new file mode 100644
index 000000000000..5cf9b91acfd6
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.17.4-fix-selecting-on-activity.patch
@@ -0,0 +1,41 @@
+Upstream revision 2134 with useless whitespace change hunks removed:
+
+2008-10-23  Chris Wilson
+
+Bug 557375 – >=vte-0.16.14 breaks highlighting on activity
+
+* src/vte.c (vte_terminal_deselect_all),
+(vte_terminal_extend_selection):
+After the user modifies the selection, copy it to PRIMARY and store
+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
+@@ -1018,10 +1018,16 @@
+ {
+ 	if (terminal->pvt->has_selection) {
+ 		gint sx, sy, ex, ey;
+-		terminal->pvt->has_selection = FALSE;
++
+ 		_vte_debug_print(VTE_DEBUG_SELECTION,
+ 				"Deselecting all text.\n");
++
++		terminal->pvt->has_selection = FALSE;
++		g_free (terminal->pvt->selection);
++		terminal->pvt->selection = NULL;
++
+ 		vte_terminal_emit_selection_changed(terminal);
++
+ 		sx = terminal->pvt->selection_start.x;
+ 		sy = terminal->pvt->selection_start.y;
+ 		ex = terminal->pvt->selection_end.x;
+@@ -6510,6 +6514,7 @@
+ 			terminal->pvt->selection_start.y,
+ 			terminal->pvt->selection_end.x,
+ 			terminal->pvt->selection_end.y);
++	vte_terminal_copy_primary(terminal);
+ 	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-r1.ebuild
new file mode 100644
index 000000000000..fb3fd0839cd3
--- /dev/null
+++ b/x11-libs/vte/vte-0.17.4-r1.ebuild
@@ -0,0 +1,52 @@
+# 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 $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Gnome terminal widget"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+# pcre is broken in this release
+IUSE="debug doc python opengl"
+
+RDEPEND=">=dev-libs/glib-2.14
+	>=x11-libs/gtk+-2.6
+	>=x11-libs/pango-1.1
+	>=media-libs/freetype-2.0.2
+	media-libs/fontconfig
+	sys-libs/ncurses
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	python? (
+		>=dev-python/pygtk-2.4
+		>=dev-lang/python-2.4.4-r5
+	)
+	x11-libs/libX11
+	virtual/xft"
+
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.0 )
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	sys-devel/gettext"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable python)
+		$(use_with opengl glX)
+		--with-xft2 --with-pangox"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}/${P}-fix-selecting-on-activity.patch"
+}