pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/cad/openscad Fix build with newer booost



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a5fe8a2cbd1
branches:  trunk
changeset: 396569:0a5fe8a2cbd1
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Mon Jun 03 15:22:51 2019 +0000

description:
Fix build with newer booost

diffstat:

 cad/openscad/distinfo                              |   3 ++-
 cad/openscad/patches/patch-src_CSGTermEvaluator.cc |  14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r da75865ccb97 -r 0a5fe8a2cbd1 cad/openscad/distinfo
--- a/cad/openscad/distinfo     Mon Jun 03 15:20:59 2019 +0000
+++ b/cad/openscad/distinfo     Mon Jun 03 15:22:51 2019 +0000
@@ -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 -r da75865ccb97 -r 0a5fe8a2cbd1 cad/openscad/patches/patch-src_CSGTermEvaluator.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/openscad/patches/patch-src_CSGTermEvaluator.cc        Mon Jun 03 15:22:51 2019 +0000
@@ -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());



Home | Main Index | Thread Index | Old Index