6bec6c20b6
Fixes <https://issues.guix.gnu.org/72693>. * gnu/packages/patches/openscad-fix-boost-join.patch: New file. * gnu/packages/patches/openscad-with-cgal-5.3.patch: New file. * gnu/packages/patches/openscad-with-cgal-5.4.patch: New file. * gnu/local.mk (dist_patch_DATA): Register new patches. * gnu/packages/engineering.scm (openscad)[source]: Use new patches. [inputs, native-inputs]: Remove labels. [arguments]: Disable a few more tests. Remove trailing booleans. Change-Id: I3ce103afd8669dd68c95352a87d76994a3f08504
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 9aa0d7e9f2914fe5f547bdde69202161d1c6064d Mon Sep 17 00:00:00 2001
|
|
From: Jordan Brown <github@jordan.maileater.net>
|
|
Date: Sun, 18 Jul 2021 21:01:46 -0700
|
|
Subject: [PATCH] Fix build failure with "generic_print_polyhedron" on
|
|
CGAL-5.3.
|
|
|
|
---
|
|
src/cgalutils-polyhedron.cc | 13 -------------
|
|
src/cgalutils.h | 1 -
|
|
2 files changed, 14 deletions(-)
|
|
|
|
diff --git a/src/cgalutils-polyhedron.cc b/src/cgalutils-polyhedron.cc
|
|
index 9f4f98f623..41cca4b3f2 100644
|
|
--- a/src/cgalutils-polyhedron.cc
|
|
+++ b/src/cgalutils-polyhedron.cc
|
|
@@ -337,19 +337,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 21a01cdba6..c08a3aa7df 100644
|
|
--- a/src/cgalutils.h
|
|
+++ b/src/cgalutils.h
|
|
@@ -45,7 +45,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>
|