diff --git a/testing/fontforge/APKBUILD b/testing/fontforge/APKBUILD
index 4018e0c2fa5..a924149f526 100644
--- a/testing/fontforge/APKBUILD
+++ b/testing/fontforge/APKBUILD
@@ -1,11 +1,11 @@
 # Contributor: Ed Robinson <ed@reevoo.com>
 # Maintainer: Ed Robinson <ed@reevoo.com>
 pkgname=fontforge
-pkgver=20201107
-pkgrel=2
+pkgver=20220308
+pkgrel=0
 pkgdesc="free (libre) font editor for Windows, Mac OS X and GNU+Linux"
-url="https://fontforge.org"
-arch="all !s390x !x86" # test139_ff hangs on x86
+url="https://fontforge.org/"
+arch="all !s390x"
 license="GPL-3.0-or-later"
 makedepends="
 	cmake
@@ -20,6 +20,7 @@ makedepends="
 	gtk+3.0-dev
 	libuninameslist-dev
 	readline-dev
+	samurai
 	"
 subpackages="
 	$pkgname-dev
@@ -34,7 +35,7 @@ build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	cmake -B build . \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
@@ -52,15 +53,16 @@ build() {
 		-DENABLE_WOFF2=ON \
 		-DENABLE_DOCS=OFF \
 		$CMAKE_CROSSOPTS .
-	make -C build
+	cmake --build build
 }
 
 check() {
-	make -C build check
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	make -C build DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
 _py3() {
@@ -73,5 +75,7 @@ _py3() {
 	mv "$pkgdir"/usr/share/fontforge/python/excepthook.py "$subpkgdir"/usr/share/fontforge/python
 }
 
-sha512sums="cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc  fontforge-20201107.tar.xz
-8cb3fb00fa537eab2d4b194916343a0e2aab85c2415a1944c0d0e648d62a7748d5d4465fb99cb92385b749e73abfcaa429f4c9d2bb4c2edea8febeb227add93a  fix-select.patch"
+sha512sums="
+9975cffec8aa47bcb8c22405bea544cd263dc939b253e8fba2fbaa3b90a60e05b98eaf58365db8ae854d1fff8e641866a7e2e027003ae03a77104d6650dafb6c  fontforge-20220308.tar.xz
+8cb3fb00fa537eab2d4b194916343a0e2aab85c2415a1944c0d0e648d62a7748d5d4465fb99cb92385b749e73abfcaa429f4c9d2bb4c2edea8febeb227add93a  fix-select.patch
+"