From ecab51c46b9b61f1469411364a3f3f5d1f2a4b91 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Sun, 13 Aug 2023 20:03:44 +0200 Subject: [PATCH] Fixed APKBUILD formatting --- .forgejo/workflows/check-all.yml | 2 +- main/blueprint/APKBUILD | 8 ++------ main/connman-gtk/APKBUILD | 1 - main/oomph/APKBUILD | 1 - testing/libexecinfo/APKBUILD | 3 --- testing/suitsquad/APKBUILD | 4 ++-- testing/vlang/APKBUILD | 10 ++-------- 7 files changed, 7 insertions(+), 22 deletions(-) diff --git a/.forgejo/workflows/check-all.yml b/.forgejo/workflows/check-all.yml index d93fda8..a3d6ca3 100644 --- a/.forgejo/workflows/check-all.yml +++ b/.forgejo/workflows/check-all.yml @@ -1,7 +1,7 @@ --- on: [push] jobs: - demo: + check-all: runs-on: docker container: image: alpine:edge diff --git a/main/blueprint/APKBUILD b/main/blueprint/APKBUILD index 5375f0d..f40f297 100644 --- a/main/blueprint/APKBUILD +++ b/main/blueprint/APKBUILD @@ -1,18 +1,14 @@ # Maintainer: Jakob Meier pkgname=blueprint pkgver=2.0.0 -pkgrelease=stable # or beta +_pkgrelease=stable # or beta pkgrel=0 pkgdesc="This is the official BluePrint Compiler (bpc) It can be used to transpile the BluePrint lisp flavour to javascript" url="https://codeberg.org/comcloudway/blueprint" arch="all" license="GPL-3.0-or-later" -depends="" makedepends="cargo" -checkdepends="" -install="" -#subpackages="$pkgname-dev $pkgname-doc" -source="$pkgname-$pkgrelease-$pkgver.tar.gz::https://codeberg.org/comcloudway/blueprint/archive/$pkgrelease-$pkgver.tar.gz" +source="$pkgname-$_pkgrelease-$pkgver.tar.gz::https://codeberg.org/comcloudway/blueprint/archive/$_pkgrelease-$pkgver.tar.gz" builddir="$srcdir/$pkgname" prepare() { diff --git a/main/connman-gtk/APKBUILD b/main/connman-gtk/APKBUILD index 79a40d0..c43a600 100644 --- a/main/connman-gtk/APKBUILD +++ b/main/connman-gtk/APKBUILD @@ -9,7 +9,6 @@ arch="all" license="GPL-2.0" depends="connman-dev openconnect" makedepends="meson intltool glib-dev gtk+3.0-dev openconnect-dev" -checkdepends="" subpackages="$pkgname-doc $pkgname-lang" source="$pkgname-$pkgver.zip::https://github.com/jgke/connman-gtk/archive/refs/heads/master.zip" builddir="$srcdir/$pkgname-master" diff --git a/main/oomph/APKBUILD b/main/oomph/APKBUILD index d360fb0..244ffe0 100644 --- a/main/oomph/APKBUILD +++ b/main/oomph/APKBUILD @@ -8,7 +8,6 @@ url="https://codeberg.org/comcloudway/oomph" 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 diff --git a/testing/libexecinfo/APKBUILD b/testing/libexecinfo/APKBUILD index bf29755..8952fcf 100644 --- a/testing/libexecinfo/APKBUILD +++ b/testing/libexecinfo/APKBUILD @@ -7,9 +7,6 @@ pkgdesc="BSD licensed clone of backtrace facility found in the GNU libc" url="https://github.com/ronchaine/libexecinfo" arch="all" license="BSD" -depends="" -makedepends="" -checkdepends="" subpackages="$pkgname-dev" source="exec-info.zip::https://github.com/ronchaine/libexecinfo/archive/refs/heads/master.zip" builddir="$srcdir/libexecinfo-master" diff --git a/testing/suitsquad/APKBUILD b/testing/suitsquad/APKBUILD index 96cc12a..4783b0b 100644 --- a/testing/suitsquad/APKBUILD +++ b/testing/suitsquad/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Jakob Meier pkgname=suitsquad pkgver=0 -pkgrelease=stable +_pkgrelease=stable pkgrel=0 pkgdesc="crossplatform gui solitaire game" url="https://codeberg.org/comcloudway/suitsquad/" @@ -9,7 +9,7 @@ arch="all" license="GPL-3" makedepends="cargo" source=" - $pkgname-$pkgver.tar.gz::https://codeberg.org/comcloudway/suitsquad/archive/$pkgrelease.tar.gz + $pkgname-$pkgver.tar.gz::https://codeberg.org/comcloudway/suitsquad/archive/$_pkgrelease.tar.gz fix-icon.patch fix-musl.patch " diff --git a/testing/vlang/APKBUILD b/testing/vlang/APKBUILD index e0986c3..2700e65 100644 --- a/testing/vlang/APKBUILD +++ b/testing/vlang/APKBUILD @@ -10,11 +10,7 @@ pkgdesc="Simple, fast, safe, compiled language for developing maintainable softw url="https://vlang.io" arch="x86_64 aarch64" license="MIT" -depends="" makedepends="gcc gc-dev" -checkdepends="" -subpackages="" -_arch="" case "$CARCH" in aarch64) _arch="arm64" ;; x86_64) _arch="amd64" ;; @@ -33,10 +29,8 @@ build() { # needs gc-dev mkdir -p thirdparty/tcc/lib ln -s /usr/lib/libgc.a thirdparty/tcc/lib/libgc.a - #ln -s /usr/bin/tcc thirdparty/tcc/tcc.exe - #./thirdparty/tcc/tcc.exe -std=gnu11 -w -o v1 vc/v.c -lm -lexecinfo -lpthread - gcc -std=gnu11 -w -o v1 vc/v.c -lm -lpthread #-lexecinfo + gcc -std=gnu11 -w -o v1 vc/v.c -lm -lpthread #-lexecinfo ./v1 -no-parallel -o v2 -prod cmd/v ./v2 -o v -prod cmd/v rm -rf v1 v2 @@ -63,7 +57,7 @@ package() { cp -a thirdparty $pkgdir/usr/lib/vlang/ cp -a vlib $pkgdir/usr/lib/vlang/ cp v.mod $pkgdir/usr/lib/vlang/ - ln -s /usr/lib/vlang/v $pkgdir/usr/bin/v + ln -s /usr/lib/vlang/v $pkgdir/usr/bin/v touch $pkgdir/usr/lib/vlang/cmd/tools/.disable_autorecompilation } -- 2.38.5