From 8c5791ba151c2a3bc4985c473aac891ed43eb747 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Thu, 10 Aug 2023 14:19:51 +0200 Subject: [PATCH] main/oomph: updated to oomph 0.3.0 --- main/oomph/APKBUILD | 45 +++++++++++++++++++++++++++------------ main/oomph/fix-musl.patch | 12 +++++++++++ 2 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 main/oomph/fix-musl.patch diff --git a/main/oomph/APKBUILD b/main/oomph/APKBUILD index bf103d1..d360fb0 100644 --- a/main/oomph/APKBUILD +++ b/main/oomph/APKBUILD @@ -1,23 +1,40 @@ +# Contributor: Jakob Meier # Maintainer: Jakob Meier - pkgname=oomph -pkgver=v1 +pkgver=0.3.0 pkgrel=0 -pkgdesc="Mastodon bot posting music genres and autogenerated wikipedia links" +pkgdesc="CLI for Mastodon bot posting music genres and autogenerated wikipedia links" url="https://codeberg.org/comcloudway/oomph" -arch="noarch" -license="AGPL-3" -depends="jq dateutils coreutils curl" -source="$pkgname-$pkgver.tar.gz::https://codeberg.org/comcloudway/oomph/archive/$pkgver.tar.gz" -builddir="$srcdir/$pkgname" -options="!check" +arch="all" +license="AGPL-3.0-or-later" +makedepends="cargo cargo-auditable" +subpackages="" +source=" +oomph-v$pkgver.tar.gz::https://codeberg.org/comcloudway/oomph/archive/v$pkgver.tar.gz +fix-musl.patch +" +builddir="$srcdir/oomph" +options="net" -package() { - install -Dm755 "oomph.sh" -t "$pkgdir/usr/bin/" - install -Dm755 "oomph-randomize.sh" -t "$pkgdir/usr/bin/" +prepare() { + default_prepare + + cargo fetch --target="$CTARGET" + cargo update +} - install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname" +build() { + cargo auditable build --release +} + +check() { + cargo test --frozen +} + +package() { + install -Dm 755 target/release/oomph $pkgdir/usr/bin/oomph } sha512sums=" -b1d7c8ad00b3e868054104258053940a29cb7abcc3cb699a90dc2e73d7dcf578aa7b33f18394a2c9f58f0d0cea3a524a6229be1d386c44a637b4f2ae4e864397 oomph-v1.tar.gz +76bdec15353effdcbbf121d9a88534adf1f39b27136aa7500221a26b975dc5c7ad6f838abfee5372411da7cfb0eb237c2819a6657df9d172913e1f2c0f48e624 oomph-v0.3.0.tar.gz +bd76265e90d46c7d6b9075b16ea19b5b1f5e98a4e7d8afd096afdeea62b97cece486030053b6a75a152ada4260f227064d6695ccd5166f65e1ce775a452956f2 fix-musl.patch " diff --git a/main/oomph/fix-musl.patch b/main/oomph/fix-musl.patch new file mode 100644 index 0000000..fb8b739 --- /dev/null +++ b/main/oomph/fix-musl.patch @@ -0,0 +1,12 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 6af468b..e265dff 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -17,3 +17,7 @@ serde_json = "1.0" + clap = { version = "4.1.8", features = [ "derive" ] } + + chrono = "0.4.23" ++ ++[patch.crates-io] ++getrandom = { git = "https://github.com/comcloudway/getrandom" } ++libc = { git = "https://github.com/rust-lang/libc" } -- 2.38.5