diff --git a/testing/freecad/APKBUILD b/testing/freecad/APKBUILD
index 212b3b4d0e8..bffb44b056c 100644
--- a/testing/freecad/APKBUILD
+++ b/testing/freecad/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Aiden Grossman <agrossman154@yahoo.com>
 pkgname=freecad
 pkgver=0.20
-pkgrel=0
+pkgrel=1
 pkgdesc="Free and open source 3D parametric modeler"
 url="https://freecadweb.org/"
 license="LGPL-2.0-or-later"
@@ -14,17 +14,18 @@ depends="
 makedepends="
 	boost-dev xerces-c-dev cmake doxygen python3-dev opencascade-dev glu-dev
 	vtk-dev libmedc-dev hdf5-dev eigen-dev qt5-qtxmlpatterns-dev qt5-qtsvg-dev
-	qt5-qtwebengine-dev coin-dev freeimage-dev swig libtbb-dev
+	qt5-qtwebengine-dev coin-dev freeimage-dev samurai swig libtbb-dev
 	"
 checkdepends="xvfb-run mesa mesa-dri-gallium ttf-opensans"
 source="https://github.com/FreeCAD/FreeCAD/archive/$pkgver/freecad-$pkgver.tar.gz
+	no-execinfo.patch
 	resourceDirectory.patch
 	tests.patch
 	"
 builddir="$srcdir/FreeCAD-$pkgver"
 
 build() {
-	cmake . -B ./build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC -w" \
@@ -62,6 +63,7 @@ package() {
 
 sha512sums="
 b1d91efa873f180bf635f6006d6c4b7a33b64b630955c639fe923bb340ce8104474688e05eea151d1ac1557388947ae81618cfc8a578f14706aa07b5cdc45cda  freecad-0.20.tar.gz
+73aaba7015dce7048eb7d2456131b5b5ba4673cc980503331987be54d99daed5f61db015ca33d7d2ef0f02bd3192da8ce122c103c3b93f9959927deb4f0b933e  no-execinfo.patch
 8ba13b17bad66316757d180c1b9e9e72a24382627eac7c43a2264b3b5101e6e8f701775f2b805ed733f500fbcd8b0e8e422ec58a9ab3d948d613b666157d4c52  resourceDirectory.patch
 8bc3c294eb37758ba847124f16f81cb061427fee0401c4b244cd1a5513e3328b8ad22e7e465292660d1aa86775e8f8320dfc167e14373ff6d722a268fcdc4cbd  tests.patch
 "
diff --git a/testing/freecad/no-execinfo.patch b/testing/freecad/no-execinfo.patch
new file mode 100644
index 00000000000..3e1c39c164a
--- /dev/null
+++ b/testing/freecad/no-execinfo.patch
@@ -0,0 +1,46 @@
+diff --git a/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp b/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp
+index 23c5083..54c7ecf 100644
+--- a/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp
++++ b/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp
+@@ -29,7 +29,6 @@
+ #ifndef WIN32
+ #include <unistd.h>
+ #include <sys/stat.h>
+-#include <execinfo.h>
+ #endif
+ 
+ 
+@@ -109,20 +108,7 @@ namespace Kernel_Utils
+ #ifndef WIN32
+   void print_traceback()
+   {
+-    void *array[50];
+-    size_t size;
+-    char **strings;
+-    size_t i;
+-
+-    size = backtrace (array, 40);
+-    strings = backtrace_symbols (array, size);
+-
+-    for (i = 0; i < size; i++)
+-      {
+-        std::cerr << strings[i] << std::endl;
+-      }
+-
+-    free (strings);
++    std::cerr << "there is no backtrace." << std::endl;
+   }
+ #else
+   #if (_MSC_VER >= 1400) // Visual Studio 2005
+diff --git a/src/App/Application.cpp b/src/App/Application.cpp
+index 3081623..ba3525f 100644
+--- a/src/App/Application.cpp
++++ b/src/App/Application.cpp
+@@ -1732,7 +1732,6 @@ static void freecadNewHandler ()
+ #endif
+ 
+ #if defined(FC_OS_LINUX)
+-#include <execinfo.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
+