<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/627cba00585c15b495fb75cfd281004514d72994">https://github.com/macports/macports-ports/commit/627cba00585c15b495fb75cfd281004514d72994</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 627cba0 qemu: Update to version 2.12.0
</span>627cba0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 627cba00585c15b495fb75cfd281004514d72994
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Fri May 4 21:46:41 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> qemu: Update to version 2.12.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove workaround for u-boot Kconfig, as the sources are now shipped as
</span><span style='display:block; white-space:pre;color:#404040;'> a tarball inside the qemu tarball.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove patch with hotfix for the en-us keymap, as upstream reports this
</span><span style='display:block; white-space:pre;color:#404040;'> problem is fixed with 2.12.0.
</span>---
emulators/qemu/Portfile | 18 ++++--------
...problematic-evdev-86-key-from-en-us-keymap.diff | 34 ----------------------
2 files changed, 5 insertions(+), 47 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 8ce8e52..bfd958e 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;'>@@ -1,8 +1,7 @@
</span> PortSystem 1.0
name qemu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.11.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.12.0
</span> categories emulators
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,18 +18,11 @@ homepage https://www.qemu.org
</span> master_sites https://download.qemu.org/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d336e58245ee7c6956a0792c5b9393e6e6806b5a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d9df2213ceed32e91dab7bc9dd19c1af83f91ba72c7aeef7605dfaaf81732ccb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 32819412
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6d1bb9ef49ef58aad4b72a0bea9dd8b56929b37c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c9f4a147bc915d24df9784affc611a115f42d24720a89210b479f1ba7a3f679c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 41196232
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Due to the bundled u-boot sources, the qemu tarball cannot be extracted on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# a case-insensitive file system. The sources are not used, just shipped along
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# with the compiled rom. Excluding the conflicting file to allow extraction.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugs.launchpad.net/qemu/+bug/1714750
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.post_args-append --exclude qemu-${version}/roms/u-boot/scripts/Kconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-remove-problematic-evdev-86-key-from-en-us-keymap.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.diff
</span> patch.pre_args -p1
depends_build port:texinfo \
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 37070dc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/files/patch-remove-problematic-evdev-86-key-from-en-us-keymap.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: https://bugs.launchpad.net/qemu/+bug/1738283
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2c25ad161d7714f15b1951c69c50844ea81f4186 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Adam Williamson <awilliam@redhat.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 20 Dec 2017 15:43:07 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Remove problematic 'evdev 86' key from en-us keymap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This causes LP#1738283. Gerd will have to come up with a better
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fix, but just hacking out the problematic key definition should
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-work for now.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pc-bios/keymaps/en-us | 6 ------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/pc-bios/keymaps/en-us b/pc-bios/keymaps/en-us
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a70e03adc0..e518a9dc35 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/pc-bios/keymaps/en-us
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/pc-bios/keymaps/en-us
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -343,12 +343,6 @@ KP_Decimal 0x53 numlock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # evdev 85 (0x55): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# evdev 86 (0x56), QKeyCode "less", number 0x56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--less 0x56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--greater 0x56 shift
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--bar 0x56 altgr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--brokenbar 0x56 shift altgr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # evdev 87 (0x57), QKeyCode "f11", number 0x57
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- F11 0x57
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.15.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>