- Added patch fix_build_with_cgal-5.3.patch.
Upstream patch to fix build with CGAL-5.3. OBS-URL: https://build.opensuse.org/package/show/graphics/openscad?expand=0&rev=43
This commit is contained in:
committed by
Git OBS Bridge
parent
88c185300c
commit
604dc604cc
44
fix_build_with_cgal-5.3.patch
Normal file
44
fix_build_with_cgal-5.3.patch
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
commit cc49ad8dac24309f5452d5dea9abd406615a52d9
|
||||||
|
Author: Jordan Brown <github@jordan.maileater.net>
|
||||||
|
Date: Sun Jul 18 21:01:46 2021 -0700
|
||||||
|
Upstream: merged
|
||||||
|
Subject: Upstream patch to fix build with cgal-5.3.
|
||||||
|
|
||||||
|
Fix build failure with "generic_print_polyhedron" on CGAL-5.3.
|
||||||
|
|
||||||
|
diff --git a/src/cgalutils-polyhedron.cc b/src/cgalutils-polyhedron.cc
|
||||||
|
index 0e5c72c36..14bddb7f4 100644
|
||||||
|
--- a/src/cgalutils-polyhedron.cc
|
||||||
|
+++ b/src/cgalutils-polyhedron.cc
|
||||||
|
@@ -335,19 +335,6 @@ namespace CGALUtils {
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
- template <typename Polyhedron>
|
||||||
|
- std::string printPolyhedron(const Polyhedron &p) {
|
||||||
|
- std::ostringstream sstream;
|
||||||
|
- sstream.precision(20);
|
||||||
|
-
|
||||||
|
- Polyhedron_writer writer;
|
||||||
|
- generic_print_polyhedron(sstream, p, writer);
|
||||||
|
-
|
||||||
|
- return sstream.str();
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- template std::string printPolyhedron(const CGAL_Polyhedron &p);
|
||||||
|
-
|
||||||
|
}; // namespace CGALUtils
|
||||||
|
|
||||||
|
#endif /* ENABLE_CGAL */
|
||||||
|
diff --git a/src/cgalutils.h b/src/cgalutils.h
|
||||||
|
index 231762ebc..7da5a25ca 100644
|
||||||
|
--- a/src/cgalutils.h
|
||||||
|
+++ b/src/cgalutils.h
|
||||||
|
@@ -33,7 +33,6 @@ namespace CGALUtils {
|
||||||
|
bool is_approximately_convex(const PolySet &ps);
|
||||||
|
Geometry const* applyMinkowski(const Geometry::Geometries &children);
|
||||||
|
|
||||||
|
- template <typename Polyhedron> std::string printPolyhedron(const Polyhedron &p);
|
||||||
|
template <typename Polyhedron> bool createPolySetFromPolyhedron(const Polyhedron &p, PolySet &ps);
|
||||||
|
template <typename Polyhedron> bool createPolyhedronFromPolySet(const PolySet &ps, Polyhedron &p);
|
||||||
|
template <class Polyhedron_A, class Polyhedron_B>
|
@@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Aug 27 07:43:42 UTC 2021 - Samu Voutilainen <smar@smar.fi>
|
||||||
|
|
||||||
|
- Added patch fix_build_with_cgal-5.3.patch.
|
||||||
|
Upstream patch to fix build with CGAL-5.3.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat May 8 07:00:15 UTC 2021 - Samu Voutilainen <smar@smar.fi>
|
Sat May 8 07:00:15 UTC 2021 - Samu Voutilainen <smar@smar.fi>
|
||||||
|
|
||||||
|
@@ -24,6 +24,7 @@ License: GPL-3.0-or-later
|
|||||||
Group: Productivity/Graphics/CAD
|
Group: Productivity/Graphics/CAD
|
||||||
URL: https://www.openscad.org/
|
URL: https://www.openscad.org/
|
||||||
Source: https://files.openscad.org/%{name}-%{version}.src.tar.gz
|
Source: https://files.openscad.org/%{name}-%{version}.src.tar.gz
|
||||||
|
Patch1: fix_build_with_cgal-5.3.patch
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: double-conversion-devel
|
BuildRequires: double-conversion-devel
|
||||||
BuildRequires: eigen3-devel
|
BuildRequires: eigen3-devel
|
||||||
@@ -63,6 +64,8 @@ aspects, e.g. modelling of machine parts.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%qmake5 PREFIX=%{_prefix} CONFIG+=qopenglwidget CONFIG+=c++14
|
%qmake5 PREFIX=%{_prefix} CONFIG+=qopenglwidget CONFIG+=c++14
|
||||||
# As of 08.05.2021, memoryperjob constraint is not working correctly,
|
# As of 08.05.2021, memoryperjob constraint is not working correctly,
|
||||||
|
Reference in New Issue
Block a user