Accepting request 1103145 from home:StefanBruens:branches:science

- Update to version 0.21.0: * Lots of bugfixes and new features, for details see https://wiki.freecad.org/Release_notes_0.21 and https://github.com/FreeCAD/FreeCAD/releases/tag/0.21 - Drop upstream patches: * 0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch * 0001-Part-OCCError.h-remove-unneeded-includes.patch * 0001-Drawing-add-missing-include.patch * 0001-FEM-add-missing-include.patch * 0001-Revert-unused-parameter-warning-change.patch * 0001-FEM-femmesh-fix-AttributeError-module-numpy-has-no-a.patch * 0001-Fix-build-with-gcc13.patch - Fix build on aarch64, correctly link OpenGL, add 0001-Fix-variable-name-for-OpenGL-library.patch OBS-URL: https://build.opensuse.org/request/show/1103145 OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=165
2023-08-09 13:24:18 +00:00 · 2023-08-09 13:24:18 +00:00 · a712a3dad8
commit a712a3dad8
parent 912cbc1e5c
13 changed files with 81 additions and 356 deletions
--- a/0001-Drawing-add-missing-include.patch
+++ b/0001-Drawing-add-missing-include.patch
@ -1,24 +0,0 @@
-From 2d9e4c0137bab0b63482f30f0d89cf3f9418a4e0 Mon Sep 17 00:00:00 2001
-From: Uwe <donovaly@users.noreply.github.com>
-Date: Mon, 12 Dec 2022 05:15:47 +0100
-Subject: [PATCH] [Drawing] add missing include
-
---
- src/Mod/Drawing/App/AppDrawingPy.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Mod/Drawing/App/AppDrawingPy.cpp b/src/Mod/Drawing/App/AppDrawingPy.cpp
-index d4ed53ebaf..ecefd3d5a8 100644
--- a/src/Mod/Drawing/App/AppDrawingPy.cpp
-+++ b/src/Mod/Drawing/App/AppDrawingPy.cpp
-@@ -28,6 +28,7 @@
- #include <Mod/Part/App/TopoShapePy.h>
- #include "ProjectionAlgos.h"
- #include <Base/Console.h>
-+#include <Base/Interpreter.h>
- #include <Base/VectorPy.h>
- #include <boost/regex.hpp>
- 
-- 
-2.38.1
-
--- a/0001-FEM-add-missing-include.patch
+++ b/0001-FEM-add-missing-include.patch
@ -1,51 +0,0 @@
-From 38e0f1da25a1826510c68cb10a8731ebef895eaf Mon Sep 17 00:00:00 2001
-From: Uwe <donovaly@users.noreply.github.com>
-Date: Mon, 12 Dec 2022 10:43:53 +0100
-Subject: [PATCH] [FEM] add missing include
-
- also fix compiler warning about unused parameter
---
- src/Mod/Fem/App/AppFemPy.cpp                  | 1 +
- src/Mod/PartDesign/App/FeatureSketchBased.cpp | 1 -
- src/Mod/PartDesign/App/FeatureSketchBased.h   | 1 -
- 3 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/Mod/Fem/App/AppFemPy.cpp b/src/Mod/Fem/App/AppFemPy.cpp
-index ce6bde8c37..ee4d409c1e 100644
--- a/src/Mod/Fem/App/AppFemPy.cpp
-+++ b/src/Mod/Fem/App/AppFemPy.cpp
-@@ -32,6 +32,7 @@
- #include <CXX/Objects.hxx>
- 
- #include <Base/Console.h>
-+#include <Base/Interpreter.h>
- #include <Base/Tools.h>
- #include <Base/VectorPy.h>
- #include <Base/PlacementPy.h>
-diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.cpp b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
-index 21485b1dee..5d35bd08f5 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.cpp
-+++ b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
-@@ -449,7 +449,6 @@ void ProfileBased::getFaceFromLinkSub(TopoDS_Face& upToFace, const App::Property
- 
- void ProfileBased::getUpToFace(TopoDS_Face& upToFace,
-                               const TopoDS_Shape& support,
-                              const TopoDS_Face& supportface,
-                               const TopoDS_Shape& sketchshape,
-                               const std::string& method,
-                               const gp_Dir& dir)
-diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.h b/src/Mod/PartDesign/App/FeatureSketchBased.h
-index 62629e288b..db892d15f4 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.h
-+++ b/src/Mod/PartDesign/App/FeatureSketchBased.h
-@@ -134,7 +134,6 @@ protected:
-     /// Find a valid face to extrude up to
-     static void getUpToFace(TopoDS_Face& upToFace,
-                             const TopoDS_Shape& support,
-                            const TopoDS_Face& supportface,
-                             const TopoDS_Shape& sketchshape,
-                             const std::string& method,
-                             const gp_Dir& dir);
-- 
-2.38.1
-
--- a/0001-FEM-femmesh-fix-AttributeError-module-numpy-has-no-a.patch
+++ b/0001-FEM-femmesh-fix-AttributeError-module-numpy-has-no-a.patch
@ -1,29 +0,0 @@
-From 876aab4b0e7b73dd16f96c92706a6a464ddd23df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Thu, 26 Jan 2023 00:55:12 +0100
-Subject: [PATCH] FEM: femmesh: fix AttributeError: module 'numpy' has no
- attribute 'int'
-
---
- src/Mod/Fem/femmesh/meshtools.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/Mod/Fem/femmesh/meshtools.py b/src/Mod/Fem/femmesh/meshtools.py
-index dd8671b0ea..7693249bb9 100644
--- a/src/Mod/Fem/femmesh/meshtools.py
-+++ b/src/Mod/Fem/femmesh/meshtools.py
-@@ -485,7 +485,10 @@ def get_femelement_sets(
-     # fem_objects = FreeCAD FEM document objects
-     # get femelements for reference shapes of each obj.References
-     count_femelements = 0
-    referenced_femelements = np.zeros((max(femelement_table.keys())+1,),dtype=np.int)
-+    referenced_femelements = np.zeros(
-+        (max(femelement_table.keys()) + 1,),
-+        dtype=int
-+    )
-     has_remaining_femelements = None
-     for fem_object_i, fem_object in enumerate(fem_objects):
-         obj = fem_object["Object"]
-- 
-2.38.1
-
--- a/0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch
+++ b/0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch
@ -1,53 +0,0 @@
-From d334b435006d81b31fd6a78651d2dbb11f4167e0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Tue, 16 Aug 2022 00:05:17 +0200
-Subject: [PATCH] Fix build with NG 6.2.2201+, include
- BRepMesh_IncrementalMesh.hxx
-
-Netgen commit 16b88e8e67a0 "OCC Mesher Cleanup" removed many OCC includes
-from occgeom.hpp, e.g. BRepMesh_IncrementalMesh.hxx.
-
-The missing headers and class definitions cause a compilation failure.
---
- .../salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp       | 3 +++
- .../src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp           | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
-index 4dd8ed274e..95e7e4c04e 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
-+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
-@@ -50,7 +50,9 @@
- 
- #include <utilities.h>
- 
-+#include <BRepBndLib.hxx>
- #include <BRepBuilderAPI_Copy.hxx>
-+#include <BRepMesh_IncrementalMesh.hxx>
- #include <BRep_Tool.hxx>
- #include <Bnd_B3d.hxx>
- #include <NCollection_Map.hxx>
-@@ -66,6 +68,7 @@
- #include <TopTools_DataMapOfShapeShape.hxx>
- #include <TopTools_MapOfShape.hxx>
- #include <TopoDS.hxx>
-+#include <TopoDS_Solid.hxx>
- 
- #ifdef _MSC_VER
- #pragma warning(disable : 4067)
-diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
-index 2ebe4f87ac..72269e84db 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
-+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
-@@ -39,6 +39,8 @@
- #include <StdMeshers_MaxElementArea.hxx>
- #include <StdMeshers_QuadranglePreference.hxx>
- #include <StdMeshers_ViscousLayers2D.hxx>
-+#include <TopExp.hxx>
-+#include <TopExp_Explorer.hxx>
- 
- #include <Precision.hxx>
- #include <Standard_ErrorHandler.hxx>
-- 
-2.37.1
-
--- a/0001-Fix-build-with-gcc13.patch
+++ b/0001-Fix-build-with-gcc13.patch
@ -1,10 +0,0 @@
--- a/src/3rdParty/libE57Format/include/E57Format.h
-+++ b/src/3rdParty/libE57Format/include/E57Format.h	2023-03-27 09:59:08.143013765 +0200
-@@ -33,6 +33,7 @@
- 
- #include <cfloat>
- #include <memory>
-+#include <cstdint>
- #include <vector>
- 
- #include "E57Exception.h"
--- a/0001-Fix-variable-name-for-OpenGL-library.patch
+++ b/0001-Fix-variable-name-for-OpenGL-library.patch
@ -0,0 +1,27 @@
+From a350852845a4427ec09813b8b9e9242a1d30976f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Wed, 1 Mar 2023 02:42:56 +0100
+Subject: [PATCH] Fix variable name for OpenGL library
+
+In case Qt is build with GLES libraries, it does not implicitly add
+the OpenGL library, and Quarter is not linked to the GL library.
+---
+ src/Gui/Quarter/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Gui/Quarter/CMakeLists.txt b/src/Gui/Quarter/CMakeLists.txt
+index 45ee147fdd..e840e151d0 100644
+--- a/src/Gui/Quarter/CMakeLists.txt
+++ b/src/Gui/Quarter/CMakeLists.txt
+@@ -30,7 +30,7 @@ IF (Spacenav_FOUND)
+ ENDIF(Spacenav_FOUND)
+ 
+ 
+-SET(AllLibs ${Coin_LIBRARY} ${QT_LIBRARIES} ${OPENGL_LIBRARY} ${Extra_libraries})
+SET(AllLibs ${Coin_LIBRARY} ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${Extra_libraries})
+ 
+ 
+ 
+-- 
+2.39.1
+
--- a/0001-Part-OCCError.h-remove-unneeded-includes.patch
+++ b/0001-Part-OCCError.h-remove-unneeded-includes.patch
@ -1,130 +0,0 @@
-From 3cbb9f0c11205af622f375b6883e7ae00442dd7b 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             | 38 ++-----------------------
- src/Mod/Part/App/OffsetCurvePyImp.cpp   | 12 ++++----
- src/Mod/Part/App/OffsetSurfacePyImp.cpp | 10 ++-----
- 3 files changed, 12 insertions(+), 48 deletions(-)
-
-diff --git a/src/Mod/Part/App/OCCError.h b/src/Mod/Part/App/OCCError.h
-index 19e8208179..96558ecb0e 100644
--- a/src/Mod/Part/App/OCCError.h
-+++ b/src/Mod/Part/App/OCCError.h
-@@ -23,43 +23,12 @@
- #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>
-#include <Base/PyObjectBase.h>
-#include <Base/Interpreter.h>
- #include <Base/Exception.h>
-#include <App/Application.h>
-+#include <Mod/Part/PartGlobal.h>
-+
- 
- namespace Part {
- PartExport extern PyObject* PartExceptionOCCError;
-@@ -88,4 +57,3 @@ PartExport extern PyObject* PartExceptionOCCDimensionError;
- 
- #define PY_CATCH_OCC _PY_CATCH_OCC(return(NULL))
- #endif  // _OCCError_h_
-
-diff --git a/src/Mod/Part/App/OffsetCurvePyImp.cpp b/src/Mod/Part/App/OffsetCurvePyImp.cpp
-index 295d9efeb8..6b18074a0b 100644
--- 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;
- 
-diff --git a/src/Mod/Part/App/OffsetSurfacePyImp.cpp b/src/Mod/Part/App/OffsetSurfacePyImp.cpp
-index 6aa820aa35..792333c817 100644
--- 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;
- 
-- 
-2.38.1
-
--- a/0001-Revert-unused-parameter-warning-change.patch
+++ b/0001-Revert-unused-parameter-warning-change.patch
@ -1,38 +0,0 @@
-From 9b643070f6b88c5733d525c1eda8a17f9116d7ff Mon Sep 17 00:00:00 2001
-From: Uwe <donovaly@users.noreply.github.com>
-Date: Mon, 12 Dec 2022 11:28:07 +0100
-Subject: [PATCH] Revert unused parameter warning change
-
-This reverts partially commit 38e0f1da25a1826510c68cb10a8731ebef895eaf.
---
- src/Mod/PartDesign/App/FeatureSketchBased.cpp | 1 +
- src/Mod/PartDesign/App/FeatureSketchBased.h   | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.cpp b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
-index 5d35bd08f5..21485b1dee 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.cpp
-+++ b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
-@@ -449,6 +449,7 @@ void ProfileBased::getFaceFromLinkSub(TopoDS_Face& upToFace, const App::Property
- 
- void ProfileBased::getUpToFace(TopoDS_Face& upToFace,
-                               const TopoDS_Shape& support,
-+                              const TopoDS_Face& supportface,
-                               const TopoDS_Shape& sketchshape,
-                               const std::string& method,
-                               const gp_Dir& dir)
-diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.h b/src/Mod/PartDesign/App/FeatureSketchBased.h
-index db892d15f4..62629e288b 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.h
-+++ b/src/Mod/PartDesign/App/FeatureSketchBased.h
-@@ -134,6 +134,7 @@ protected:
-     /// Find a valid face to extrude up to
-     static void getUpToFace(TopoDS_Face& upToFace,
-                             const TopoDS_Shape& support,
-+                            const TopoDS_Face& supportface,
-                             const TopoDS_Shape& sketchshape,
-                             const std::string& method,
-                             const gp_Dir& dir);
-- 
-2.38.1
-
--- a/FreeCAD-0.20.2.tar.gz
+++ b/FreeCAD-0.20.2.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be3b0be917142d36074f58782b276973890a3fad850bc1db2db99a5ad0c8732b
-size 75558140
--- a/FreeCAD-0.21.0.tar.gz
+++ b/FreeCAD-0.21.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31a7f9aef99763904d7ffa9fd2d06e2e318e10e5306dac04710234a564fa778b
+size 66086371
--- a/FreeCAD-test.spec
+++ b/FreeCAD-test.spec
@ -17,7 +17,7 @@


 Name:           FreeCAD-test
-Version:        0.20.2
+Version:        0.21.0
 Release:        0
 Summary:        Meta source package that runs the FreeCAD testsuite when built
 License:        GPL-2.0-or-later AND LGPL-2.0-or-later
--- a/FreeCAD.changes
+++ b/FreeCAD.changes
@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Aug  8 15:49:02 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Update to version 0.21.0:
+  * Lots of bugfixes and new features, for details see
+    https://wiki.freecad.org/Release_notes_0.21 and
+    https://github.com/FreeCAD/FreeCAD/releases/tag/0.21
+- Drop upstream patches:
+  * 0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch
+  * 0001-Part-OCCError.h-remove-unneeded-includes.patch
+  * 0001-Drawing-add-missing-include.patch
+  * 0001-FEM-add-missing-include.patch
+  * 0001-Revert-unused-parameter-warning-change.patch
+  * 0001-FEM-femmesh-fix-AttributeError-module-numpy-has-no-a.patch
+  * 0001-Fix-build-with-gcc13.patch
+
+-------------------------------------------------------------------
+Tue Aug  8 12:01:48 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Fix build on aarch64, correctly link OpenGL, add
+  0001-Fix-variable-name-for-OpenGL-library.patch
+
 -------------------------------------------------------------------
 Mon Mar 27 09:49:49 UTC 2023 - Adrian Schröter <adrian@suse.de>

--- a/FreeCAD.spec
+++ b/FreeCAD.spec
@ -27,7 +27,7 @@
 %bcond_without smesh

 Name:           FreeCAD
-Version:        0.20.2
+Version:        0.21.0
 Release:        0
 Summary:        General Purpose 3D CAD Modeler
 License:        GPL-2.0-or-later AND LGPL-2.0-or-later
@ -39,19 +39,7 @@ Patch0:         0001-Gui-Quarter-Add-missing-OpenGL-includes.patch
 # PATCH-FIX-OPENSUSE
 Patch1:         0001-Avoid-catching-SIGSEGV-defer-to-system-services.patch
 # PATCH-FIX-UPSTREAM
-Patch2:         0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch
-# PATCH-FIX-UPSTREAM
-Patch3:         0001-Part-OCCError.h-remove-unneeded-includes.patch
-# PATCH-FIX-UPSTREAM
-Patch4:         0001-Drawing-add-missing-include.patch
-# PATCH-FIX-UPSTREAM
-Patch5:         0001-FEM-add-missing-include.patch
-# PATCH-FIX-UPSTREAM
-Patch6:         0001-Revert-unused-parameter-warning-change.patch
-# PATCH-FIX-UPSTREAM
-Patch7:         0001-FEM-femmesh-fix-AttributeError-module-numpy-has-no-a.patch
-# PATCH-FIX-OPENSUSE submitted upstream here: https://github.com/FreeCAD/FreeCAD/pull/9077
-Patch8:         0001-Fix-build-with-gcc13.patch
+Patch9:         0001-Fix-variable-name-for-OpenGL-library.patch

 # Test suite fails on 32bit and I don't want to debug that anymore
 ExcludeArch:    %ix86 %arm ppc s390 s390x
@ -71,6 +59,7 @@ BuildRequires:  cmake
 BuildRequires:  double-conversion-devel
 BuildRequires:  eigen3-devel
 BuildRequires:  fdupes
+BuildRequires:  fmt-devel
 BuildRequires:  glew-devel
 BuildRequires:  hdf5-devel
 BuildRequires:  hicolor-icon-theme
@ -92,13 +81,14 @@ BuildRequires:  sqlite3-devel
 # Qt5 & python3
 BuildRequires:  python3-devel >= 3.6.9
 BuildRequires:  python3-matplotlib
-BuildRequires:  python3-pivy
+BuildRequires:  python3-pivy >= 0.6.8
 BuildRequires:  python3-ply
 BuildRequires:  python3-pybind11-devel
 BuildRequires:  python3-pycxx-devel
 BuildRequires:  python3-pyside2-devel
 BuildRequires:  python3-vtk
 BuildRequires:  python3-xml
+BuildRequires:  cmake(GTest)
 BuildRequires:  cmake(coin)
 BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5OpenGL)
@ -109,6 +99,7 @@ BuildRequires:  pkgconfig(Qt5UiTools)
 BuildRequires:  pkgconfig(Qt5WebEngineWidgets)
 BuildRequires:  pkgconfig(Qt5X11Extras)
 BuildRequires:  pkgconfig(Qt5XmlPatterns)
+BuildRequires:  pkgconfig(liblzma)
 Requires:       python3-numpy
 Requires:       python3-pyside2
 Requires:       python3-vtk
@ -146,9 +137,20 @@ This package contains the files needed for development with FreeCAD.
 %prep
 %setup -q
 %autopatch -p1
+# Use system gtest - https://github.com/FreeCAD/FreeCAD/issues/10126
+sed -i -e 's/add_subdirectory(lib)/find_package(GTest)/' \
+       -e 's/ gtest_main / GTest::gtest_main /' \
+  tests/CMakeLists.txt
+# Lower Python minimum version for Leap
+sed -i -e 's/3.8/3.6/' cMake/FreeCAD_Helpers/SetupPython.cmake
+# Use boost::filesystem - https://github.com/FreeCAD/FreeCAD/issues/10127
+sed -i -e 's/std::filesystem/boost::filesystem/' \
+       -e '/include/ s@<filesystem>@<boost/filesystem.hpp>@' \
+       -e '/std::.fstream/ s@_tempFile@_tempFile.string()@' \
+  tests/src/Base/Reader.cpp

 # fix env-script-interpreter
-sed -i '1c#!%{__python3}' \
+sed -i '1 s@#!.*@#!%{__python3}@' \
        src/Mod/AddonManager/AddonManager.py \
        src/Mod/Mesh/App/MeshTestsApp.py \
        src/Mod/Robot/KukaExporter.py \
@ -171,6 +173,9 @@ sed -i 's/\r$//' src/Mod/Test/unittestgui.py
 rm src/3rdparty/Pivy -fr
 rm src/3rdparty/Pivy-0.5 -fr

+# Remove bundled gtest
+rm tests/lib -fr
+
 # Resources are looked up relative to the binaries location,
 # so all these need the same prefix, see src/App/Application.cpp
 %build
@ -194,8 +199,9 @@ rm src/3rdparty/Pivy-0.5 -fr
  -DPYBIND11_FINDPYTHON:BOOL=ON \
  -DFREECAD_USE_PYBIND11:BOOL=ON \
  -DBUILD_ENABLE_CXX_STD:STRING="C++17" \
-  -DBUILD_QT5=ON \
+  -DFREECAD_QT_MAJOR_VERSION=5 \
  -DFREECAD_USE_QT_DIALOG:BOOL=OFF \
+  -DFREECAD_USE_EXTERNAL_FMT:BOOL=TRUE \
  -DFREECAD_USE_EXTERNAL_PIVY:BOOL=TRUE \
  -DBUILD_OPENSCAD:BOOL=ON \
  -DBUILD_FLAT_MESH:BOOL=ON \
@ -238,6 +244,11 @@ ln -s -t %{buildroot}/usr/bin %{x_prefix}/bin/FreeCADCmd
 %fdupes %{buildroot}/%{_libdir}
 %fdupes %{buildroot}/%{_datadir}

+%check
+%ctest --test-dir tests/src/Qt
+./build/tests/Tests_run
+./build/tests/Sketcher_tests_run
+
 %post -p /sbin/ldconfig

 %postun -p /sbin/ldconfig