Update meta key patch to fix Alt-? and Alt-/ handling.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

5 files changed, 68 insertions, 13 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index 01a11e5db6e6..5d3afbfb4710 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/vte
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.299 2011/11/16 20:54:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.300 2011/11/18 08:48:37 tetromino Exp $
+
+*vte-0.30.1-r2 (18 Nov 2011)
+*vte-0.28.2-r202 (18 Nov 2011)
+
+  18 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -vte-0.28.2-r201.ebuild, +vte-0.28.2-r202.ebuild, -vte-0.30.1-r1.ebuild,
+  +vte-0.30.1-r2.ebuild, files/vte-0.30.1-alt-meta.patch:
+  Update meta key patch to fix Alt-? and Alt-/ handling.
 
   16 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   vte-0.28.2-r201.ebuild, vte-0.30.1-r1.ebuild:
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 5870db5c93bb..e60ab987c5c4 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX vte-0.28.0-fix-gdk-targets.patch 1118 RMD160 b0c49ea17fdb498facf335931d66c9e55a52d0e4 SHA1 9b49f9b12d3031fab3b14320bccb8305eac8051f SHA256 660edc007fd8f5daafdcf2b91b1da5b1d70c1295cdf61e6da28964a06bca126f
-AUX vte-0.30.1-alt-meta.patch 755 RMD160 6c35dea45ef30279d25f1cdebd2fa4ddd917d0c8 SHA1 236210066e78cf64588012900586c5f4e76f5f58 SHA256 d4cbe14fda06b5481242b82632e528c1d52e27698eda5097b72a5675ead73db2
+AUX vte-0.30.1-alt-meta.patch 2490 RMD160 33e285f9288bf9f320e3e6d247b15abca20b55c0 SHA1 5f611947b0c7de2e21ab3f8f3f4387f32160e56a SHA256 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6
 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
 DIST vte-0.28.1.tar.xz 963496 RMD160 48b6423cc688a07d7864738dd864261b33313aae SHA1 528191c07aaf7f315fba7585bd427616a56dedd1 SHA256 ad1b868356e0231c42ac2493d3e2a7726014c9dc4110ec89fbb01aee8c2ed7ad
 DIST vte-0.28.2.tar.xz 962340 RMD160 8f3396d4e98023b74898e938331917b181964158 SHA1 b0af0701ef9d6c7ede9c578366b12a70ac47ab66 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae
@@ -10,16 +10,16 @@ DIST vte-0.30.1.tar.xz 951688 RMD160 f4de2cf9a1fdeb583cb849eed3d231ae8450369c SH
 EBUILD vte-0.28.1-r200.ebuild 1457 RMD160 2d65682be75db9599ae56deff82523e48e29b310 SHA1 be479c333d93b1d05beec343716ad744dc21ecf7 SHA256 e8864a1042a76bf1f8597ea87de4a707b073c3ac40e959033d8e934a2099c2f2
 EBUILD vte-0.28.1-r300.ebuild 1458 RMD160 94d6ccea4d9be8dbdf71521e605ade040616fb65 SHA1 e9a2ae9c3527e6cb275e95ede2a7a9578c26b8d3 SHA256 0ef5199b303c8a03fcf577af4dbeb25aa3fa41bc9082b3bdb11bc53d3ee1837f
 EBUILD vte-0.28.2-r200.ebuild 1456 RMD160 32ae2e713fbdeebb0ccffce981d27c97422221a9 SHA1 cb95f9ff875e0dd121064faa1ebd89d377bb5bdd SHA256 d515fdf88e0a2fe69cdee2b61a623f75f2960ac3fd7dde5b90ca092d38b8e502
-EBUILD vte-0.28.2-r201.ebuild 1623 RMD160 4b15797b237cbbfc954d53e489d3f6083e38cdb5 SHA1 16e412214963effc48aaa886c2e4af6441373bbd SHA256 cf1d737cec59c1aa37d68858c7457ab81e1d8ee54f00b36a3f3936a84a10542e
+EBUILD vte-0.28.2-r202.ebuild 1623 RMD160 f3ec0221872ccb0c07b019f1a19232e5377905f9 SHA1 c3bb1de33ca80f0cdde4868ac567e89c16415ec2 SHA256 7c44dbcf35260e8cfe80e9aa7327094f9791188ce69d708430f60c29bfe24c39
 EBUILD vte-0.28.2-r300.ebuild 1567 RMD160 c564aa72b71ad1c2d411361892f1bed739117d1c SHA1 1998d72c2d9caebb00dd3891b0c55948edc58832 SHA256 11f8178c363e695a505bf43cdf2fb701e960f3c375b74573630413c8f6e1b6ae
-EBUILD vte-0.30.1-r1.ebuild 1438 RMD160 eabdce2ecd2f0d6783d8b6dce9f8adf261012c81 SHA1 b034c347000c06f9488405a00fb3c886d8f62a29 SHA256 d1505c19370c9c8808e7d57907a240992d2b73cb93c05c5feb8d3f2b19a808de
+EBUILD vte-0.30.1-r2.ebuild 1438 RMD160 3606b41e67877a34b0da177c77eb458332ac5d0d SHA1 6849f0a94c56a61709c9921cad2f9c3ac07684b5 SHA256 5887d92f584c90d323dbe9fdd5357e7f0b887af93d14fb5712c2f65cb8511bfa
 EBUILD vte-0.30.1.ebuild 1285 RMD160 9c6dba2c5115219282554a02a5c4e7486f8aa555 SHA1 bb6552676e5e0ca560a01d0689216393d5beabda SHA256 b4c5cfdc1c2e697b7659c6d23cc97a5f0dc44e69e6af046764be8f65ad695ca6
-MISC ChangeLog 39690 RMD160 a36a2cf1fdf8fdbab1e1d0af9a376a83df1d2847 SHA1 9508c5fce3867f2f71d2a344634958810df125cb SHA256 ef92fa8088b9a7fe1a10b30e55ba4e7c3cbf56817e1dc16f2f9a57fea41d5788
+MISC ChangeLog 40001 RMD160 37af3d0bfcf560aa3cfc6dcd18d4cef8158efc55 SHA1 2911bca0f405def66bf6cae3b568a2b2acbdc2f6 SHA256 feed0a284ccb96861dfe250a969f36b24ff02b1cf89bf60f01721453c4d47e6a
 MISC metadata.xml 350 RMD160 c81d1e1776ed27ef7418cdc46a686e2b6a9dbdeb SHA1 8063a6278411458adbfa260f11d53687a6881f3b SHA256 16e77360aaa3f204d03bfad2997aabf51d51c3360f59f6c4d5f24076e9bae0d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7EIx4ACgkQdjK8w9WeBnDSpAEAhwbxE5v79u0U51V3DyMDfyVe
-1KunVUfoCjlFuz1Do7AA/3AZYn/WsWA1qvzG+1XkELaRWKGHT+4GZUW/kAhUUn6A
-=MDJU
+iF4EAREIAAYFAk7GG+sACgkQdjK8w9WeBnDI9gEAgEpJyHHcM//XG1YFgXbowZps
+VJD67CkP55hkhLXMSI8A/jws4oQ9QS8SenzlbAYxAa4kgSy0GZ+dIs+5A8pXliZD
+=a0Xj
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
index 9ea611fde51c..bd364be5846c 100644
--- a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
+++ b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
@@ -1,14 +1,61 @@
-From 299e28dd3e5549b13ec54de991d583ac6a6ff11e Mon Sep 17 00:00:00 2001
+From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Tue, 15 Nov 2011 03:06:40 -0500
 Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2
  compatibility
 
+Also, since VTE_META_MASK is now a mask with multiple bits set, code that
+compares gdk key modifiers to VTE_META_MASK by numerical equality is no
+longer guaranteed to work. Therefore, for such comparisons a new function,
+vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits
+matching matching VTE_META_MASK are set, then all are set.
+
 https://bugzilla.gnome.org/show_bug.cgi?id=663779
 ---
+ src/keymap.c |   15 +++++++++++++--
  src/keymap.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 2 files changed, 14 insertions(+), 3 deletions(-)
 
+diff --git a/src/keymap.c b/src/keymap.c
+index 9a21669..95b4c5b 100644
+--- a/src/keymap.c
++++ b/src/keymap.c
+@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
+ 	{GDK_KEY (F35),		_vte_keymap_GDK_F35},
+ };
+ 
++/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
++ * despite being a compound mask, is treated as indivisible. */
++GdkModifierType
++_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
++		GdkModifierType mask)
++{
++	if (modifiers & VTE_META_MASK)
++		modifiers |= VTE_META_MASK;
++	return modifiers & mask;
++}
++
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+  * a literal string or a capability name. */
+ void
+@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
+ 	} else {
+ 		fkey_mode = fkey_default;
+ 	}
+-	modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
++	modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
+ 
+ 	/* Search for the conditions. */
+ 	for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
+@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
+ 		return;
+ 	}
+ 
+-	switch (modifiers & significant_modifiers) {
++	switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) {
+ 	case 0:
+ 		modifier = 0;
+ 		break;
 diff --git a/src/keymap.h b/src/keymap.h
 index 243e22e..21d9b8e 100644
 --- a/src/keymap.h
@@ -23,5 +70,5 @@ index 243e22e..21d9b8e 100644
  
  /* Map the specified keyval/modifier setup, dependent on the mode, to either
 -- 
-1.7.8.rc1
+1.7.8.rc3
 
diff --git a/x11-libs/vte/vte-0.28.2-r201.ebuild b/x11-libs/vte/vte-0.28.2-r202.ebuild
index 2ed069a11282..744b8db19a28 100644
--- a/x11-libs/vte/vte-0.28.2-r201.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r202.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.2-r201.ebuild,v 1.2 2011/11/16 20:54:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.2-r202.ebuild,v 1.1 2011/11/18 08:48:37 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
diff --git a/x11-libs/vte/vte-0.30.1-r1.ebuild b/x11-libs/vte/vte-0.30.1-r2.ebuild
index 238ee7b73993..80a32dd16446 100644
--- a/x11-libs/vte/vte-0.30.1-r1.ebuild
+++ b/x11-libs/vte/vte-0.30.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.30.1-r1.ebuild,v 1.2 2011/11/16 20:54:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.30.1-r2.ebuild,v 1.1 2011/11/18 08:48:37 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"