The APKBUILD has been rewritten from scratch, partially because I didn't
realize muon was already in testing.
---
Fix tests :(
testing/muon/APKBUILD | 83 ++++++++++++++++++++------------
testing/muon/fix-bootstrap.patch | 19 --------
2 files changed, 52 insertions(+), 50 deletions(-)
delete mode 100644 testing/muon/fix-bootstrap.patch
diff --git a/testing/muon/APKBUILD b/testing/muon/APKBUILD
index aee46b9ea8..0a6418478a 100644
--- a/testing/muon/APKBUILD
+++ b/testing/muon/APKBUILD
@@ -1,44 +1,65 @@
-# Contributor: KikooDX <kikoodx@paranoici.org>
-# Maintainer: KikooDX <kikoodx@paranoici.org>
+# Contributor: Stone Tickle <lattis@mochiro.moe>
+# Maintainer: Stone Tickle <lattis@mochiro.moe>
pkgname=muon
-pkgver=0_git20210812
-pkgrel=2
-pkgdesc="meson implementation in C"
-options="!check" # broken test suite
-url="https://sr.ht/~lattis/muon"
-_giturl="https://github.com/annacrombie/muon"
+pkgver=0_git20220706
+_commit=c447322926bf7537bed5554004a75a6debb0051f
+pkgrel=0
+pkgdesc="A meson-compatible build system."
+url="https://muon.build"
arch="all"
-license="GPL-3.0-only"
-depends="samurai"
-makedepends="pkgconf-dev curl-dev zlib-dev"
+license="GPL3"
+depends="samurai libcurl libarchive pkgconf"
+makedepends="scdoc curl-dev libarchive-dev pkgconf-dev python3 py3-yaml"
subpackages="$pkgname-doc"
-_gitrev=f4ee369d4a90ca597aaf63d99da9355266eba83b
-source="$pkgname-$_gitrev.tar.gz::$_giturl/archive/$_gitrev.tar.gz
- fix-bootstrap.patch"
-builddir="$srcdir/$pkgname-$_gitrev"
-
-prepare() {
- default_prepare
- ./bootstrap.sh bootstrap
-}
+source="
+ $pkgname-$_commit.tar.gz::https://git.sr.ht/~lattis/muon/archive/$_commit.tar.gz
+ https://mochiro.moe/wrap/meson-docs.tar.gz
+ https://mochiro.moe/wrap/meson-docs-patch.tar.gz
+"
+builddir="$srcdir/$pkgname-$_commit/"
build() {
- bootstrap/muon setup \
- -Dstatic=false \
- -Dcurl=enabled \
- -Dzlib=enabled \
- -Dlibpkgconf=enabled \
- -Dsamu=disabled \
+ mv ../meson-docs subprojects/
+ ./bootstrap.sh build
+ build/muon setup build
+ samu -C build
+
+ # options copied from abuild-meson
+ build/muon setup \
+ -Dprefix=/usr \
+ -Dlibdir=/usr/lib \
+ -Dlibexecdir=/usr/libexec \
+ -Dbindir=/usr/bin \
+ -Dsbindir=/usr/sbin \
+ -Dincludedir=/usr/include \
+ -Ddatadir=/usr/share \
+ -Dmandir=/usr/share/man \
+ -Dinfodir=/usr/share/info \
+ -Dlocaledir=/usr/share/locale \
+ -Dsysconfdir=/etc \
+ -Dlocalstatedir=/var \
+ -Dsharedstatedir=/var/lib \
+ -Dbuildtype=plain \
+ -Dauto_features=auto \
+ -Dwrap_mode=nodownload \
+ -Db_lto=false \
+ -Db_staticpic=true \
+ -Db_pie=true \
build
- ninja -C build
+
+ samu -C build
+}
+
+check() {
+ build/muon -C build test -d dots
}
package() {
- install -Dm711 build/muon "$pkgdir"/usr/bin/muon
- install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+ DESTDIR=$pkgdir build/muon -C build install
}
sha512sums="
-34a76775e137687e345426d3d7dd415fafe5f053d1881b8a2f384ebe49046d9b338c210f3eb1544fddd2dd912427a5d75fb2d8a5be269e3b3e9c95cf5e622e38 muon-f4ee369d4a90ca597aaf63d99da9355266eba83b.tar.gz
-937d8fffec20b5244d7234738eda5baba8a351bff2a6815ec71c30c08180d63febcb6a2adc9a1bd495481d2384cf04c01ab8aa5abc121b76d344a559e4b65569 fix-bootstrap.patch
+654f675e33cd5c582a1fc232d4a36ed8b07bff4b89e5dd74b7b1e2a5a2b4aeadfe74f139c203c095fe0bb9658fc90a429e0899949ebc45c197903f03fa96e62e muon-c447322926bf7537bed5554004a75a6debb0051f.tar.gz
+f1851c76975723ae93e83cba7c135c30f3ed2f183ec084c925ebe0de7a9405f29eb1f6c807fbb5e4da0f84e240e407ac4c2e7f390e82039ce6ef99b7fd519c41 meson-docs.tar.gz
+082f21a3688389cdc83ee44ceffb2a1559fc5390c48a7a2ad395440ec7f1f2ea89b35f57c875ed8c948ed3949b657da5f45898a564f259039ff89db674ac5d38 meson-docs-patch.tar.gz
"
diff --git a/testing/muon/fix-bootstrap.patch b/testing/muon/fix-bootstrap.patch
deleted file mode 100644
index db19cbeec4..0000000000
--- a/testing/muon/fix-bootstrap.patch
@@ -1,19 +0,0 @@
-diff '--color=auto' -Nurp a/bootstrap.sh b/bootstrap.sh
---- a/bootstrap.sh 2021-08-17 03:11:15.990682670 +0200
-+++ b/bootstrap.sh 2021-08-17 03:11:33.563754987 +0200
-@@ -11,7 +11,6 @@ dir="$1"
- mkdir -p "$dir"
-
- cat \
-- platform/dirs.c \
- src/coerce.c \
- src/compilers.c \
- src/data/bucket_array.c \
-@@ -59,6 +58,7 @@ cat \
- src/main.c \
- src/opts.c \
- src/output/output.c \
-+ src/platform/dirs.c \
- src/platform/filesystem.c \
- src/platform/mem.c \
- src/platform/path.c \
--
2.34.2