From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
Date: Wed, 15 May 2019 18:29:11 +0000 (UTC) [thread overview]
Message-ID: <1557944868.2f39ea71ddb4d2008a1ab414493196d3c94e05b7.asturm@gentoo> (raw)
commit: 2f39ea71ddb4d2008a1ab414493196d3c94e05b7
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Wed May 15 16:01:55 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12003
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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<CSGTerm> evaluate_csg_term_from_geometry(const State &state,
+ 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();
++ 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}"
next reply other threads:[~2019-05-15 18:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-15 18:29 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-14 16:20 [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/ Andreas Sturmlechner
2022-07-03 11:51 Joonas Niilola
2022-04-15 6:18 Joonas Niilola
2021-05-04 22:02 Sam James
2021-03-07 9:03 Joonas Niilola
2020-12-07 8:56 Joonas Niilola
2020-06-12 7:00 Joonas Niilola
2020-06-12 7:00 Joonas Niilola
2017-10-21 21:24 Andreas Sturmlechner
2017-05-14 12:49 Michael Weber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1557944868.2f39ea71ddb4d2008a1ab414493196d3c94e05b7.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox