summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bezies2023-06-17 12:46:12 +0200
committerFrederic Bezies2023-06-17 12:46:12 +0200
commit34e298de2c9aceb6fd4582129747ae32186fb0bc (patch)
tree832c5735c473c22edb49a41e46e834ccc23393a6
parente44a07c35c946565c3ca9ead5f0101705bdc0232 (diff)
downloadaur-34e298de2c9aceb6fd4582129747ae32186fb0bc.tar.gz
June 17th, 2023 update
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--keymap.patch9
3 files changed, 21 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b852884cae37..ae152174d54e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qemu-git
pkgdesc = A generic and open source machine emulator and virtualizer. Git version.
- pkgver = 8.0.0.r1542.g848a6caa88
+ pkgver = 8.0.0.r1893.ge3660cc1e3
pkgrel = 1
epoch = 19
url = https://wiki.qemu.org/
@@ -70,9 +70,11 @@ pkgbase = qemu-git
source = git+https://gitlab.com/qemu-project/qemu.git
source = qemu-guest-agent.service
source = 65-kvm.rules
+ source = keymap.patch
sha256sums = SKIP
sha256sums = c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88
sha256sums = a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c
+ sha256sums = 590bffe4ee16f0c83f26e3f72bbd3bc6a98973c9574f08b4705b4273e4e498a4
pkgname = qemu-git
pkgdesc = QEMU Git version.
diff --git a/PKGBUILD b/PKGBUILD
index b1157b181ace..b1c73787608d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ pkgname=(
qemu-guest-agent-git
)
pkgdesc="A generic and open source machine emulator and virtualizer. Git version."
-pkgver=8.0.0.r1542.g848a6caa88
+pkgver=8.0.0.r1893.ge3660cc1e3
pkgrel=1
epoch=19
arch=(i686 x86_64)
@@ -86,10 +86,12 @@ makedepends=(
)
source=(git+https://gitlab.com/qemu-project/qemu.git
qemu-guest-agent.service
- 65-kvm.rules)
+ 65-kvm.rules
+ keymap.patch)
sha256sums=('SKIP'
'c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88'
- 'a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c')
+ 'a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c'
+ '590bffe4ee16f0c83f26e3f72bbd3bc6a98973c9574f08b4705b4273e4e498a4')
case $CARCH in
i?86) _corearch=i386 ;;
@@ -105,6 +107,8 @@ prepare() {
cd "${srcdir}/${_gitname}"
mkdir build-{full,headless}
mkdir -p extra-arch-{full,headless}/usr/{bin,share/qemu}
+ # Workaround for bug https://gitlab.com/qemu-project/qemu/-/issues/1709
+ patch -Np2 -i ../keymap.patch
}
build() {
@@ -127,9 +131,10 @@ build() {
}
_build() (
+
cd ${srcdir}/${_gitname}/build-$1
- ../configure \
+ ../configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
diff --git a/keymap.patch b/keymap.patch
new file mode 100644
index 000000000000..e3b6972e0276
--- /dev/null
+++ b/keymap.patch
@@ -0,0 +1,9 @@
+--- /src/pc-bios/keymaps/meson.build 2023-06-17 11:21:10.022918461 +0200
++++ /src/pc-bios/keymaps/meson.build 2023-06-17 11:29:10.804643710 +0200
+@@ -1,5 +1,5 @@
+ keymaps = {
+- 'ar': '-l ar',
++ 'ar': '-l ara',
+ 'bepo': '-l fr -v dvorak',
+ 'cz': '-l cz',
+ 'da': '-l dk',