Version bump and try to handle bugs 324631 and 323443 in a way most people are happy.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 106 insertions, 11 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index e858ea77af7a..74dc11d3655e 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-libs/vte
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.250 2010/06/17 19:33:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.251 2010/06/23 15:01:20 pacho Exp $
+
+*vte-0.24.2 (23 Jun 2010)
+
+  23 Jun 2010; Pacho Ramos <pacho@gentoo.org> -vte-0.24.1-r1.ebuild,
+  +vte-0.24.2.ebuild, +files/vte-0.24.2-invisible-cursor.patch,
+  +files/vte-0.24.2-invisible-cursor2.patch:
+  Version bump with translations updates. This also provides patches to fix
+  upstream bug #602596 as demanded by some people, but they are not being
+  applied yet since they cause other problems (bug #323443). Finally, this
+  no longer applies second patch to solve ugly artifacts bug with
+  gnome-terminal since it also causes problems with x11-terms/terminal (bug
+  #324631) and the other patches seem to be enough for now.
 
 *vte-0.24.1-r1 (17 Jun 2010)
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 15bef0aab13d..32ca5dc27f0e 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -6,20 +6,22 @@ AUX vte-0.17.4-no-null-backspace.patch 1704 RMD160 2c4292c7448a5ffafc10b17bde5ea
 AUX vte-0.24.1-background-color.patch 683 RMD160 aa89a94d30455f105f12f555e6dad5830eca5c22 SHA1 78eadd3f2262963ad89fc84e485ce05d77fa77cd SHA256 1227c139a2fb827034e8d77c9f00e49eb1732ede3574c445423ead397924b196
 AUX vte-0.24.1-background-color2.patch 1406 RMD160 d3983d10a302c760edb43d894ec554afc162eb53 SHA1 f801e81c1262363f7b8d5dbade471a68d51aea45 SHA256 7be2c15995919621b0815ee4689d3f869fb931f9f905fae54a052190a3ad60d9
 AUX vte-0.24.1-cleanup-background.patch 5172 RMD160 112b01003a0e520a65a2a1897c44e65c6b1480dd SHA1 ec2bb75c27e8dda79e2b3e6e20562e960a4e7cfc SHA256 9e6535c6643b4d7fde55477d2c4f9ef0b077fb587311636ba07eca60e4461f9e
+AUX vte-0.24.2-invisible-cursor.patch 1198 RMD160 256b529c689fa90b5f121245e56b639129bf0f5e SHA1 7616321cb9cfc822b9eff7a39302b4d30e6cc1aa SHA256 80f129c57f84fc8a23ed01861680ec6a4014e121ea39f1e7db603f52624a8124
+AUX vte-0.24.2-invisible-cursor2.patch 913 RMD160 2b932c794aed0505355fc77ef8dcc5ea6511a4f5 SHA1 be10152b1c1199d86f1be5107999bcec448d1a56 SHA256 f3d666a2837f82dd66b767124cfeb337f1b127f574d60a2d1ecbd4c907dc0532
 DIST vte-0.17.4.tar.bz2 1084847 RMD160 8fa3ccc35bc9ef8c204b058b180f532ba6fe7a1a SHA1 fe4a3ec476c97d0f385249ee60edb12887b69575 SHA256 50ae10aea7fa99c9ae296031782c18ac15663e84eb6ecd94cd0a18c7843987d2
 DIST vte-0.20.5.tar.bz2 1328766 RMD160 88e2067a67eea8a6f067d4a5851c0222fde7d468 SHA1 8e3a471183258d5f0ca807465e5b86bb29a3d110 SHA256 d69ec08804eaa03beef93d39b1cb56ecb98a492f1dd091343b69303ef999681b
 DIST vte-0.22.5.tar.bz2 1351975 RMD160 4fde6a39f81eb8440d467afbb1410e03f8e83fe4 SHA1 c9dd126991cf6d50ac3c678c0e117a5b2fefc180 SHA256 c0987126347e12daf2bf9b772b6c58ddf8a922f5b8341470ed578d9fcea7b2f6
-DIST vte-0.24.1.tar.bz2 1312731 RMD160 a2ee4744b144e0beab536482bce4142753bcbcf4 SHA1 67e5de8a0f024c0c4a564c69ccd3988284ddc80a SHA256 a4b287881993602884db2c5be0ed9e4bed2265091ef91671fe43fc8d5921e00c
+DIST vte-0.24.2.tar.bz2 1312996 RMD160 f89c4fbd6032d0860c4ab51bbec0f837236170b3 SHA1 d4327abe435c6c8908907302740528d2e3038717 SHA256 e4f4dd0523420b16e82bb281fe2492e941eaec17a00e66920c87c4a16b0c3b14
 EBUILD vte-0.17.4-r3.ebuild 1234 RMD160 d29ffd397d700fd4303fd1553b536015e6afaf2d SHA1 ab80da1521814d1fd0de2fca08872e501c21f6a1 SHA256 d3e6532ec8d2dcea3474f54b1faac7f4ed38a031a01efd49a1f40406b5857872
 EBUILD vte-0.20.5.ebuild 1154 RMD160 24a2875140fed6a5205cbc7de8290ee1a9a26569 SHA1 a7b1d51fbc6120018ca7a38f25db731bc740475b SHA256 5eb08b9853a67d71a29e511d587e384d8c53df160b64120732b541afa1055581
 EBUILD vte-0.22.5.ebuild 1020 RMD160 8e3f238a94338b5e77ae5c6889550e07d9901cd9 SHA1 481dd054515d2f71d5e1fd5f5d6d6875dc8fe0f7 SHA256 1d8afc6814ad26b535694e2a34884daefc93cbde04f3c2c22f75fc2ed2ca001f
-EBUILD vte-0.24.1-r1.ebuild 1285 RMD160 0e6e27f613c2df7f759395fe4e0c3eaf4f22f766 SHA1 6905abb397f2fa18f887a8f48a906f6856aeffc3 SHA256 e6d2c395aceeaeb2eef82b8eb89c92c25244116f1b257dc5a1eaf5689f478ac8
-MISC ChangeLog 31727 RMD160 a0c0ce3bcdf2dcd1388898b2b977b362b40c9740 SHA1 cd109cd1611dc8bab7a3643b7b40a8e21db26908 SHA256 6bbebfb8a3b948f68ae874e6b3ceb4f719c1532a3dd626ac47424867fd0b35bf
+EBUILD vte-0.24.2.ebuild 1763 RMD160 f3f2f65c9192d8e1b6062bf2318d5417aa98f836 SHA1 04ef8861a46f20e92104652a89aa629bce6e6ed9 SHA256 f67b735d91f61c108aa1568fed30b2837ffb7a0b85232682ab94a0b7f8d1526b
+MISC ChangeLog 32360 RMD160 3e91ce146c6bc0e45165438b75f85797536527cf SHA1 17358c5344dc4bb7251e4850cd3a6e8b86878f8c SHA256 2d393bd1e73c0e4d3ea2e7a8653e7d47d8003defd1d7a559c699a7b3b7fb2605
 MISC metadata.xml 250 RMD160 4e46249cd3426e09b6f462c29ea489724464f51c SHA1 96ab3cf6c39bb44e33d788425a99ddd337a31eeb SHA256 86cd2180b3599ddb2bef78131a9c86a37fa1ee7247aa3245e11e7ff6a239e2e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwaeIcACgkQCaWpQKGI+9SnkACdE327cxeEr7LwFPVYq29Pd89e
-i34AnRNB1DXxv5F468MOj8DROotaNZAO
-=oiKZ
+iEYEARECAAYFAkwiIcYACgkQCaWpQKGI+9Q0PACfcQwCFrx4ferLzpHYIjX7rxJC
+aboAnRjNqOXaEQMfS3FWtm7k0zt3TMFH
+=on8D
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/vte/files/vte-0.24.2-invisible-cursor.patch b/x11-libs/vte/files/vte-0.24.2-invisible-cursor.patch
new file mode 100644
index 000000000000..59380f9561fe
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.24.2-invisible-cursor.patch
@@ -0,0 +1,39 @@
+From b58bc5359085d2c9233ac6d6a265645bfa217e82 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad@behdad.org>
+Date: Wed, 31 Mar 2010 18:05:10 +0000
+Subject: Bug 602596 - Cursor can become invisible
+
+Always compute the full fore/back color first, then reverse.
+That's what xterm does also.
+---
+diff --git a/src/vte.c b/src/vte.c
+index 178010b..c6844e9 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -8760,10 +8760,6 @@ vte_terminal_determine_colors(VteTerminal *terminal,
+ 	if (highlight && !cursor && terminal->pvt->highlight_color_set) {
+ 		*fore = cell ? cell->attr.fore : VTE_DEF_FG;
+ 		*back = VTE_DEF_HL;
+-	} else
+-	if (reverse ^ ((cell != NULL) && (cell->attr.reverse))) {
+-		*fore = cell ? cell->attr.back : VTE_DEF_BG;
+-		*back = cell ? cell->attr.fore : VTE_DEF_FG;
+ 	} else {
+ 		*fore = cell ? cell->attr.fore : VTE_DEF_FG;
+ 		*back = cell ? cell->attr.back : VTE_DEF_BG;
+@@ -8796,6 +8792,13 @@ vte_terminal_determine_colors(VteTerminal *terminal,
+ 			}
+ 		}
+ 	}
++
++	if (reverse ^ ((cell != NULL) && (cell->attr.reverse))) {
++	  int tmp;
++	  tmp = *fore;
++	  *fore = *back;
++	  *back = tmp;
++	}
+ }
+ 
+ /* Check if a unicode character is actually a graphic character we draw
+--
+cgit v0.8.3.1
diff --git a/x11-libs/vte/files/vte-0.24.2-invisible-cursor2.patch b/x11-libs/vte/files/vte-0.24.2-invisible-cursor2.patch
new file mode 100644
index 000000000000..633e9c3baa0d
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.24.2-invisible-cursor2.patch
@@ -0,0 +1,34 @@
+From f412a6f73a7b3a432bb88830b63ee25ea648619d Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad@behdad.org>
+Date: Thu, 01 Apr 2010 05:34:18 +0000
+Subject: Followup on Bug 602596 - Cursor can become invisible
+
+Fix invisible attribute.
+---
+diff --git a/src/vte.c b/src/vte.c
+index c6844e9..eddf06b 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -8767,9 +8767,6 @@ vte_terminal_determine_colors(VteTerminal *terminal,
+ 
+ 	/* Handle invisible, bold, and standout text by adjusting colors. */
+ 	if (cell) {
+-		if (cell->attr.invisible) {
+-			*fore = *back;
+-		}
+ 		if (cell->attr.bold) {
+ 			if (*fore == VTE_DEF_FG) {
+ 				*fore = VTE_BOLD_FG;
+@@ -8799,6 +8796,10 @@ vte_terminal_determine_colors(VteTerminal *terminal,
+ 	  *fore = *back;
+ 	  *back = tmp;
+ 	}
++
++	if (cell && cell->attr.invisible) {
++		*fore = *back;
++	}
+ }
+ 
+ /* Check if a unicode character is actually a graphic character we draw
+--
+cgit v0.8.3.1
diff --git a/x11-libs/vte/vte-0.24.1-r1.ebuild b/x11-libs/vte/vte-0.24.2.ebuild
index 2d93f8f6f5a4..b20fe9d324ce 100644
--- a/x11-libs/vte/vte-0.24.1-r1.ebuild
+++ b/x11-libs/vte/vte-0.24.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.24.1-r1.ebuild,v 1.1 2010/06/17 19:33:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.24.2.ebuild,v 1.1 2010/06/23 15:01:20 pacho Exp $
 
 EAPI="2"
 
@@ -44,7 +44,15 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# Fix ugly artifacts with upstream patches from bgo#618749
-	epatch "${FILESDIR}/${P}-background-color.patch"
-	epatch "${FILESDIR}/${P}-background-color2.patch"
-	epatch "${FILESDIR}/${P}-cleanup-background.patch"
+	# FIXME: Second patch needs to be skipped since it causes problems with
+	# x11-terms/terminal, see bug #324631. If this is not solved by upstream,
+	# the problem could reappear with >=x11-libs/vte-0.25.2
+	epatch "${FILESDIR}/${PN}-0.24.1-background-color.patch"
+#	epatch "${FILESDIR}/${PN}-0.24.1-background-color2.patch"
+	epatch "${FILESDIR}/${PN}-0.24.1-cleanup-background.patch"
+
+	# Prevent cursor from become invisible, bgo#602596
+	# FIXME: The following patches cannot be applied until bug #323443 is solved.
+#	epatch "${FILESDIR}/${PN}-0.24.2-invisible-cursor.patch"
+#	epatch "${FILESDIR}/${PN}-0.24.2-invisible-cursor2.patch"
 }