From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE544138334 for ; Wed, 15 May 2019 18:29:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAB25E08D1; Wed, 15 May 2019 18:29:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 70CF0E08D1 for ; Wed, 15 May 2019 18:29:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A27CA344585 for ; Wed, 15 May 2019 18:29:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89F5F5A4 for ; Wed, 15 May 2019 18:29:11 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1557944868.2f39ea71ddb4d2008a1ab414493196d3c94e05b7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch media-gfx/openscad/openscad-2015.03_p3-r1.ebuild X-VCS-Directories: media-gfx/openscad/files/ media-gfx/openscad/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2f39ea71ddb4d2008a1ab414493196d3c94e05b7 X-VCS-Branch: master Date: Wed, 15 May 2019 18:29:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6b45af82-2071-4d22-82e9-21cb9ed2501c X-Archives-Hash: 6e7ceb770eb23af1909c83ca4e440dec commit: 2f39ea71ddb4d2008a1ab414493196d3c94e05b7 Author: Bernd Waibel gmail com> AuthorDate: Wed May 15 16:01:55 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed May 15 18:27:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f39ea71 media-gfx/openscad: fix boost-1.70.0 build Fixes a build issue with >=boost-1.69 Closes: https://bugs.gentoo.org/684038 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Bernd Waibel gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12003 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch | 13 +++++++++++++ media-gfx/openscad/openscad-2015.03_p3-r1.ebuild | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch b/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch new file mode 100644 index 00000000000..7684eba92e8 --- /dev/null +++ b/media-gfx/openscad/files/openscad-2015.03_p3_fix-boost-1.70.0-build.patch @@ -0,0 +1,13 @@ +diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc +index 6416f29..b3753cf 100644 +--- a/src/CSGTermEvaluator.cc ++++ b/src/CSGTermEvaluator.cc +@@ -109,7 +109,7 @@ static shared_ptr evaluate_csg_term_from_geometry(const State &state, + shared_ptr ps = dynamic_pointer_cast(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); + PolySet *ps_tri = new PolySet(3, ps->convexValue()); diff --git a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild index 1b34fa207c5..043c1d22a21 100644 --- a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild +++ b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild @@ -41,7 +41,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-2015.03_p2_uic_tr_fix.patch" + "${FILESDIR}/${PN}-2015.03_p3_fix-boost-1.70.0-build.patch" +) S="${WORKDIR}/${PN}-${MY_PV}"