<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9131e911873fc6274e7c29bffaf2dfd26206f1a7">https://github.com/macports/macports-ports/commit/9131e911873fc6274e7c29bffaf2dfd26206f1a7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9131e91 qemu: Fix broken en-us keymap
</span>9131e91 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9131e911873fc6274e7c29bffaf2dfd26206f1a7
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Fri Apr 6 23:53:29 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> qemu: Fix broken en-us keymap
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56244
</span>---
emulators/qemu/Portfile | 5 +++-
emulators/qemu/files/patch-configure.diff | 4 +--
...problematic-evdev-86-key-from-en-us-keymap.diff | 34 ++++++++++++++++++++++
3 files changed, 40 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/Portfile b/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14ef2bb..8ce8e52 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@ PortSystem 1.0
</span>
name qemu
version 2.11.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories emulators
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +29,9 @@ checksums rmd160 d336e58245ee7c6956a0792c5b9393e6e6806b5a \
</span> # https://bugs.launchpad.net/qemu/+bug/1714750
extract.post_args-append --exclude qemu-${version}/roms/u-boot/scripts/Kconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-remove-problematic-evdev-86-key-from-en-us-keymap.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span>
depends_build port:texinfo \
port:libtool \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/files/patch-configure.diff b/emulators/qemu/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 493075b..52e1e7c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2015-08-11 21:11:05.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2015-08-21 15:11:04.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure 2015-08-11 21:11:05.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure 2015-08-21 15:11:04.000000000 +0200
</span> @@ -625,10 +625,6 @@
bsd="yes"
darwin="yes"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/files/patch-remove-problematic-evdev-86-key-from-en-us-keymap.diff b/emulators/qemu/files/patch-remove-problematic-evdev-86-key-from-en-us-keymap.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..37070dc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/files/patch-remove-problematic-evdev-86-key-from-en-us-keymap.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream: https://bugs.launchpad.net/qemu/+bug/1738283
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2c25ad161d7714f15b1951c69c50844ea81f4186 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Adam Williamson <awilliam@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 20 Dec 2017 15:43:07 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Remove problematic 'evdev 86' key from en-us keymap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This causes LP#1738283. Gerd will have to come up with a better
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fix, but just hacking out the problematic key definition should
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+work for now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pc-bios/keymaps/en-us | 6 ------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/pc-bios/keymaps/en-us b/pc-bios/keymaps/en-us
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a70e03adc0..e518a9dc35 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/pc-bios/keymaps/en-us
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/pc-bios/keymaps/en-us
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -343,12 +343,6 @@ KP_Decimal 0x53 numlock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # evdev 85 (0x55): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# evdev 86 (0x56), QKeyCode "less", number 0x56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-less 0x56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-greater 0x56 shift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-bar 0x56 altgr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-brokenbar 0x56 shift altgr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # evdev 87 (0x57), QKeyCode "f11", number 0x57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F11 0x57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.15.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>