diff --git a/.gitignore b/.gitignore index 8cb08d4..67ec908 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ /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 diff --git a/sources b/sources index ec573b6..e72de22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -33088ad48b02324b9530c50ffb1312df vte-0.28.1.tar.xz +514f48346f176f91297731f6fdb1cffc vte-0.30.1.tar.xz diff --git a/vte-alt-meta-confusion.patch b/vte-alt-meta-confusion.patch new file mode 100644 index 0000000..bd364be --- /dev/null +++ b/vte-alt-meta-confusion.patch @@ -0,0 +1,74 @@ +From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +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 + diff --git a/vte3.spec b/vte3.spec index f8c8b84..15cdb7b 100644 --- a/vte3.spec +++ b/vte3.spec @@ -1,13 +1,14 @@ Name: vte3 -Version: 0.28.1 -Release: 1%{?dist} +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.28/vte-%{version}.tar.xz +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 @@ -38,6 +39,7 @@ vte. %prep %setup -q -n vte-%{version} %patch0 -p1 -b .grow-up +%patch1 -p1 -b .alt-meta %build %configure \ @@ -63,7 +65,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %postun -p /sbin/ldconfig %files -f vte-2.90.lang -%defattr(-,root,root) %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 @@ -74,7 +75,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/girepository-1.0 %files devel -%defattr(-,root,root) %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/* @@ -84,6 +84,21 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %changelog +* Mon Dec 12 2011 Matthias Clasen - 0.30.1-3 +- Fix problems with Alt<>Meta with recent gtk + +* Wed Oct 26 2011 Fedora Release Engineering - 0.30.1-2 +- Rebuilt for glibc bug#747377 + +* Tue Oct 18 2011 Matthias Clasen - 0.30.1-1 +- Update to 0.30.1 + +* Tue Sep 27 2011 Ray - 0.30.0-1 +- Update to 0.30.0 + +* Wed Aug 31 2011 Matthias Clasen - 0.29.1-1 +- Update to 0.29.1 + * Thu Jun 16 2011 Tomas Bzatek - 0.28.1-1 - Update to 0.28.1