packages: vte0/vte0.spec, vte0/vte-alt-meta.patch (NEW) - vte-alt-meta.patc...
jajcus
jajcus at pld-linux.org
Mon Dec 5 18:51:59 CET 2011
Author: jajcus Date: Mon Dec 5 17:51:59 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- vte-alt-meta.patch patch (from https://bugzilla.gnome.org/show_bug.cgi?id=663779#c9) added to fix Alt in Terminal
- Release: 4
---- Files affected:
packages/vte0:
vte0.spec (1.175 -> 1.176) , vte-alt-meta.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vte0/vte0.spec
diff -u packages/vte0/vte0.spec:1.175 packages/vte0/vte0.spec:1.176
--- packages/vte0/vte0.spec:1.175 Wed Oct 12 17:23:38 2011
+++ packages/vte0/vte0.spec Mon Dec 5 18:51:54 2011
@@ -3,11 +3,12 @@
Summary(pl.UTF-8): Biblioteka z kontrolką terminala VTE for GTK+ 2
Name: vte0
Version: 0.28.2
-Release: 3
+Release: 4
License: LGPL v2+
Group: X11/Libraries
Source0: http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-%{version}.tar.bz2
# Source0-md5: f07a4bf943194f94b7f142db8f7f36dc
+Patch0: vte-alt-meta.patch
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.9
BuildRequires: docbook-dtd412-xml
@@ -117,6 +118,7 @@
%prep
%setup -q -n vte-%{version}
+%patch0 -p1
%build
%configure \
@@ -188,6 +190,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.176 2011/12/05 17:51:54 jajcus
+- vte-alt-meta.patch patch (from https://bugzilla.gnome.org/show_bug.cgi?id=663779#c9) added to fix Alt in Terminal
+- Release: 4
+
Revision 1.175 2011/10/12 15:23:38 qboosh
- note GTK+ 2 also in main summaries
================================================================
Index: packages/vte0/vte-alt-meta.patch
diff -u /dev/null packages/vte0/vte-alt-meta.patch:1.1
--- /dev/null Mon Dec 5 18:51:59 2011
+++ packages/vte0/vte-alt-meta.patch Mon Dec 5 18:51:54 2011
@@ -0,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
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vte0/vte0.spec?r1=1.175&r2=1.176&f=u
More information about the pld-cvs-commit
mailing list