Fix up Alt<>Meta confusion with recent gtk

.gitignore

@@ -0,0 +1,12 @@
+/vte-0.27.0.tar.bz2
+/vte-0.27.2-gitd512516.tar.bz2
+/vte-0.27.2.tar.bz2
+/vte-0.27.3.tar.bz2
+/vte-0.27.4.tar.bz2
+/vte-0.27.5.tar.bz2
+/vte-0.27.90.tar.bz2
+/vte-0.28.0.tar.bz2
+/vte-0.28.1.tar.xz
+/vte-0.29.1.tar.xz
+/vte-0.30.0.tar.xz
+/vte-0.30.1.tar.xz

dead.package

@@ -1 +0,0 @@
-Retire vte3 now that all dependencies have been ported to newer vte291.

honey-I-shrank-the-terminal.patch

@@ -0,0 +1,28 @@
+diff -up vte-0.27.4/src/vte.c.grow-up vte-0.27.4/src/vte.c
+--- vte-0.27.4/src/vte.c.grow-up	2011-01-11 13:37:37.000000000 -0500
++++ vte-0.27.4/src/vte.c	2011-01-14 11:31:27.159520002 -0500
+@@ -8133,6 +8133,24 @@ vte_terminal_init(VteTerminal *terminal)
+ 
+ 	_vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_terminal_init()\n");
+ 
++#if GTK_CHECK_VERSION (2, 91, 2)
++       static GtkCssProvider *provider;
++       GtkStyleContext *context;
++
++       if (provider == NULL) {
++               provider = gtk_css_provider_new ();
++               gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider),
++                                                "VteTerminal {\n"
++                                                "  -VteTerminal-inner-border: 1;\n"
++                                                "}\n", -1, NULL);
++       }
++
++       context = gtk_widget_get_style_context (GTK_WIDGET (terminal));
++       gtk_style_context_add_provider (context,
++                                       GTK_STYLE_PROVIDER (provider),
++                                       GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++#endif
++
+ 	/* Initialize private data. */
+ 	pvt = terminal->pvt = G_TYPE_INSTANCE_GET_PRIVATE (terminal, VTE_TYPE_TERMINAL, VteTerminalPrivate);
+ 

sources

@@ -0,0 +1 @@
+514f48346f176f91297731f6fdb1cffc  vte-0.30.1.tar.xz

vte-alt-meta-confusion.patch

@@ -0,0 +1,74 @@
+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 +-
+ 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
++++ 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.rc3
+

vte3.spec

@@ -0,0 +1,142 @@
+Name: vte3
+Version: 0.30.1
+Release: 3%{?dist}
+Summary: A terminal emulator
+License: LGPLv2+
+Group: User Interface/X
+#VCS: git:git://git.gnome.org/vte
+Source: http://download.gnome.org/sources/vte/0.30/vte-%{version}.tar.xz
+Patch0: honey-I-shrank-the-terminal.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=663779
+Patch1: vte-alt-meta-confusion.patch
+
+BuildRequires: gtk3-devel >= 3.0.0
+BuildRequires: ncurses-devel
+BuildRequires: gettext
+BuildRequires: libXt-devel
+BuildRequires: intltool
+BuildRequires: gobject-introspection-devel
+
+# initscripts creates the utmp group
+Requires: initscripts
+
+%description
+VTE is a terminal emulator widget for use with GTK+.
+
+%package devel
+Summary: Files needed for developing applications which use vte
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: ncurses-devel
+
+%description devel
+The vte-devel package includes the header files and developer docs
+for the vte package.
+
+Install vte-devel if you want to develop programs which will use
+vte.
+
+%prep
+%setup -q -n vte-%{version}
+%patch0 -p1 -b .grow-up
+%patch1 -p1 -b .alt-meta
+
+%build
+%configure \
+        --enable-shared \
+        --disable-static \
+        --with-gtk=3.0 \
+        --libexecdir=%{_libdir}/vte-2.90 \
+        --without-glX \
+        --disable-gtk-doc \
+        --enable-introspection
+make
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%find_lang vte-2.90
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files -f vte-2.90.lang
+%doc COPYING HACKING NEWS README
+%doc src/iso2022.txt
+%doc doc/utmpwtmp.txt doc/boxes.txt doc/openi18n/UTF-8.txt doc/openi18n/wrap.txt
+%{_libdir}/*.so.*
+%dir %{_libdir}/vte-2.90
+%attr(2711,root,utmp) %{_libdir}/vte-2.90/gnome-pty-helper
+%{_datadir}/vte
+%{_libdir}/girepository-1.0
+
+%files devel
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+%{_bindir}/vte2_90
+%doc %{_datadir}/gtk-doc/html/vte-2.90
+%{_datadir}/gir-1.0
+
+
+%changelog
+* Mon Dec 12 2011 Matthias Clasen <mclasen@redhat.com> - 0.30.1-3
+- Fix problems with Alt<>Meta with recent gtk
+
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.30.1-2
+- Rebuilt for glibc bug#747377
+
+* Tue Oct 18 2011 Matthias Clasen <mclasen@redhat.com> - 0.30.1-1
+- Update to 0.30.1
+
+* Tue Sep 27 2011 Ray <rstrode@redhat.com> - 0.30.0-1
+- Update to 0.30.0
+
+* Wed Aug 31 2011 Matthias Clasen <mclasen@redhat.com> - 0.29.1-1
+- Update to 0.29.1
+
+* Thu Jun 16 2011 Tomas Bzatek <tbzatek@redhat.com> - 0.28.1-1
+- Update to 0.28.1
+
+* Mon Apr  4 2011 Matthias Clasen <mclasen@redhat.com> 0.28.0-1
+- Update to 0.28.0
+
+* Thu Feb 24 2011 Matthias Clasen <mclasen@redhat.com> 0.27.90-2
+- Enable introspection
+
+* Tue Feb 22 2011 Matthias Clasen <mclasen@redhat.com> 0.27.90-1
+- Update to 0.27.90
+
+* Thu Feb 10 2011 Matthias Clasen <mclasen@redhat.com> 0.27.5-3
+- Rebuild against newer gtk
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.27.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Feb  2 2011 Matthias Clasen <mclasen@redhat.com> 0.27.5-1
+- 0.27.5
+
+* Fri Jan 14 2011 Matthias Clasen <mclasen@redhat.com> 0.27.4-2
+- Stop shrinking-terminal disease
+
+* Tue Jan 11 2011 Matthias Clasen <mclasen@redhat.com> 0.27.4-1
+- Update to 0.27.4
+
+* Fri Jan  7 2011 Matthias Clasen <mclasen@redhat.com> 0.27.3-1
+- Update to 0.27.3
+
+* Fri Dec  3 2010 Matthias Clasen <mclasen@redhat.com> 0.27.2-2
+- Rebuild against new gtk
+
+* Thu Nov 11 2010 Matthias Clasen <mclasen@redhat.com> 0.27.2-1
+- Update to 0.27.2
+
+* Mon Nov  1 2010 Matthias Clasen <mclasen@redhat.com> 0.27.2-0.1.git512516
+- Git snapshot that builds with recent gtk3
+
+* Mon Oct  4 2010 Matthias Clasen <mclasen@redhat.com> 0.27.0-1
+- Initial packaging