Fix martypc.toml, requested by a dev

3 files changed, 23 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d177b6c9c71..feeca73bc6a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = martypc
 	pkgdesc = An IBM PC/XT emulator written in Rust
 	pkgver = 0.2.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/dbalsom/martypc
 	install = martypc.install
 	arch = x86_64
@@ -14,6 +14,8 @@ pkgbase = martypc
 	depends = gcc-libs
 	depends = glibc
 	source = git+https://github.com/dbalsom/martypc.git#branch=version_0_2_0
+	source = config_keyboard_layout.diff
 	sha512sums = SKIP
+	sha512sums = a8823b6c266a1ee078ab8a6e0c45f896ba44bf6d84642c9d7c4dfcc3536f15e842598bb09c2232b7b2adc744107277e7f2cf45f6eff2e09c2167a7f75da38bd0
 
 pkgname = martypc
diff --git a/PKGBUILD b/PKGBUILD
index 6cab3eca24f3..f84447c2e7ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Lili1228 <aur at lili dot lgbt>
 pkgname=martypc
 pkgver=0.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='An IBM PC/XT emulator written in Rust'
 arch=(x86_64 aarch64)
 depends=(alsa-lib libudev.so # explicit
@@ -10,12 +10,19 @@ makedepends=(cargo git)
 url="https://github.com/dbalsom/${pkgname}"
 license=(MIT)
 install=martypc.install
-source=("git+https://github.com/dbalsom/martypc.git#branch=version_$(printf $pkgver | tr '\.' '_')")
+source=(
+	"git+https://github.com/dbalsom/martypc.git#branch=version_$(printf $pkgver | tr '\.' '_')"
+	"config_keyboard_layout.diff"
+)
 #source=("${pkgname}-${pkgver}.tgz::https://github.com/dbalsom/${pkgname}/archive/refs/tags/${pkgver}.tar.gz")
-sha512sums=('SKIP')
+sha512sums=(
+'SKIP'
+'a8823b6c266a1ee078ab8a6e0c45f896ba44bf6d84642c9d7c4dfcc3536f15e842598bb09c2232b7b2adc744107277e7f2cf45f6eff2e09c2167a7f75da38bd0'
+)
 
 prepare() {
 	cd ${pkgname} #-${pkgver}
+	patch -p1 < ../config_keyboard_layout.diff
 	export RUSTUP_TOOLCHAIN=stable
 	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
diff --git a/config_keyboard_layout.diff b/config_keyboard_layout.diff
new file mode 100644
index 000000000000..8c97b3178cc2
--- /dev/null
+++ b/config_keyboard_layout.diff
@@ -0,0 +1,10 @@
+--- martypc/install/martypc.toml	2024-04-02 12:08:43.645316548 +0200
++++ a/install/martypc.toml	2024-04-05 20:25:28.040791926 +0200
+@@ -140,6 +140,7 @@
+ basedir = "."
+ paths = [
+     { resource = "machine", path = "$basedir$/configs/machines", recurse = true },
++    { resource = "keyboard_layout", path = "$basedir$/configs/keyboard_layouts", recurse = false },
+     { resource = "rom", path = "$basedir$/media/roms", recurse = true },
+     { resource = "hdd", path = "$basedir$/media/hdds", recurse = true },
+     { resource = "floppy", path = "$basedir$/media/floppies", recurse = true },