Tue Apr 17 20:02:14 2018 UTC ()
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.


(gson)
diff -r1.182 -r1.183 pkgsrc/emulators/qemu/Makefile
diff -r1.133 -r1.134 pkgsrc/emulators/qemu/distinfo
diff -r0 -r1.1 pkgsrc/emulators/qemu/patches/patch-chardev_char-mux.c
cvs diff -r1.182 -r1.183 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2018/04/16 14:34:26 1.182
+++ pkgsrc/emulators/qemu/Makefile 2018/04/17 20:02:14 1.183
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.182 2018/04/16 14:34:26 wiz Exp $ 1# $NetBSD: Makefile,v 1.183 2018/04/17 20:02:14 gson Exp $
2 2
3DISTNAME= qemu-2.11.1 3DISTNAME= qemu-2.11.1
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= http://download.qemu-project.org/ 6MASTER_SITES= http://download.qemu-project.org/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.qemu-project.org/ 10HOMEPAGE= http://www.qemu-project.org/
11COMMENT= CPU emulator using dynamic translation 11COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 13
14USE_CURSES= resize_term wide 14USE_CURSES= resize_term wide
15USE_LANGUAGES+= c c++ 15USE_LANGUAGES+= c c++
16USE_TOOLS+= bison flex gmake makeinfo perl:build pkg-config 16USE_TOOLS+= bison flex gmake makeinfo perl:build pkg-config
17FAKE_NCURSES= yes 17FAKE_NCURSES= yes
cvs diff -r1.133 -r1.134 pkgsrc/emulators/qemu/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/distinfo 2018/02/15 08:32:22 1.133
+++ pkgsrc/emulators/qemu/distinfo 2018/04/17 20:02:14 1.134
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1$NetBSD: distinfo,v 1.133 2018/02/15 08:32:22 adam Exp $ 1$NetBSD: distinfo,v 1.134 2018/04/17 20:02:14 gson Exp $
2 2
3SHA1 (qemu-2.11.1.tar.xz) = e85cfbdff264510fd9bba73d83978ab4ecee3f41 3SHA1 (qemu-2.11.1.tar.xz) = e85cfbdff264510fd9bba73d83978ab4ecee3f41
4RMD160 (qemu-2.11.1.tar.xz) = 5e713f1fb5f742536211d0e27fc377b849730b1e 4RMD160 (qemu-2.11.1.tar.xz) = 5e713f1fb5f742536211d0e27fc377b849730b1e
5SHA512 (qemu-2.11.1.tar.xz) = 7fd4a7c6fa8627510431ed34f05bdd6b055ea66207bab29904bbce66dfd5b07546f02dfcb34937f48efb67184200ab3c8501763776adc1cdc1302a924fb2a5ef 5SHA512 (qemu-2.11.1.tar.xz) = 7fd4a7c6fa8627510431ed34f05bdd6b055ea66207bab29904bbce66dfd5b07546f02dfcb34937f48efb67184200ab3c8501763776adc1cdc1302a924fb2a5ef
6Size (qemu-2.11.1.tar.xz) = 28992188 bytes 6Size (qemu-2.11.1.tar.xz) = 28992188 bytes
7SHA1 (patch-Makefile) = b3899fb8d0dd2f29bf3edd843836612e6e6c019c 7SHA1 (patch-Makefile) = b3899fb8d0dd2f29bf3edd843836612e6e6c019c
8SHA1 (patch-audio_audio.c) = 98a1de2fd48638886b5d16f6a61dc72910e98b41 8SHA1 (patch-audio_audio.c) = 98a1de2fd48638886b5d16f6a61dc72910e98b41
9SHA1 (patch-block.c) = 6f54da333696584067a7556b8cabfa8853758824 9SHA1 (patch-block.c) = 6f54da333696584067a7556b8cabfa8853758824
 10SHA1 (patch-chardev_char-mux.c) = e597d4dc3889c00d001d899088c4c8cdc4e00474
10SHA1 (patch-configure) = 6d0acd72edb8c602ffbc98fdbc161bc10aa968e2 11SHA1 (patch-configure) = 6d0acd72edb8c602ffbc98fdbc161bc10aa968e2
11SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984 12SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984
12SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = d8f53432b5752f4263dc4ef96108a976a05147a3 13SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = d8f53432b5752f4263dc4ef96108a976a05147a3
13SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420 14SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
14SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc 15SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
15SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7 16SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
16SHA1 (patch-hw_usb_dev-mtp.c) = f5a446079d51b19eae6c2f5e0c9810c181e4f02d 17SHA1 (patch-hw_usb_dev-mtp.c) = f5a446079d51b19eae6c2f5e0c9810c181e4f02d
17SHA1 (patch-slirp_tcp__subr.c) = f011c9dc58282e61b26017547a9884f30a6e6154 18SHA1 (patch-slirp_tcp__subr.c) = f011c9dc58282e61b26017547a9884f30a6e6154
18SHA1 (patch-tests_Makefile.include) = 42345d697cb2e324dccf1d68bd8d61e8001c6162 19SHA1 (patch-tests_Makefile.include) = 42345d697cb2e324dccf1d68bd8d61e8001c6162
19SHA1 (patch-util_oslib-posix.c) = 319ad18de96860172c8d10920fe2c117e787403e 20SHA1 (patch-util_oslib-posix.c) = 319ad18de96860172c8d10920fe2c117e787403e
File Added: pkgsrc/emulators/qemu/patches/Attic/patch-chardev_char-mux.c
$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);
 }