[pkgsrc/trunk]: pkgsrc/emulators/qemu emulators/qemu: fix control-a b

[gson <gson%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dd89d5109deb
branches:  trunk
changeset: 378945:dd89d5109deb
user:      gson <gson%pkgsrc.org@localhost>
date:      Tue Apr 17 20:02:14 2018 +0000

description:
emulators/qemu: fix control-a b

Fix qemu bug 1654137, "Ctrl-A b not working in 2.8.0", by
backporting qemu mainline commit 1b2503fcf7b5932c5a3779ca2ceb92bd403c4ee7.
Bump PKGREVISION.

diffstat:

 emulators/qemu/Makefile                         |   4 ++--
 emulators/qemu/distinfo                         |   3 ++-
 emulators/qemu/patches/patch-chardev_char-mux.c |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r d23df6eb0c72 -r dd89d5109deb emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Tue Apr 17 18:42:10 2018 +0000
+++ b/emulators/qemu/Makefile   Tue Apr 17 20:02:14 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.182 2018/04/16 14:34:26 wiz Exp $
+# $NetBSD: Makefile,v 1.183 2018/04/17 20:02:14 gson Exp $
 
 DISTNAME=      qemu-2.11.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    emulators
 MASTER_SITES=  http://download.qemu-project.org/
 EXTRACT_SUFX=  .tar.xz
diff -r d23df6eb0c72 -r dd89d5109deb emulators/qemu/distinfo
--- a/emulators/qemu/distinfo   Tue Apr 17 18:42:10 2018 +0000
+++ b/emulators/qemu/distinfo   Tue Apr 17 20:02:14 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.133 2018/02/15 08:32:22 adam Exp $
+$NetBSD: distinfo,v 1.134 2018/04/17 20:02:14 gson Exp $
 
 SHA1 (qemu-2.11.1.tar.xz) = e85cfbdff264510fd9bba73d83978ab4ecee3f41
 RMD160 (qemu-2.11.1.tar.xz) = 5e713f1fb5f742536211d0e27fc377b849730b1e
@@ -7,6 +7,7 @@
 SHA1 (patch-Makefile) = b3899fb8d0dd2f29bf3edd843836612e6e6c019c
 SHA1 (patch-audio_audio.c) = 98a1de2fd48638886b5d16f6a61dc72910e98b41
 SHA1 (patch-block.c) = 6f54da333696584067a7556b8cabfa8853758824
+SHA1 (patch-chardev_char-mux.c) = e597d4dc3889c00d001d899088c4c8cdc4e00474
 SHA1 (patch-configure) = 6d0acd72edb8c602ffbc98fdbc161bc10aa968e2
 SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984
 SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = d8f53432b5752f4263dc4ef96108a976a05147a3
diff -r d23df6eb0c72 -r dd89d5109deb emulators/qemu/patches/patch-chardev_char-mux.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/qemu/patches/patch-chardev_char-mux.c   Tue Apr 17 20:02:14 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-chardev_char-mux.c,v 1.1 2018/04/17 20:02:14 gson Exp $
+
+Fix ctrl-a b again.  This is a backport of qemu git commit
+1b2503fcf7b5932c5a3779ca2ceb92bd403c4ee7.
+
+--- chardev/char-mux.c.orig    2018-02-14 21:53:22.000000000 +0000
++++ chardev/char-mux.c
+@@ -295,6 +295,7 @@ void mux_set_focus(Chardev *chr, int foc
+     }
+ 
+     d->focus = focus;
++    chr->be = d->backends[focus];
+     mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_IN);
+ }
+