Update to 0.36.3

.gitignore

@@ -24,3 +24,7 @@
 /vte-0.34.6.tar.xz
 /vte-0.34.7.tar.xz
 /vte-0.34.8.tar.xz
+/vte-0.34.9.tar.xz
+/vte-0.36.1.tar.xz
+/vte-0.36.2.tar.xz
+/vte-0.36.3.tar.xz

honey-I-shrank-the-terminal.patch

@@ -1,28 +0,0 @@
-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

@@ -1 +1 @@
-b16a21d09322a41f6c82a0bdd8241467  vte-0.34.8.tar.xz
+3f9df4c9a67b09bf5c660bf5c3bae109  vte-0.36.3.tar.xz

vte-alt-meta-confusion.patch

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

@@ -1,14 +1,11 @@
 Name: vte3
-Version: 0.34.8
+Version: 0.36.3
 Release: 1%{?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.34/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
+Source: http://download.gnome.org/sources/vte/0.36/vte-%{version}.tar.xz
 # https://bugzilla.gnome.org/show_bug.cgi?id=688456
 Patch2: 0001-widget-Only-show-the-cursor-on-motion-if-moved.patch
 
@@ -18,6 +15,7 @@ BuildRequires: gettext
 BuildRequires: libXt-devel
 BuildRequires: intltool
 BuildRequires: gobject-introspection-devel
+BuildRequires: appdata-tools
 
 # initscripts creates the utmp group
 Requires: initscripts
@@ -40,8 +38,6 @@ vte.
 
 %prep
 %setup -q -n vte-%{version}
-%patch0 -p1 -b .grow-up
-%patch1 -p1 -b .alt-meta
 %patch2 -p1 -b .motion
 
 %build
@@ -90,6 +86,21 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %changelog
+* Tue Jul 15 2014 Richard Hughes <rhughes@redhat.com> - 0.36.3-1
+- Update to 0.36.3
+
+* Thu May 22 2014 Debarshi Ray <rishi@fedoraproject.org> - 0.36.2-2
+- Backport fix for disappearing mouse cursor (GNOME #725342)
+
+* Tue May 13 2014 Richard Hughes <rhughes@redhat.com> - 0.36.2-1
+- Update to 0.36.2
+
+* Mon Apr 28 2014 Richard Hughes <rhughes@redhat.com> - 0.36.1-1
+- Update to 0.36.1
+
+* Tue Oct 15 2013 Richard Hughes <rhughes@redhat.com> - 0.34.9-1
+- Update to 0.34.9
+
 * Wed Sep 18 2013 Kalev Lember <kalevlember@gmail.com> - 0.34.8-1
 - Update to 0.34.8