pool/FreeCAD
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1201788 from science

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1201788
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/FreeCAD?expand=0&rev=49
This commit is contained in:
Ana Guerrero 2024-09-19 19:16:58 +00:00 committed by Git OBS Bridge
commit b61847b9ee
3 changed files with 98 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FreeCAD.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 18 09:35:46 UTC 2024 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Add patch for Boost 1.86 compatibility (upstream with changes):
* boost_1_86_fixes.patch
-------------------------------------------------------------------
Sat May 4 17:46:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>

2
FreeCAD.spec
View File

@ -58,6 +58,8 @@ Patch12: https://github.com/FreeCAD/FreeCAD/commit/aa54ba73df4d42878130c9
Patch13: https://github.com/FreeCAD/FreeCAD/commit/91457bbdee2422c7f0372688cf72d021cf222073.patch#/freecad-copy_options-2.patch
# PATCH-FIX-OPENSUSE
Patch14: freecad-opengl.patch
# PATCH-FIX-UPSTREAM - patch from master, modified for 0.21.1 - https://github.com/FreeCAD/FreeCAD/commit/98888241920ad04fa3c2f56bdf196debf8cfb39c.patch
Patch15: boost_1_86_fixes.patch
# Test suite fails on 32bit and I don't want to debug that anymore
ExcludeArch: %ix86 %arm ppc s390 s390x

90
boost_1_86_fixes.patch Normal file
View File

@ -0,0 +1,90 @@
From 98888241920ad04fa3c2f56bdf196debf8cfb39c Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@freecad.org>
Date: Thu, 22 Aug 2024 17:00:03 +0200
Subject: [PATCH] Building: Boost dependency errors
Fixes #15999
---
src/Mod/Part/App/Geometry.cpp | 1 +
src/Mod/Part/App/PreCompiled.h | 1 +
src/Mod/Sketcher/App/Constraint.cpp | 1 +
src/Mod/Sketcher/App/PreCompiled.h | 1 +
src/Mod/TechDraw/App/CenterLine.cpp | 1 +
src/Mod/TechDraw/App/Cosmetic.cpp | 1 +
src/Mod/TechDraw/App/CosmeticVertex.cpp | 1 +
src/Mod/TechDraw/App/Geometry.cpp | 1 +
src/Mod/TechDraw/App/PreCompiled.h | 1 +
9 files changed, 9 insertions(+)
diff --git a/src/Mod/Part/App/Geometry.cpp b/src/Mod/Part/App/Geometry.cpp
index 046d2624d6d3..307fddb0aab1 100644
--- a/src/Mod/Part/App/Geometry.cpp
+++ b/src/Mod/Part/App/Geometry.cpp
@@ -102,6 +102,7 @@
# include <GeomAdaptor_HCurve.hxx>
# endif
+# include <boost/random.hpp>
# include <cmath>
# include <ctime>
#endif //_PreComp_
diff --git a/src/Mod/Sketcher/App/Constraint.cpp b/src/Mod/Sketcher/App/Constraint.cpp
index 1ee3e53753a9..b802e36d5864 100644
--- a/src/Mod/Sketcher/App/Constraint.cpp
+++ b/src/Mod/Sketcher/App/Constraint.cpp
@@ -23,6 +23,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <QDateTime>
+#include <boost/random.hpp>
#include <cmath>
#endif
diff --git a/src/Mod/TechDraw/App/CenterLine.cpp b/src/Mod/TechDraw/App/CenterLine.cpp
index eac348ce0b2a..21a39e2b9b94 100644
--- a/src/Mod/TechDraw/App/CenterLine.cpp
+++ b/src/Mod/TechDraw/App/CenterLine.cpp
@@ -23,6 +23,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
+ #include <boost/random.hpp>
#include <boost/uuid/uuid_io.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include <BRepBuilderAPI_MakeEdge.hxx>
diff --git a/src/Mod/TechDraw/App/Cosmetic.cpp b/src/Mod/TechDraw/App/Cosmetic.cpp
index c2e9fe24a446..6dc50ec5c9af 100644
--- a/src/Mod/TechDraw/App/Cosmetic.cpp
+++ b/src/Mod/TechDraw/App/Cosmetic.cpp
@@ -24,6 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <BRepBuilderAPI_MakeEdge.hxx>
+# include <boost/random.hpp>
# include <boost/uuid/uuid_generators.hpp>
# include <boost/uuid/uuid_io.hpp>
#endif
diff --git a/src/Mod/TechDraw/App/CosmeticVertex.cpp b/src/Mod/TechDraw/App/CosmeticVertex.cpp
index 24401e78d259..e2ffe27b474c 100644
--- a/src/Mod/TechDraw/App/CosmeticVertex.cpp
+++ b/src/Mod/TechDraw/App/CosmeticVertex.cpp
@@ -25,6 +25,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
+ #include <boost/random.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>
#endif // _PreComp_
diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp
index 504bea6d07c0..43510f4da365 100644
--- a/src/Mod/TechDraw/App/Geometry.cpp
+++ b/src/Mod/TechDraw/App/Geometry.cpp
@@ -24,6 +24,7 @@
#ifndef _PreComp_
# include <cmath>
+# include <boost/random.hpp>
# include <boost/uuid/uuid_generators.hpp>
# include <boost/uuid/uuid_io.hpp>