summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakamichi Horikawa2023-09-10 12:05:08 +0900
committerTakamichi Horikawa2023-09-10 12:05:08 +0900
commitfa878e693f5493b4e47eb403e3681db0c0db1495 (patch)
tree4cadb1b7dd2dcf91d63b3bdabadde9a1fa1cd72f
parentda4427ce3192ca93b4794136905b7944df64ec30 (diff)
downloadaur-fa878e693f5493b4e47eb403e3681db0c0db1495.tar.gz
Incorporated qemu 497fad3897 as a patch, to fix compilation error due to the removal of a deprecated synonym for arabic layout in xkb
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--fix-arabic-layout-name.patch11
3 files changed, 20 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2243f82a9668..9d9f9d76e203 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qemu-screamer-git
pkgdesc = QEMU PowerPC with sound support for Macintosh emulation
pkgver = r99787.448771a270
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/mcayland/qemu/tree/screamer
arch = x86_64
license = GPL2
@@ -16,7 +16,9 @@ pkgbase = qemu-screamer-git
optdepends = qemu-common: for qemu-bridge-helper
source = git+https://github.com/mcayland/qemu.git#branch=screamer
source = suppress-gcc13-warning.patch
+ source = fix-arabic-layout-name.patch
sha256sums = SKIP
sha256sums = 6fe10a16301cb3e18aff8ff40e2b24b2cc91cfe523f5ccbdd3d7264a043dfbeb
+ sha256sums = 3304442d4a5b46e81509f3a795a8025f3a4a327904f8ff684b52f2a39ed38257
pkgname = qemu-screamer-git
diff --git a/PKGBUILD b/PKGBUILD
index 39d13ff99dd5..7c0474216b4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: myon <myon@myon98.net>
pkgname=qemu-screamer-git
pkgver=r99787.448771a270
-pkgrel=1
+pkgrel=2
pkgdesc="QEMU PowerPC with sound support for Macintosh emulation"
arch=('x86_64')
url='https://github.com/mcayland/qemu/tree/screamer'
@@ -10,9 +10,11 @@ depends=('sdl2' 'libpulse' 'vte3' 'libslirp' 'dtc')
makedepends=('git' 'python' 'ninja')
optdepends=('qemu-common: for qemu-bridge-helper')
source=('git+https://github.com/mcayland/qemu.git#branch=screamer'
- 'suppress-gcc13-warning.patch')
+ 'suppress-gcc13-warning.patch'
+ 'fix-arabic-layout-name.patch')
sha256sums=('SKIP'
- '6fe10a16301cb3e18aff8ff40e2b24b2cc91cfe523f5ccbdd3d7264a043dfbeb')
+ '6fe10a16301cb3e18aff8ff40e2b24b2cc91cfe523f5ccbdd3d7264a043dfbeb'
+ '3304442d4a5b46e81509f3a795a8025f3a4a327904f8ff684b52f2a39ed38257')
pkgver() {
cd qemu
@@ -24,6 +26,7 @@ prepare() {
mkdir -p build
cd qemu
patch -Np1 -i "${srcdir}/suppress-gcc13-warning.patch"
+ patch -Np1 -i "${srcdir}/fix-arabic-layout-name.patch"
}
build() {
diff --git a/fix-arabic-layout-name.patch b/fix-arabic-layout-name.patch
new file mode 100644
index 000000000000..e68d29e5984e
--- /dev/null
+++ b/fix-arabic-layout-name.patch
@@ -0,0 +1,11 @@
+diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
+index bff30833137..0bd8ce00775 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',