wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 15:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

freecad: fix build for occt 7.7

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2023-06-05 23:39:27 +07:00
parent b8da68555b
commit aa13922f5c
4 changed files with 116 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
srcpkgs/freecad/patches/001-include.patch Normal file
View file

@ -0,0 +1,112 @@
From 9a41845a417189776741297c50a3827ce292bc4f Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 3 Jul 2022 22:51:16 +0200
Subject: [PATCH] [Part] OCCError.h: remove unneeded includes
- also sort includes
---
src/Mod/Part/App/OCCError.h | 36 +++----------------------
src/Mod/Part/App/OffsetCurvePyImp.cpp | 12 ++++-----
src/Mod/Part/App/OffsetSurfacePyImp.cpp | 10 +++----
3 files changed, 12 insertions(+), 46 deletions(-)
--- a/src/Mod/Part/App/OCCError.h
+++ b/src/Mod/Part/App/OCCError.h
@@ -23,36 +23,8 @@
#ifndef _OCCError_h_
#define _OCCError_h_
-# include <Standard_Version.hxx>
# include <Standard_Failure.hxx>
-# include <Standard_AbortiveTransaction.hxx>
-# include <Standard_ConstructionError.hxx>
-# if OCC_VERSION_HEX >= 0x060500
-# include <Standard_DefineException.hxx>
-# endif
-# include <Standard_DimensionError.hxx>
-# include <Standard_DimensionMismatch.hxx>
-# include <Standard_DivideByZero.hxx>
-# include <Standard_DomainError.hxx>
-# include <Standard_ImmutableObject.hxx>
-# include <Standard_LicenseError.hxx>
-# include <Standard_LicenseNotFound.hxx>
-# include <Standard_MultiplyDefined.hxx>
-# include <Standard_NegativeValue.hxx>
-# include <Standard_NoMoreObject.hxx>
-# include <Standard_NoSuchObject.hxx>
-# include <Standard_NotImplemented.hxx>
-# include <Standard_NullObject.hxx>
-# include <Standard_NullValue.hxx>
-# include <Standard_NumericError.hxx>
-# include <Standard_OutOfMemory.hxx>
-# include <Standard_OutOfRange.hxx>
-# include <Standard_Overflow.hxx>
-# include <Standard_ProgramError.hxx>
-# include <Standard_RangeError.hxx>
-# include <Standard_TooManyUsers.hxx>
-# include <Standard_TypeMismatch.hxx>
-# include <Standard_Underflow.hxx>
+# include <Standard_Version.hxx>
#include <Mod/Part/PartGlobal.h>
#include <Base/Console.h>
@@ -88,4 +60,3 @@ PartExport extern PyObject* PartExceptio
#define PY_CATCH_OCC _PY_CATCH_OCC(return(NULL))
#endif // _OCCError_h_
-
--- a/src/Mod/Part/App/OffsetCurvePyImp.cpp
+++ b/src/Mod/Part/App/OffsetCurvePyImp.cpp
@@ -20,20 +20,20 @@
* *
***************************************************************************/
-
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Geom_OffsetCurve.hxx>
#endif
-#include "OCCError.h"
-#include "Geometry.h"
+#include <Base/GeometryPyCXX.h>
+#include <Base/Vector3D.h>
+#include <Base/VectorPy.h>
+
#include "OffsetCurvePy.h"
#include "OffsetCurvePy.cpp"
+#include "Geometry.h"
+#include "OCCError.h"
-#include <Base/GeometryPyCXX.h>
-#include <Base/VectorPy.h>
-#include <Base/Vector3D.h>
using namespace Part;
--- a/src/Mod/Part/App/OffsetSurfacePyImp.cpp
+++ b/src/Mod/Part/App/OffsetSurfacePyImp.cpp
@@ -20,20 +20,16 @@
* *
***************************************************************************/
-
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Geom_OffsetSurface.hxx>
# include <memory>
#endif
-#include <Base/VectorPy.h>
-#include <Base/Vector3D.h>
-
#include "OCCError.h"
-#include "Geometry.h"
-#include <Mod/Part/App/OffsetSurfacePy.h>
-#include <Mod/Part/App/OffsetSurfacePy.cpp>
+#include "OffsetSurfacePy.h"
+#include "OffsetSurfacePy.cpp"
+
using namespace Part;

4
srcpkgs/freecad/patches/153-limits.h-for-musl.patch
View file

@ -1,6 +1,6 @@
--- a/src/FCConfig.h.ORIG
--- a/src/FCConfig.h
+++ b/src/FCConfig.h
@@ -321,4 +321,10 @@
@@ -321,4 +321,10 @@ typedef unsigned __int64 uint64_t;
//# define _PreComp_ // use precompiled header
#endif

5
srcpkgs/freecad/patches/154-revert-gui-tmp-redirect-stderr.patch
View file

@ -12,8 +12,6 @@ Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
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 7f0ddd75d..455ece0b3 100644
--- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
+++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
@@ -21,42 +21,17 @@
@ -68,6 +66,3 @@ index 7f0ddd75d..455ece0b3 100644
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");
--
2.37.1

6
srcpkgs/freecad/patches/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
View file

@ -8,11 +8,9 @@ Subject: [PATCH] Draft: update inspect.getargspec to inspect.getfullargspec
src/Mod/Draft/draftguitools/gui_snapper.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Mod/Draft/draftguitools/gui_snapper.py b/src/Mod/Draft/draftguitools/gui_snapper.py
index de27eaa53482..ef9ba5284d3c 100644
--- a/src/Mod/Draft/draftguitools/gui_snapper.py
+++ b/src/Mod/Draft/draftguitools/gui_snapper.py
@@ -1438,7 +1438,7 @@ def accept():
@@ -1426,7 +1426,7 @@ class Snapper:
Gui.Snapper.off()
self.ui.offUi()
if callback:
@ -21,7 +19,7 @@ index de27eaa53482..ef9ba5284d3c 100644
obj = None
if self.snapInfo and ("Object" in self.snapInfo) and self.snapInfo["Object"]:
obj = App.ActiveDocument.getObject(self.snapInfo["Object"])
@@ -1457,7 +1457,7 @@ def cancel():
@@ -1445,7 +1445,7 @@ class Snapper:
Gui.Snapper.off()
self.ui.offUi()
if callback: