Date: Tuesday, January 15, 2019 @ 11:58:53 Author: arojas Revision: 423326
Fix build with boost 1.69 Added: openscad/trunk/openscad-boost-1.69.patch Modified: openscad/trunk/PKGBUILD ---------------------------+ PKGBUILD | 7 +++++-- openscad-boost-1.69.patch | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-01-15 11:48:30 UTC (rev 423325) +++ PKGBUILD 2019-01-15 11:58:53 UTC (rev 423326) @@ -16,13 +16,16 @@ # full tests need imagemagick and an X11 or framebuffer session checkdepends=('cmake' 'xproto' 'libx11' 'python2') source=("http://files.openscad.org/openscad-$_ver.src.tar.gz" - "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch") + "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch" + openscad-boost-1.69.patch::"https://github.com/openscad/openscad/commit/ce564617.patch") md5sums=('a498a218a247468eee140ccc44c73afa' - '9a2359c30582f7ce4df05f6879bf6635') + '9a2359c30582f7ce4df05f6879bf6635' + '90a87f7aa70a37f31512adcefcda86d8') prepare() { cd "$srcdir/$pkgname-$_ver" patch -p1 -i ../openscad-2015.03_p2_uic_tr_fix.patch + patch -p1 -i ../openscad-boost-1.69.patch # Fix build with boost 1.69 } build() { Added: openscad-boost-1.69.patch =================================================================== --- openscad-boost-1.69.patch (rev 0) +++ openscad-boost-1.69.patch 2019-01-15 11:58:53 UTC (rev 423326) @@ -0,0 +1,22 @@ +From ce5646179848cb61f628c9f96a59ceec234c5b7b Mon Sep 17 00:00:00 2001 +From: Marius Kintel <mar...@kintel.net> +Date: Sun, 21 Oct 2018 12:02:50 -0400 +Subject: [PATCH] Build fix for boost 1.69 + +--- + src/CSGTreeEvaluator.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CSGTreeEvaluator.cc b/src/CSGTreeEvaluator.cc +index 245d7e07d9..51d3439348 100644 +--- a/src/CSGTermEvaluator.cc ++++ b/src/CSGTermEvaluator.cc +@@ -176,7 +176,7 @@ shared_ptr<CSGNode> CSGTreeEvaluator::evaluateCSGNodeFromGeometry( + auto 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(); ++ bool convex{ps->convexValue()}; + if (ps && !convex) { + assert(ps->getDimension() == 3); + auto ps_tri = new PolySet(3, ps->convexValue());