[arch-commits] Commit in qemu/trunk (2 files)
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
===
--- PKGBUILD2018-04-24 23:50:45 UTC (rev 322957)
+++ PKGBUILD2018-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
-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
-
[arch-commits] Commit in qemu/trunk (2 files)
Date: Friday, March 9, 2018 @ 21:10:02
Author: foutrelis
Revision: 318365
upgpkg: qemu 2.11.1-2
Fix en-us keymap issue causing '<' to output '>' when typed over VNC.
https://bugs.launchpad.net/qemu/+bug/1738283
https://bugs.launchpad.net/qemu/+bug/1754295
Added:
qemu/trunk/remove-problematic-evdev-86-key-from-en-us-keymap.patch
Modified:
qemu/trunk/PKGBUILD
-+
PKGBUILD|5 +-
remove-problematic-evdev-86-key-from-en-us-keymap.patch | 32 ++
2 files changed, 36 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-09 21:03:04 UTC (rev 318364)
+++ PKGBUILD2018-03-09 21:10:02 UTC (rev 318365)
@@ -7,7 +7,7 @@
qemu-block-{iscsi,rbd,gluster} qemu-guest-agent)
pkgdesc="A generic and open source machine emulator and virtualizer"
pkgver=2.11.1
-pkgrel=1
+pkgrel=2
arch=(x86_64)
license=(GPL2 LGPL2.1)
url="http://wiki.qemu.org/;
@@ -18,11 +18,13 @@
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=('8a5145d1f8bd2eadc6776f3e13c68cd28d01349e30639bdbcb26ac588d668686'
'SKIP'
'c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88'
'a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c'
+'3cefabbab32ab21cd3b5a8cc1165c96db0c6c93e7ee8dc9d2ca09be5fb5eccda'
'13a6d9e678bdc9e1f051006cfd0555f5a80582368f54c8a1bb5a78ece3832ac4')
validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584')
@@ -38,6 +40,7 @@
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
}
Added: remove-problematic-evdev-86-key-from-en-us-keymap.patch
===
--- remove-problematic-evdev-86-key-from-en-us-keymap.patch
(rev 0)
+++ remove-problematic-evdev-86-key-from-en-us-keymap.patch 2018-03-09
21:10:02 UTC (rev 318365)
@@ -0,0 +1,32 @@
+From 2c25ad161d7714f15b1951c69c50844ea81f4186 Mon Sep 17 00:00:00 2001
+From: Adam Williamson
+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
+
[arch-commits] Commit in qemu/trunk (2 files)
Date: Friday, February 22, 2013 @ 18:48:32
Author: tpowa
Revision: 178449
upgpkg: qemu 1.4.0-1
bump to 1.4.x series
Added:
qemu/trunk/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
Modified:
qemu/trunk/PKGBUILD
---+
PKGBUILD | 14 ---
doc-fix-sheepdog-invalid-texi-table-list-syntax.patch | 30
2 files changed, 39 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-22 16:13:19 UTC (rev 178448)
+++ PKGBUILD2013-02-22 17:48:32 UTC (rev 178449)
@@ -1,8 +1,8 @@
# $Id$
# Maintainer: Tobias Powalowski tp...@archlinux.org
pkgname=qemu
-pkgver=1.3.1
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
pkgdesc=A generic and open source processor emulator which achieves a good
emulation speed by using dynamic translation.
arch=('i686' 'x86_64')
license=('GPL2' 'LGPL2.1')
@@ -12,6 +12,7 @@
backup=('etc/qemu/target-x86_64.conf')
install=qemu.install
source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
+doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
65-kvm.rules)
replaces=('qemu-kvm')
options=(!strip)
@@ -19,7 +20,10 @@
build()
{
cd ${srcdir}/${pkgname}-${pkgver}
- sed -i -e 's/lib64/lib/g' x86_64.ld
+ sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld
+ # fix building with tex version 5.0
+ # https://bugs.launchpad.net/qemu/+bug/1130533
+ patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa
\
--python=/usr/bin/python2 \
--audio-card-list=ac97,sb16,es1370,hda \
@@ -48,6 +52,6 @@
done
}
-
-md5sums=('5dbc6c22f47efca71dfaae0dd80dcf9e'
+md5sums=('78f13b774814b6b7ebcaf4f9b9204318'
+ 'b431782f310bfc6af4ef21a8068f866b'
'b316a066d2f1bb57d8f5b7ea1d0d1caf')
Added: doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
===
--- doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
(rev 0)
+++ doc-fix-sheepdog-invalid-texi-table-list-syntax.patch 2013-02-22
17:48:32 UTC (rev 178449)
@@ -0,0 +1,30 @@
+diff --git a/qemu-options.hx b/qemu-options.hx
+index 4bc9c85..3af60bf 100644
+--- a/qemu-options.hx
b/qemu-options.hx
+@@ -2095,18 +2095,13 @@ QEMU supports using either local sheepdog devices or
remote networked
+ devices.
+
+ Syntax for specifying a sheepdog device
+-@table @list
+-``sheepdog:vdiname''
+-
+-``sheepdog:vdiname:snapid''
+-
+-``sheepdog:vdiname:tag''
+-
+-``sheepdog:host:port:vdiname''
+-
+-``sheepdog:host:port:vdiname:snapid''
+-
+-``sheepdog:host:port:vdiname:tag''
++@table @code
++@item sheepdog:vdiname
++@item sheepdog:vdiname:snapid
++@item sheepdog:vdiname:tag
++@item sheepdog:host:port:vdiname
++@item sheepdog:host:port:vdiname:snapid
++@item sheepdog:host:port:vdiname:tag
+ @end table
+
+ Example
