summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD25
-rw-r--r--config_keyboard_layout.diff10
3 files changed, 13 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index feeca73bc6a7..234dad5a9a8c 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 = 3
+ pkgver = 0.2.1
+ pkgrel = 1
url = https://github.com/dbalsom/martypc
install = martypc.install
arch = x86_64
@@ -13,9 +13,7 @@ pkgbase = martypc
depends = libudev.so
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
+ source = martypc-0.2.1.tgz::https://github.com/dbalsom/martypc/archive/refs/tags/0.2.1.tar.gz
+ sha512sums = 461cd74c4d5ce63301d701c13322552c9673bee76184f7c821cb245e2e49c469cdb24c1b6dfbdd494acef793d1e628b7b821fecaedcf5126e6607884cb66f1ad
pkgname = martypc
diff --git a/PKGBUILD b/PKGBUILD
index f84447c2e7ab..0cb38ad8c300 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Lili1228 <aur at lili dot lgbt>
pkgname=martypc
-pkgver=0.2.0
-pkgrel=3
+pkgver=0.2.1
+pkgrel=1
pkgdesc='An IBM PC/XT emulator written in Rust'
arch=(x86_64 aarch64)
depends=(alsa-lib libudev.so # explicit
@@ -10,38 +10,31 @@ 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 '\.' '_')"
- "config_keyboard_layout.diff"
-)
-#source=("${pkgname}-${pkgver}.tgz::https://github.com/dbalsom/${pkgname}/archive/refs/tags/${pkgver}.tar.gz")
-sha512sums=(
-'SKIP'
-'a8823b6c266a1ee078ab8a6e0c45f896ba44bf6d84642c9d7c4dfcc3536f15e842598bb09c2232b7b2adc744107277e7f2cf45f6eff2e09c2167a7f75da38bd0'
-)
+#source=("git+https://github.com/dbalsom/martypc.git#branch=version_$(printf $pkgver | tr '\.' '_')")
+source=("${pkgname}-${pkgver}.tgz::https://github.com/dbalsom/${pkgname}/archive/refs/tags/${pkgver}.tar.gz")
+sha512sums=('461cd74c4d5ce63301d701c13322552c9673bee76184f7c821cb245e2e49c469cdb24c1b6dfbdd494acef793d1e628b7b821fecaedcf5126e6607884cb66f1ad')
prepare() {
- cd ${pkgname} #-${pkgver}
- patch -p1 < ../config_keyboard_layout.diff
+ cd ${pkgname}
export RUSTUP_TOOLCHAIN=stable
cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
}
build() {
- cd ${pkgname} #-${pkgver}
+ cd ${pkgname}
export RUSTUP_TOOLCHAIN=stable
export CARGO_TARGET_DIR=target
cargo build --frozen --release
}
#check() {
-# cd ${pkgname} #-${pkgver}
+# cd ${pkgname}
# export RUSTUP_TOOLCHAIN=stable
# cargo test --frozen --release
#}
package() {
- cd ${pkgname} #-${pkgver}
+ cd ${pkgname}
install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"
install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname" "LICENSE"
cp -a --no-preserve=ownership install "$pkgdir/usr/share/martypc"
diff --git a/config_keyboard_layout.diff b/config_keyboard_layout.diff
deleted file mode 100644
index 8c97b3178cc2..000000000000
--- a/config_keyboard_layout.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 },