Patch-Source: https://github.com/FreeCAD/FreeCAD/commit/7b377a216b9185960e4cee980a6504dc1a755f50 fixes stderr reassignment -- From 7b377a216b9185960e4cee980a6504dc1a755f50 Mon Sep 17 00:00:00 2001 From: wmayer 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 -#include #include "GuiNativeEventLinux.h" #include "GuiApplicationNativeEventAware.h" #include -#include #include #include #include -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");