diff --git a/testing/freecad/APKBUILD b/testing/freecad/APKBUILD
index 6d40f529e06..730d18d20bc 100644
--- a/testing/freecad/APKBUILD
+++ b/testing/freecad/APKBUILD
@@ -47,6 +47,7 @@ makedepends="
 checkdepends="xvfb-run mesa mesa-dri-gallium font-opensans"
 source="https://github.com/FreeCAD/FreeCAD/archive/$pkgver/freecad-$pkgver.tar.gz
 	no-execinfo.patch
+	no-workaround-spnav.patch
 	resourceDirectory.patch
 	tests.patch
 	"
@@ -92,6 +93,7 @@ package() {
 sha512sums="
 c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d  freecad-0.20.2.tar.gz
 73aaba7015dce7048eb7d2456131b5b5ba4673cc980503331987be54d99daed5f61db015ca33d7d2ef0f02bd3192da8ce122c103c3b93f9959927deb4f0b933e  no-execinfo.patch
+15696bdaaf77482f1b5d3806535a8004c8cec7d598d62092d9f0394b4ca9e2ad6cedd77c4b86a83a06324d16678c1c6bbf3a390b807729717a2f513e858afd50  no-workaround-spnav.patch
 8ba13b17bad66316757d180c1b9e9e72a24382627eac7c43a2264b3b5101e6e8f701775f2b805ed733f500fbcd8b0e8e422ec58a9ab3d948d613b666157d4c52  resourceDirectory.patch
 5db19e0aa2ca1fd21f4c56afc9db54390a799262aaa0a741704c2c304b0068fd6ca1dcc086465e12e9c0cfe06aac750aaf9b8f5f4db324539af4dd3394803ff9  tests.patch
 "
diff --git a/testing/freecad/no-workaround-spnav.patch b/testing/freecad/no-workaround-spnav.patch
new file mode 100644
index 00000000000..ee4fead9fa4
--- /dev/null
+++ b/testing/freecad/no-workaround-spnav.patch
@@ -0,0 +1,69 @@
+Patch-Source: https://github.com/FreeCAD/FreeCAD/commit/7b377a216b9185960e4cee980a6504dc1a755f50
+fixes stderr reassignment
+--
+From 7b377a216b9185960e4cee980a6504dc1a755f50 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Wed, 29 Jun 2022 15:19:18 +0200
+Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
+ with musl libc
+
+---
+ src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 ---------------------
+ 1 file changed, 27 deletions(-)
+
+diff --git a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
+index 7f0ddd75d262..455ece0b36bd 100644
+--- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
++++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
+@@ -21,42 +21,17 @@
+  ***************************************************************************/
+ 
+ #include <FCConfig.h>
+-#include <cstdio>
+ 
+ #include "GuiNativeEventLinux.h"
+ 
+ #include "GuiApplicationNativeEventAware.h"
+ #include <Base/Console.h>
+-#include <Base/FileInfo.h>
+ #include <QMainWindow>
+ 
+ #include <QSocketNotifier>
+ 
+ #include <spnav.h>
+ 
+-namespace {
+-class RedirectStdErr
+-{
+-public:
+-    RedirectStdErr()
+-        : fi(Base::FileInfo::getTempFileName())
+-        , file(stderr)
+-    {
+-        stderr = fopen(fi.filePath().c_str(), "w");
+-    }
+-    ~RedirectStdErr()
+-    {
+-        fclose(stderr);
+-        fi.deleteFile();
+-        stderr = file;
+-    }
+-
+-private:
+-    Base::FileInfo fi;
+-    FILE* file;
+-};
+-}
+-
+ Gui::GuiNativeEvent::GuiNativeEvent(Gui::GUIApplicationNativeEventAware *app)
+ : GuiAbstractNativeEvent(app)
+ {
+@@ -72,8 +47,6 @@ Gui::GuiNativeEvent::~GuiNativeEvent()
+ 
+ void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
+ {
+-    // tmp. redirect stderr to a file to suppress an error message from spnav_open()
+-    RedirectStdErr err;
+     Q_UNUSED(window)
+     if (spnav_open() == -1) {
+         Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");