~alpine/aports

testing/muon: upgrade to 0_git20211008 v1 APPLIED

KikooDX <kikoodx@paranoici.org>
2 years ago 
KikooDX: 1
 testing/muon: upgrade to 0_git20211008

 2 files changed, 5 insertions(+), 26 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git: 

curl -s https://lists.alpinelinux.org/~alpine/aports/patches/3712/mbox | git am -3
Learn more about email & git
Reply to thread View this thread in the archives

[PATCH] testing/muon: upgrade to 0_git20211008 Export this patch

KikooDX <kikoodx@paranoici.org>
2 years ago 
---
 testing/muon/APKBUILD            | 12 +++++-------
 testing/muon/fix-bootstrap.patch | 19 -------------------
 2 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 testing/muon/fix-bootstrap.patch

diff --git a/testing/muon/APKBUILD b/testing/muon/APKBUILD
index 0b387550c4..9d07dd2430 100644
--- a/testing/muon/APKBUILD
+++ b/testing/muon/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: KikooDX <kikoodx@paranoici.org>
# Maintainer: KikooDX <kikoodx@paranoici.org>
pkgname=muon
pkgver=0_git20210812
pkgrel=1
pkgver=0_git20211008
pkgrel=0
pkgdesc="meson implementation in C"
options="!check" # broken test suite
url="https://sr.ht/~lattis/muon"
@@ -12,9 +12,8 @@ license="GPL-3.0-only"
depends="samurai"
makedepends="pkgconf-dev curl-dev zlib-dev"
subpackages="$pkgname-doc"
_gitrev=f4ee369d4a90ca597aaf63d99da9355266eba83b
source="$pkgname-$_gitrev.tar.gz::$_giturl/archive/$_gitrev.tar.gz
	fix-bootstrap.patch"
_gitrev=354d545b7e62d2e15c1a4a8be844967b8962d920
source="$pkgname-$_gitrev.tar.gz::$_giturl/archive/$_gitrev.tar.gz"
builddir="$srcdir/$pkgname-$_gitrev"

prepare() {
@@ -39,6 +38,5 @@ package() {
}

sha512sums="
34a76775e137687e345426d3d7dd415fafe5f053d1881b8a2f384ebe49046d9b338c210f3eb1544fddd2dd912427a5d75fb2d8a5be269e3b3e9c95cf5e622e38  muon-f4ee369d4a90ca597aaf63d99da9355266eba83b.tar.gz
937d8fffec20b5244d7234738eda5baba8a351bff2a6815ec71c30c08180d63febcb6a2adc9a1bd495481d2384cf04c01ab8aa5abc121b76d344a559e4b65569  fix-bootstrap.patch
478949d38f2b317fc825411441b763110069fb877c52140e8ae9b51816504b15483ebc18ee6e0ed5317f4c048704e20a9ee4ba435da685a51254c421887d38ef  muon-354d545b7e62d2e15c1a4a8be844967b8962d920.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.33.0
Leo <no-reply@dispatch.alpinelinux.org>
2 years ago 
Had to revert this as it failed on 32bit arches and I didn't notice

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/26299#note_184733