Hello community, here is the log from the commit of package vte2 for openSUSE:Factory checked in at 2012-05-21 07:32:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vte2 (Old) and /work/SRC/openSUSE:Factory/.vte2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vte2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/vte2/vte2.changes 2012-01-09 15:22:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vte2.new/vte2.changes 2012-05-21 07:32:56.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 17 20:23:30 UTC 2012 - [email protected] + +- Add vte-keymaps.patch: keymap: Treat ALT as META. [bnc#754350, + bgo#663779]. + +------------------------------------------------------------------- New: ---- vte-keymaps.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vte2.spec ++++++ --- /var/tmp/diff_new_pack.AvLnuw/_old 2012-05-21 07:32:58.000000000 +0200 +++ /var/tmp/diff_new_pack.AvLnuw/_new 2012-05-21 07:32:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package vte2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define _sover 9 %define _apiver 0.0 # empty: @@ -30,6 +31,8 @@ License: GPL-2.0+ Group: Development/Libraries/GNOME Source: http://download.gnome.org/sources/vte/0.28/%{_name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM vte-keymaps.patch bnc#754350 bgo#663779 [email protected] -- keymap: Treat ALT as META. Patch from tracker, comment 38. So far the likeliest candidate to be merged. +Patch0: vte-keymaps.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: gtk2-devel @@ -112,8 +115,8 @@ %package -n glade3-catalog-vte Summary: Terminal Emulator Library -- Catalog for Glade Group: Development/Tools/GUI Builders -Requires: libvte%{_sover} = %{version} Requires: glade3 +Requires: libvte%{_sover} = %{version} Supplements: packageand(glade3:%{name}-devel) %description -n glade3-catalog-vte @@ -143,6 +146,7 @@ %lang_package %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 translation-update-upstream %build ++++++ vte-keymaps.patch ++++++ >From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001 From: Christian Persch <[email protected]> Date: Sat, 12 May 2012 18:48:05 +0200 Subject: [PATCH] keymap: Treat ALT as META https://bugzilla.gnome.org/show_bug.cgi?id=663779 --- src/vte.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/vte.c b/src/vte.c index dd27e9a..0657921 100644 --- a/src/vte.c +++ b/src/vte.c @@ -5170,19 +5170,24 @@ static void vte_terminal_read_modifiers (VteTerminal *terminal, GdkEvent *event) { + GdkKeymap *keymap; GdkModifierType modifiers; /* Read the modifiers. */ - if (gdk_event_get_state((GdkEvent*)event, &modifiers)) { - GdkKeymap *keymap; -#if GTK_CHECK_VERSION (2, 90, 8) - keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window)); -#else - keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window)); + if (!gdk_event_get_state((GdkEvent*)event, &modifiers)) + return; + + keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window)); + + gdk_keymap_add_virtual_modifiers (keymap, &modifiers); + +#if 1 + /* HACK! Treat ALT as META; see bug #663779. */ + if (modifiers & GDK_MOD1_MASK) + modifiers |= VTE_META_MASK; #endif - gdk_keymap_add_virtual_modifiers (keymap, &modifiers); - terminal->pvt->modifiers = modifiers; - } + + terminal->pvt->modifiers = modifiers; } /* Read and handle a keypress event. */ -- 1.7.5.1.217.g4e3aa.dirty -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
