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

[Evangelos Foutras]

    Date: Wednesday, April 25, 2018 @ 02:05:03
  Author: foutrelis
Revision: 322958

Remove unneeded en-us keymap patch

https://bugs.launchpad.net/qemu/+bug/1738283/comments/17

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

---------------------------------------------------------+
 PKGBUILD                                                |    3 -
 remove-problematic-evdev-86-key-from-en-us-keymap.patch |   32 --------------
 2 files changed, 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-24 23:50:45 UTC (rev 322957)
+++ PKGBUILD	2018-04-25 02:05:03 UTC (rev 322958)
@@ -18,13 +18,11 @@
 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=('e69301f361ff65bf5dabd8a19196aeaa5613c1b5ae1678f0823bdf50e7d5c6fc'
             'SKIP'
             'c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88'
             'a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c'
-            '3cefabbab32ab21cd3b5a8cc1165c96db0c6c93e7ee8dc9d2ca09be5fb5eccda'
             '59751f1ed26ea61b2a37ebee4be6979e584a450b611282138a0893aa9173e2e4')
 validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584')
 
@@ -40,7 +38,6 @@
   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
 }
 

Deleted: remove-problematic-evdev-86-key-from-en-us-keymap.patch
===================================================================
--- remove-problematic-evdev-86-key-from-en-us-keymap.patch	2018-04-24 23:50:45 UTC (rev 322957)
+++ remove-problematic-evdev-86-key-from-en-us-keymap.patch	2018-04-25 02:05:03 UTC (rev 322958)
@@ -1,32 +0,0 @@
-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
-