r31589 - in /desktop/unstable/vte3/debian: changelog patches/02_meta.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Nov 19 13:02:22 UTC 2011
Author: joss
Date: Sat Nov 19 13:02:20 2011
New Revision: 31589
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31589
Log:
02_meta.patch: workaround for Meta key being broken since the GTK+
3.2.2 upgrade. Closes: #648975.
Added:
desktop/unstable/vte3/debian/patches/02_meta.patch
Modified:
desktop/unstable/vte3/debian/changelog
desktop/unstable/vte3/debian/patches/series
Modified: desktop/unstable/vte3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/changelog?rev=31589&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/changelog [utf-8] (original)
+++ desktop/unstable/vte3/debian/changelog [utf-8] Sat Nov 19 13:02:20 2011
@@ -1,8 +1,10 @@
-vte3 (1:0.30.1-2) UNRELEASED; urgency=low
+vte3 (1:0.30.1-2) unstable; urgency=low
* libvte-2.90-9.symbols: add correct Build-Depends-Package.
-
- -- Josselin Mouette <joss at debian.org> Sat, 12 Nov 2011 18:00:41 +0100
+ * 02_meta.patch: workaround for Meta key being broken since the GTK+
+ 3.2.2 upgrade. Closes: #648975.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 19 Nov 2011 14:02:12 +0100
vte3 (1:0.30.1-1) experimental; urgency=low
Added: desktop/unstable/vte3/debian/patches/02_meta.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/patches/02_meta.patch?rev=31589&op=file
==============================================================================
--- desktop/unstable/vte3/debian/patches/02_meta.patch (added)
+++ desktop/unstable/vte3/debian/patches/02_meta.patch [utf-8] Sat Nov 19 13:02:20 2011
@@ -1,0 +1,74 @@
+From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino at 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
+
Modified: desktop/unstable/vte3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/patches/series?rev=31589&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/vte3/debian/patches/series [utf-8] Sat Nov 19 13:02:20 2011
@@ -1,3 +1,4 @@
01_scroll_notebook.patch
+02_meta.patch
25_optional-ncurses.patch
60_termcap-home-end.patch
More information about the pkg-gnome-commits
mailing list