diff --git a/testing/noson/APKBUILD b/testing/noson/APKBUILD
index 2beaa50e44c..e76e62e78a7 100644
--- a/testing/noson/APKBUILD
+++ b/testing/noson/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
 pkgname=noson
 pkgver=2.8.6
-pkgrel=1
+pkgrel=2
 pkgdesc="An easy client interface to drive SONOS player"
 url="https://github.com/janbar/noson"
 arch="all"
@@ -13,26 +13,28 @@ makedepends="
 	flac-dev
 	openssl-dev>3
 	pulseaudio-dev
+	samurai
 	zlib-dev
 	"
 source="
 	$pkgname-$pkgver.tar.gz::https://github.com/janbar/noson/archive/$pkgver.tar.gz
+	gcc12.patch
 	"
 options="!check" # No unit tests
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=1
-	make -C build
+	cmake --build build
 }
 
 package() {
-	make DESTDIR="$pkgdir" install -C build
+	DESTDIR="$pkgdir" cmake --install build
 }
 
 sha512sums="
 88cb6b60eab117ffb3e55f64e99349c73704272b8ab1595ca06ba1bd4027636116673bbfcdf67f8790f0aa59fd0b2bc77522ab87e62f678431126d5cfa4d7973  noson-2.8.6.tar.gz
+18dc5e56f4a08be910cdae6ee6edf0c10c5864ba8712e4d21d357ea2e14bc9f23124b9699c9bf760972855fc1a28f64c071ac5a00b61d22da1bcd442cfe9eaec  gcc12.patch
 "
diff --git a/testing/noson/gcc12.patch b/testing/noson/gcc12.patch
new file mode 100644
index 00000000000..edaac4dc711
--- /dev/null
+++ b/testing/noson/gcc12.patch
@@ -0,0 +1,13 @@
+diff --git a/noson/src/private/os/threads/timeout.h b/noson/src/private/os/threads/timeout.h
+index f0c3453..d65fcd7 100644
+--- a/noson/src/private/os/threads/timeout.h
++++ b/noson/src/private/os/threads/timeout.h
+@@ -26,6 +26,8 @@
+ #include <mach/mach_time.h>
+ #endif
+ 
++#include <time.h>
++
+ #ifdef NSROOT
+ namespace NSROOT {
+ #endif