[arch-commits] Commit in qemu/trunk (2 files)

[Evangelos Foutras]

    Date: Friday, March 9, 2018 @ 21:10:02
  Author: foutrelis
Revision: 318365

upgpkg: qemu 2.11.1-2

Fix en-us keymap issue causing '<' to output '>' when typed over VNC.

https://bugs.launchpad.net/qemu/+bug/1738283
https://bugs.launchpad.net/qemu/+bug/1754295

Added:
  qemu/trunk/remove-problematic-evdev-86-key-from-en-us-keymap.patch
Modified:
  qemu/trunk/PKGBUILD

---------------------------------------------------------+
 PKGBUILD                                                |    5 +-
 remove-problematic-evdev-86-key-from-en-us-keymap.patch |   32 ++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-09 21:03:04 UTC (rev 318364)
+++ PKGBUILD	2018-03-09 21:10:02 UTC (rev 318365)
@@ -7,7 +7,7 @@
          qemu-block-{iscsi,rbd,gluster} qemu-guest-agent)
 pkgdesc="A generic and open source machine emulator and virtualizer"
 pkgver=2.11.1
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 license=(GPL2 LGPL2.1)
 url="http://wiki.qemu.org/"
@@ -18,11 +18,13 @@
 source=(https://download.qemu.org/qemu-$pkgver.tar.xz{,.sig}
         qemu-ga.service
         65-kvm.rules
+        remove-problematic-evdev-86-key-from-en-us-keymap.patch
         allow_elf64.patch)
 sha256sums=('8a5145d1f8bd2eadc6776f3e13c68cd28d01349e30639bdbcb26ac588d668686'
             'SKIP'
             'c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88'
             'a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c'
+            '3cefabbab32ab21cd3b5a8cc1165c96db0c6c93e7ee8dc9d2ca09be5fb5eccda'
             '13a6d9e678bdc9e1f051006cfd0555f5a80582368f54c8a1bb5a78ece3832ac4')
 validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584')
 
@@ -38,6 +40,7 @@
   cd ${pkgname}-${pkgver}
   sed -i 's/vte-2\.90/vte-2.91/g' configure
 
+  patch -p1 < ../remove-problematic-evdev-86-key-from-en-us-keymap.patch
   patch -p1 < ../allow_elf64.patch
 }
 

Added: remove-problematic-evdev-86-key-from-en-us-keymap.patch
===================================================================
--- remove-problematic-evdev-86-key-from-en-us-keymap.patch	                        (rev 0)
+++ remove-problematic-evdev-86-key-from-en-us-keymap.patch	2018-03-09 21:10:02 UTC (rev 318365)
@@ -0,0 +1,32 @@
+From 2c25ad161d7714f15b1951c69c50844ea81f4186 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at redhat.com>
+Date: Wed, 20 Dec 2017 15:43:07 -0800
+Subject: [PATCH] Remove problematic 'evdev 86' key from en-us keymap
+
+This causes LP#1738283. Gerd will have to come up with a better
+fix, but just hacking out the problematic key definition should
+work for now.
+---
+ pc-bios/keymaps/en-us | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/pc-bios/keymaps/en-us b/pc-bios/keymaps/en-us
+index a70e03adc0..e518a9dc35 100644
+--- a/pc-bios/keymaps/en-us
++++ b/pc-bios/keymaps/en-us
+@@ -343,12 +343,6 @@ KP_Decimal 0x53 numlock
+ 
+ # evdev 85 (0x55): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
+ 
+-# evdev 86 (0x56), QKeyCode "less", number 0x56
+-less 0x56
+-greater 0x56 shift
+-bar 0x56 altgr
+-brokenbar 0x56 shift altgr
+-
+ # evdev 87 (0x57), QKeyCode "f11", number 0x57
+ F11 0x57
+ 
+-- 
+2.15.1
+