New upstream release 8.0.3
This commit is contained in:
Camilla Conte
parent
66ae407ce2
commit
9d0cc42919
|
|
@ -1,62 +0,0 @@
|
|||
From 4ace54be1d671fb67795368001f2628facd49418 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Maydell <peter.maydell@linaro.org>
|
||||
Date: Tue, 20 Jun 2023 17:20:24 +0100
|
||||
Subject: [PATCH] pc-bios/keymaps: Use the official xkb name for Arabic layout,
|
||||
not the legacy synonym
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The xkb official name for the Arabic keyboard layout is 'ara'.
|
||||
However xkb has for at least the past 15 years also permitted it to
|
||||
be named via the legacy synonym 'ar'. In xkeyboard-config 2.39 this
|
||||
synoynm was removed, which breaks compilation of QEMU:
|
||||
|
||||
FAILED: pc-bios/keymaps/ar
|
||||
/home/fred/qemu-git/src/qemu/build-full/qemu-keymap -f pc-bios/keymaps/ar -l ar
|
||||
xkbcommon: ERROR: Couldn't find file "symbols/ar" in include paths
|
||||
xkbcommon: ERROR: 1 include paths searched:
|
||||
xkbcommon: ERROR: /usr/share/X11/xkb
|
||||
xkbcommon: ERROR: 3 include paths could not be added:
|
||||
xkbcommon: ERROR: /home/fred/.config/xkb
|
||||
xkbcommon: ERROR: /home/fred/.xkb
|
||||
xkbcommon: ERROR: /etc/xkb
|
||||
xkbcommon: ERROR: Abandoning symbols file "(unnamed)"
|
||||
xkbcommon: ERROR: Failed to compile xkb_symbols
|
||||
xkbcommon: ERROR: Failed to compile keymap
|
||||
|
||||
The upstream xkeyboard-config change removing the compat
|
||||
mapping is:
|
||||
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/470ad2cd8fea84d7210377161d86b31999bb5ea6
|
||||
|
||||
Make QEMU always ask for the 'ara' xkb layout, which should work on
|
||||
both older and newer xkeyboard-config. We leave the QEMU name for
|
||||
this keyboard layout as 'ar'; it is not the only one where our name
|
||||
for it deviates from the xkb standard name.
|
||||
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||||
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
||||
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||||
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
Message-id: 20230620162024.1132013-1-peter.maydell@linaro.org
|
||||
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1709
|
||||
(cherry picked from commit 497fad38979c16b6412388927401e577eba43d26)
|
||||
---
|
||||
pc-bios/keymaps/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
|
||||
index 158a3b410c..1cbcdebefa 100644
|
||||
--- a/pc-bios/keymaps/meson.build
|
||||
+++ b/pc-bios/keymaps/meson.build
|
||||
@@ -1,5 +1,5 @@
|
||||
keymaps = {
|
||||
- 'ar': '-l ar',
|
||||
+ 'ar': '-l ara',
|
||||
'bepo': '-l fr -v dvorak',
|
||||
'cz': '-l cz',
|
||||
'da': '-l dk',
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
|
@ -335,7 +335,7 @@ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38
|
|||
|
||||
Summary: QEMU is a FAST! processor emulator
|
||||
Name: qemu
|
||||
Version: 8.0.2
|
||||
Version: 8.0.3
|
||||
Release: %{baserelease}%{?rcrel}%{?dist}
|
||||
Epoch: 2
|
||||
License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND FSFAP AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-2.0-or-later with GCC-exception-2.0 exception AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only and LGPL-2.1-or-later AND MIT and public-domain and CC-BY-3.0
|
||||
|
|
@ -357,7 +357,6 @@ Source36: README.tests
|
|||
# Fix SGX assert
|
||||
Patch: 0001-target-i386-the-sgx_epc_get_section-stub-is-reachabl.patch
|
||||
Patch: 0002-hw-pci-bridge-Make-PCIe-and-CXL-PXB-Devices-inherit-.patch
|
||||
Patch: 0001-pc-bios-keymaps-Use-the-official-xkb-name-for-Arabic.patch
|
||||
|
||||
BuildRequires: meson >= %{meson_version}
|
||||
BuildRequires: bison
|
||||
|
|
@ -2784,6 +2783,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Jul 20 2023 Camilla Conte <cconte@redhat.com> - 2:8.0.3-1
|
||||
- New upstream release 8.0.3
|
||||
|
||||
* Mon Jul 03 2023 Camilla Conte <cconte@redhat.com> - 2:8.0.2-1
|
||||
- New upstream release 8.0.2
|
||||
- Fix arabic keyboard layout name
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (qemu-8.0.2.tar.xz) = 4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a
|
||||
SHA512 (qemu-8.0.3.tar.xz) = 18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3
|
||||
|
|
|
|||
Loading…
Reference in New Issue