Add a patch to unbreak Alt key handling with gtk+-3.2.2.

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

4 files changed, 97 insertions, 7 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index ef90300530ce..d494c84022b2 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,12 @@
 # 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.296 2011/10/30 17:48:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.297 2011/11/15 08:30:04 tetromino Exp $
+
+*vte-0.30.1-r1 (15 Nov 2011)
+
+  15 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +vte-0.30.1-r1.ebuild, +files/vte-0.30.1-alt-meta.patch:
+  Add a patch to unbreak Alt key handling with gtk+-3.2.2.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org> vte-0.28.2-r300.ebuild:
   alpha/ia64/sh/sparc stable wrt #385699
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index bc9df3f64861..c2c5c5992dfb 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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
 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,13 +11,14 @@ EBUILD vte-0.28.1-r200.ebuild 1457 RMD160 2d65682be75db9599ae56deff82523e48e29b3
 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-r300.ebuild 1567 RMD160 c564aa72b71ad1c2d411361892f1bed739117d1c SHA1 1998d72c2d9caebb00dd3891b0c55948edc58832 SHA256 11f8178c363e695a505bf43cdf2fb701e960f3c375b74573630413c8f6e1b6ae
+EBUILD vte-0.30.1-r1.ebuild 1431 RMD160 da9a9177c5da702dd0289510b360b1c437f0494f SHA1 b4453bc444b6e24d30ee768353b7a0f7bf9dfa7b SHA256 e98039a7c0f034ed324f202bf17018b0a3bf789dd261695af5709de8409fae12
 EBUILD vte-0.30.1.ebuild 1285 RMD160 9c6dba2c5115219282554a02a5c4e7486f8aa555 SHA1 bb6552676e5e0ca560a01d0689216393d5beabda SHA256 b4c5cfdc1c2e697b7659c6d23cc97a5f0dc44e69e6af046764be8f65ad695ca6
-MISC ChangeLog 39091 RMD160 5d053f8fe1e34be418e474c5d8aa926e51da88e2 SHA1 0a81a057efb63d0a33398ff232c01c0945e6ede5 SHA256 db334b6a892aa0e0c8fcad953cdb42d6466152afe6d7b6842efb480b824829fe
+MISC ChangeLog 39301 RMD160 cf6f9866cad3c33d7195e674e44e95f8a97acd16 SHA1 46e8366ac4974d31747513287a6edde1c89c66ce SHA256 d47ad584528bbeea38010491a7901065f25bb5758bdc29ce443b8d11948ed4f9
 MISC metadata.xml 350 RMD160 c81d1e1776ed27ef7418cdc46a686e2b6a9dbdeb SHA1 8063a6278411458adbfa260f11d53687a6881f3b SHA256 16e77360aaa3f204d03bfad2997aabf51d51c3360f59f6c4d5f24076e9bae0d1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6tjf8ACgkQuQc30/atMkBjoACgp1BfrOSBnudTzZz/DiYqWLu4
-YEEAn3Z87n2npHib/wiBtu+yHpey3kk1
-=w5Aj
+iF4EAREIAAYFAk7CIxIACgkQdjK8w9WeBnDciwEAqyKak+TjLtYKXNIY5ezuiey9
+Yeaa4v8X2/LbQw6a5y0BAJ9J2IPkvK0wDPwqmmbhZCHSNadApxrI5sqESmlpq5DS
+=rklD
 -----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
new file mode 100644
index 000000000000..9ea611fde51c
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
@@ -0,0 +1,27 @@
+From 299e28dd3e5549b13ec54de991d583ac6a6ff11e 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
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663779
+---
+ src/keymap.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/keymap.h b/src/keymap.h
+index 243e22e..21d9b8e 100644
+--- a/src/keymap.h
++++ b/src/keymap.h
+@@ -27,7 +27,7 @@
+ 
+ G_BEGIN_DECLS
+ 
+-#define VTE_META_MASK		GDK_META_MASK
++#define VTE_META_MASK		(GDK_META_MASK | GDK_MOD1_MASK)
+ #define VTE_NUMLOCK_MASK	GDK_MOD2_MASK
+ 
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+-- 
+1.7.8.rc1
+
diff --git a/x11-libs/vte/vte-0.30.1-r1.ebuild b/x11-libs/vte/vte-0.30.1-r1.ebuild
new file mode 100644
index 000000000000..b901b3835ade
--- /dev/null
+++ b/x11-libs/vte/vte-0.30.1-r1.ebuild
@@ -0,0 +1,55 @@
+# 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.1 2011/11/15 08:30:04 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="GNOME terminal widget"
+HOMEPAGE="http://git.gnome.org/browse/vte"
+
+LICENSE="LGPL-2"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc glade +introspection"
+
+PDEPEND="x11-libs/gnome-pty-helper"
+RDEPEND=">=dev-libs/glib-2.26:2
+	>=x11-libs/gtk+-3.1.9:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses
+	x11-libs/libX11
+	x11-libs/libXft
+
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	sys-devel/gettext
+	doc? ( >=dev-util/gtk-doc-1.13 )"
+
+pkg_setup() {
+	# Python bindings are via gobject-introspection
+	# Ex: from gi.repository import Vte
+	G2CONF="${G2CONF}
+		--disable-gnome-pty-helper
+		--disable-deprecation
+		--disable-maintainer-mode
+		--disable-static
+		$(use_enable debug)
+		$(use_enable glade glade-catalogue)
+		$(use_enable introspection)"
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+}
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
+	epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
+
+	gnome2_src_prepare
+}