community/aaaaxy/APKBUILD

 # Contributor: Rudolf Polzer <divVerent@gmail.com>
 # Maintainer: Rudolf Polzer <divVerent@gmail.com>
 pkgname=aaaaxy
-pkgver=1.2.321
-pkgrel=1
+pkgver=1.2.331
+pkgrel=0
 pkgdesc="A nonlinear puzzle platformer taking place in impossible spaces"
 url="https://divVerent.github.io/aaaaxy/"
 arch="all !s390x !armhf !armv7 !riscv64"
@@ -59,6 +59,6 @@ package() {
 }
 
 sha512sums="
-967505d5cf25d09fc771f3c177413a0060a0d45a84737050ecc391fb77291073b44c9cd1e3f0de35997a10dd1301a43623c663181797175a00e2a82144e3df5f  aaaaxy-1.2.321.tar.gz
-f48486748351a48c5dd490784d954c3596c1230e52c95a9218418d9663a124d674d0d67eb72ea9de63a959b9bbf9e83ddf392fd7186b95e4ffe169edf7366185  sdl-gamecontrollerdb-for-aaaaxy-v1.2.321.zip
+352ff02a851d42e7dacb3472a1b87253da580b5ba78f4f6b9bd81ad73e9ac01ce92c4864f3bf9655a90edc4a4eb4cb060cf0cf96f91777e79316ac591ca454f6  aaaaxy-1.2.331.tar.gz
+a5c6723c95cf8dde578ab071a6771ee595d88dd09957759b2541e1202ddee3fa88338899f20c1af6c95c2acbca5827d97f98b10c4d5a0bfbf9dd2e376163a3ab  sdl-gamecontrollerdb-for-aaaaxy-v1.2.331.zip
 "

main/abuild/0001-make-increase-test-timeout.patch

+From 58a9262c480b524ad5489bcf393047c006bef225 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 12 Sep 2022 17:50:35 +0200
+Subject: [PATCH] make: increase test timeout
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 4f36624..2d1ebe7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -106,7 +106,7 @@ tests/Kyuafile: $(wildcard tests/*_test)
+ 	echo "syntax(2)" > $@
+ 	echo "test_suite('abuild')" >> $@
+ 	for i in $(notdir $(wildcard tests/*_test)); do \
+-		echo "atf_test_program{name='$$i',timeout=5}" >> $@ ; \
++		echo "atf_test_program{name='$$i',timeout=10}" >> $@ ; \
+ 	done
+ 
+ Kyuafile: tests/Kyuafile
+-- 
+2.37.3
+

main/abuild/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=abuild
-pkgver=3.9.0
+pkgver=3.10.0_rc1
 _ver=${pkgver%_git*}
-pkgrel=6
+pkgrel=1
 pkgdesc="Script to build Alpine Packages"
 url="https://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -15,7 +15,7 @@ fi
 makedepends_build="pkgconfig scdoc"
 makedepends_host="openssl-dev>3 zlib-dev"
 makedepends="$makedepends_host $makedepends_build"
-checkdepends="bats git"
+checkdepends="kyua git"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="
 	apkbuild-cpan:cpan:noarch
@@ -27,12 +27,7 @@ subpackages="
 options="suid"
 pkggroups="abuild"
 source="https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$pkgver/abuild-$pkgver.tar.gz
-	mr60-newapkbuild-use-abuild-meson.patch
-	mr128-newapkbuild-fetch-rust-deps-in-prepare.patch
-	mr131-newapkbuild-change-cmake-build-type.patch
-	mr134-modcacherw.patch
-	mr127-doas.patch
-	mr142-disable-go-buildvcs.patch
+	0001-make-increase-test-timeout.patch
 	"
 builddir="$srcdir"/abuild-$pkgver
 
@@ -90,11 +85,6 @@ _rootbld() {
 }
 
 sha512sums="
-a3075b18d4a085ca796d1c2df703c3e7c80e682623175eb0822479f3a6d96ffba571f283bdec8ae3db832e296f9e58bdd0f58097b86b503a91fbb40148084a68  abuild-3.9.0.tar.gz
-a52fa7978d61f1636dbe3d120fee4e3fab6fae018a91f662c082f4eab37e6fd63d74c55124fd50fa3a676a8af71ba858cebf93f3ca21f95b03d3478fa1e55e6b  mr60-newapkbuild-use-abuild-meson.patch
-f8d5c131cefb1c10d34962994ee3158fd8155acf68616fe471a7d07ce15e04d184bdfa3c181ec19bd1ca95e0f5acf1664f14a52b29451b2760aa580222e75f73  mr128-newapkbuild-fetch-rust-deps-in-prepare.patch
-56b71c3feff5a17d9550e1947fe316b7c7aa397f9e365532410e492ea992b8bfcfbb97041ddc2128c7bb9772e9e03584a9f5d5f5bcced00a1082e7374f02801a  mr131-newapkbuild-change-cmake-build-type.patch
-9a8697819a3c94a968be33eb014a8f59ea15cefd46046b7fb6ef58fcfde37d5a4243f0aaafe51ab6f43766c94775332ea88d4d07cccc3bd0d9443c26651aef21  mr134-modcacherw.patch
-41e68d43db29823305b0496cd35908951a169a7cf4715fb29a6b23c148fc9275cee019e88a7cded45e9ac2d48bdab574f61207d9cdff181efce29a97228e3e29  mr127-doas.patch
-701dbcf5bff3d82b8f17a049a33ba969f8f1b2151ad82c3854181b0949633474e720cd4f0be490f8163ef3351dcceed20c9bc1e89591d7ea11257495b1e6332e  mr142-disable-go-buildvcs.patch
+8dccc843cc6b3f53642bb2849d00cc00a283763f2b915c01600b0542ce16a96b2e265498b59ceff250a1c7be22c4a5aeb0cb0926c7498668ded897c64b83b9c0  abuild-3.10.0_rc1.tar.gz
+981c778c20a06a391bd4ff35d95b896f09d77411d4453141087c93c54f6c1e5f65c61bd8218879588d5abac3473ebd8eaca26549898e1346943258124fec80f0  0001-make-increase-test-timeout.patch
 "

main/abuild/mr127-doas.patch

-From 4dbf8e3756188748d3fff9dce81f93b21085d123 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 22 Jun 2022 16:38:55 +0200
-Subject: [PATCH] abuild-keygen: use doas instead of sudo
-
-fallback to sudo if doas was not found
----
- abuild-keygen.in         |  7 ++++---
- tests/abuild_keygen_test | 21 ++++++++++++++++++++-
- 2 files changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/abuild-keygen.in b/abuild-keygen.in
-index 299d86c..d9ac0bc 100644
---- a/abuild-keygen.in
-+++ b/abuild-keygen.in
-@@ -8,7 +8,7 @@
- 
- program_version=@VERSION@
- sharedir=${ABUILD_SHAREDIR:-@sharedir@}
--SUDO="${SUDO-sudo}"
-+SUDO="${SUDO-$(command -v doas || command -v sudo || echo doas)}"
- 
- if ! [ -f "$sharedir/functions.sh" ]; then
- 	echo "$sharedir/functions.sh: not found" >&2
-@@ -98,14 +98,15 @@ usage() {
- 		  -a, --append         Set PACKAGER_PRIVKEY=<generated key> in
- 		                       $ABUILD_USERCONF
- 
--		  -i, --install        Install public key into /etc/apk/keys using sudo
-+		  -i, --install        Install public key into /etc/apk/keys using doas
- 		  -n                   Non-interactive. Use defaults
- 		  -b, --numbits [BITS] The size of the private key to generate in bits.
- 		  -q, --quiet
- 		  -h, --help           Show this help
- 
- 		The SUDO variable can be set to pick which tool can be used to
--		elevate privileges, if it is not set it defaults to sudo.
-+		elevate privileges, if it is not set it defaults to doas or sudo if doas
-+		is not found.
- 
- 	__EOF__
- }

main/abuild/mr128-newapkbuild-fetch-rust-deps-in-prepare.patch

-Patch-Source: https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/128
---
-From 29611f3a6929b4edecd89506e666f963fa25ae52 Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Thu, 16 Dec 2021 00:19:07 +0100
-Subject: [PATCH 1/2] newapkbuild: fetch rust dependencies in prepare phase
-
-Fetch all dependencies in the prepare phase and do not access network
-in the following phases.
----
- newapkbuild.in | 27 ++++++++++++++++++++++++---
- 1 file changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/newapkbuild.in b/newapkbuild.in
-index c58d519..0182ad2 100644
---- a/newapkbuild.in
-+++ b/newapkbuild.in
-@@ -30,6 +30,12 @@ is_github_url() {
- 	return 1
- }
- 
-+prepare_rust() {
-+	cat >>APKBUILD<<__EOF__
-+	cargo fetch --locked
-+__EOF__
-+}
-+
- # Build sections
- build_make() {
- 	cat >>APKBUILD<<__EOF__
-@@ -104,7 +110,7 @@ __EOF__
- 
- build_rust() {
- 	cat >>APKBUILD<<__EOF__
--	cargo build --release --locked
-+	cargo build --frozen --release
- __EOF__
- }
- 
-@@ -150,7 +156,7 @@ __EOF__
- 
- check_rust() {
- 	cat >>APKBUILD<<__EOF__
--	cargo test --release --locked
-+	cargo test --frozen --release
- __EOF__
- }
- 
-@@ -199,7 +205,7 @@ __EOF__
- 
- package_rust() {
- 	cat >>APKBUILD<<__EOF__
--	cargo install --locked --path . --root="\$pkgdir/usr"
-+	cargo install --frozen --offline --path . --root="\$pkgdir/usr"
- 	rm "\$pkgdir"/usr/.crates*
- __EOF__
- }
-@@ -333,6 +339,21 @@ __EOF__
- 		fi
- 	fi
- 
-+	case "$buildtype" in
-+	rust)
-+		cat >>APKBUILD<<__EOF__
-+prepare() {
-+	default_prepare
-+
-+__EOF__
-+		prepare_rust
-+		cat >>APKBUILD<<__EOF__
-+}
-+
-+__EOF__
-+		;;
-+	esac
-+
- 	# Create build() function
- 	cat >>APKBUILD<<__EOF__
- build() {
--- 
-GitLab
-
-
-From 0a9374e4ffa8202ba011497ea39fb5443d7ef9a5 Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Thu, 16 Dec 2021 00:23:48 +0100
-Subject: [PATCH 2/2] newapkbuild: do not run cargo test with --release
-
-It takes a longer time to compile and, most importantly, it may cause
-unnecessary rebuild of everything in the package phase (installation).
----
- newapkbuild.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/newapkbuild.in b/newapkbuild.in
-index 0182ad2..9e8643d 100644
---- a/newapkbuild.in
-+++ b/newapkbuild.in
-@@ -156,7 +156,7 @@ __EOF__
- 
- check_rust() {
- 	cat >>APKBUILD<<__EOF__
--	cargo test --frozen --release
-+	cargo test --frozen
- __EOF__
- }
- 
--- 
-GitLab
-

main/abuild/mr131-newapkbuild-change-cmake-build-type.patch

-Patch-Source: https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/131
---
-From 6c43d67a053be0476384fcf8252c07fa2a235a87 Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Thu, 30 Dec 2021 21:48:50 +0000
-Subject: [PATCH] newapkbuild: refine default cmake format
-
-MinSizeRel is a better recommended default- of course it can still be
-overriden.
-the dot is redundant- we already specify -B and so the dot is implicitly
-cwd.
----
- newapkbuild.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/newapkbuild.in b/newapkbuild.in
-index c58d519..63b387d 100644
---- a/newapkbuild.in
-+++ b/newapkbuild.in
-@@ -65,8 +65,8 @@ build_cmake() {
- 		-DCMAKE_INSTALL_PREFIX=/usr \\
- 		-DCMAKE_INSTALL_LIBDIR=lib \\
- 		-DBUILD_SHARED_LIBS=True \\
--		-DCMAKE_BUILD_TYPE=None \\
--		\$CMAKE_CROSSOPTS .
-+		-DCMAKE_BUILD_TYPE=MinSizeRel \\
-+		\$CMAKE_CROSSOPTS
- 	cmake --build build
- __EOF__
- }
--- 
-GitLab
-

main/abuild/mr134-modcacherw.patch

-the commit puts it into default config- we put it here to activate it immediately
-diff --git a/abuild.in b/abuild.in
-index 76cd77b..bd38003 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -462,7 +462,7 @@ initdcheck() {
- 	local i line
- 	for i in $source; do
- 		case $i in
--		*.initd) 
-+		*.initd)
- 			line=$(head -n 1 "$srcdir"/"$(filename_from_uri $i)")
- 			;;
- 		*) continue ;;
-@@ -2793,6 +2793,8 @@ fi
- # for recursive action
- export REPODEST SRCDEST
- 
-+export GOFLAGS="$GOFLAGS -modcacherw"
-+
- # add dbg subpackage if its enabled globally
- if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && [ "$arch" != "noarch" ]; then
-         subpackages="$pkgname-dbg $subpackages"

main/abuild/mr142-disable-go-buildvcs.patch

-From f7f53bac2801cbddffcc36b0af0a5a8d7509b777 Mon Sep 17 00:00:00 2001
-From: Clayton Craft <clayton@craftyguy.net>
-Date: Fri, 1 Apr 2022 13:57:06 -0700
-Subject: [PATCH] abuild.conf: disable Go's buildvcs
-
-This was added in Go 1.18 and enabled by default, and causes builds to
-fail if $builddir is not a repo.
----
- abuild.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/abuild.conf b/abuild.conf
-index 4ff34f1..e0270ce 100644
---- a/abuild.conf
-+++ b/abuild.conf
-@@ -2,7 +2,7 @@ export CFLAGS="-Os -fomit-frame-pointer"
- export CXXFLAGS="$CFLAGS"
- export CPPFLAGS="$CFLAGS"
- export LDFLAGS="-Wl,--as-needed,-O1,--sort-common"
--export GOFLAGS="-buildmode=pie"
-+export GOFLAGS="-buildmode=pie -buildvcs=false"
- # Do note that these should work with at least GDC and LDC
- export DFLAGS="-Os"
- 

main/abuild/mr60-newapkbuild-use-abuild-meson.patch

-Patch-Source: https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/60
---
-From 55b66b3ad702ba673384126d98026043cdf949ef Mon Sep 17 00:00:00 2001
-From: Leo <thinkabit.ukim@gmail.com>
-Date: Tue, 7 Jul 2020 13:37:31 -0300
-Subject: [PATCH] newapkbuild: use meson-abuild helper instead of meson
-
-abuild-meson is a shellscript that wraps around meson and passes options
-meant for packaging software that uses meson, for Alpine Linux.
----
- newapkbuild.in | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/newapkbuild.in b/newapkbuild.in
-index c58d519..d7a2eb5 100644
---- a/newapkbuild.in
-+++ b/newapkbuild.in
-@@ -78,12 +78,7 @@ build_meson() {
- # TODO For cross compilation a cross_file needs to be created.
- 
- 	cat >>APKBUILD<<__EOF__
--	meson \\
--		--prefix=/usr \\
--		--sysconfdir=/etc \\
--		--mandir=/usr/share/man \\
--		--localstatedir=/var \\
--		--buildtype=plain \\
-+	abuild-meson \\
- 		. output
- 	meson compile \${JOBS:+-j \${JOBS}} -C output
- __EOF__
--- 
-GitLab
-