diff options
| author | bouyer <bouyer@pkgsrc.org> | 2019-06-03 15:22:51 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2019-06-03 15:22:51 +0000 |
| commit | 6ab9b763144a2230e713badcc5d3c84da092d309 (patch) | |
| tree | 6f52b99b98c39d4c1e75e6f01a55211b416f2948 | |
| parent | 9505ba52684f80567290c8864089a8f4293ed3ba (diff) | |
| download | pkgsrc-6ab9b763144a2230e713badcc5d3c84da092d309.tar.gz | |
Fix build with newer booost
| -rw-r--r-- | cad/openscad/distinfo | 3 | ||||
| -rw-r--r-- | cad/openscad/patches/patch-src_CSGTermEvaluator.cc | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/cad/openscad/distinfo b/cad/openscad/distinfo index 3c9751320d7..d67eaef26bd 100644 --- a/cad/openscad/distinfo +++ b/cad/openscad/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.6 2016/12/16 11:13:27 plunky Exp $ +$NetBSD: distinfo,v 1.7 2019/06/03 15:22:51 bouyer Exp $ SHA1 (openscad-2015.03-3.src.tar.gz) = a04d154e77f5ae2251ea65333d5ac76834a19227 RMD160 (openscad-2015.03-3.src.tar.gz) = 323eda5bd96b2093d4fbb2274763f7a0ae4eb7f4 SHA512 (openscad-2015.03-3.src.tar.gz) = b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee Size (openscad-2015.03-3.src.tar.gz) = 13309147 bytes SHA1 (patch-openscad.pro) = 8b4250254ea66338ecafdac437ce9a69deb2fe27 +SHA1 (patch-src_CSGTermEvaluator.cc) = 6364b4b48478c0a003ac849367ff4024aae16977 SHA1 (patch-src_colormap.h) = 6e2a4509dc0a93bd5c5e656b8dff3b2de7a30c1a SHA1 (patch-src_scintillaeditor.h) = c28a86e8c9951ed27b571fb943b3099138c97b5c diff --git a/cad/openscad/patches/patch-src_CSGTermEvaluator.cc b/cad/openscad/patches/patch-src_CSGTermEvaluator.cc new file mode 100644 index 00000000000..86ab82407d7 --- /dev/null +++ b/cad/openscad/patches/patch-src_CSGTermEvaluator.cc @@ -0,0 +1,14 @@ +$NetBSD: patch-src_CSGTermEvaluator.cc,v 1.1 2019/06/03 15:22:51 bouyer Exp $ + +--- src/CSGTermEvaluator.cc.orig 2019-06-03 15:20:25.276227139 +0200 ++++ src/CSGTermEvaluator.cc 2019-06-03 15:21:19.026127066 +0200 +@@ -109,8 +109,7 @@ + shared_ptr<const PolySet> ps = dynamic_pointer_cast<const PolySet>(geom); + // Since is_convex() doesn't handle non-planar faces, we need to tessellate + // also in the indeterminate state so we cannot just use a boolean comparison. See #1061 +- bool convex = ps->convexValue(); +- if (ps && !convex) { ++ if (ps && !ps->convexValue()) { + assert(ps->getDimension() == 3); + PolySet *ps_tri = new PolySet(3, ps->convexValue()); + ps_tri->setConvexity(ps->getConvexity()); |