Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/, media-gfx/slic3r/
Date: Sat, 01 Aug 2020 10:59:04
Message-Id: 1596279532.dd0cc9b3c115e218e3ecb7f54b233a83e4b28610.fordfrog@gentoo
1 commit: dd0cc9b3c115e218e3ecb7f54b233a83e4b28610
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 1 10:58:38 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 1 10:58:52 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd0cc9b3
7
8 media-gfx/slic3r: fixed compilation with boost 1.73 for 9999
9
10 Bug: https://bugs.gentoo.org/722308
11 Package-Manager: Portage-3.0.1, Repoman-2.3.23
12 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14 media-gfx/slic3r/files/slic3r-9999-boost-173.patch | 39 ++++++++++++++++++++++
15 media-gfx/slic3r/slic3r-9999.ebuild | 3 +-
16 2 files changed, 41 insertions(+), 1 deletion(-)
17
18 diff --git a/media-gfx/slic3r/files/slic3r-9999-boost-173.patch b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
19 new file mode 100644
20 index 00000000000..ef7289afcd8
21 --- /dev/null
22 +++ b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
23 @@ -0,0 +1,39 @@
24 +--- a/xs/src/libslic3r/SLAPrint.cpp 2020-05-10 23:32:00.044962439 -0600
25 ++++ b/xs/src/libslic3r/SLAPrint.cpp 2020-05-10 23:40:48.867348908 -0600
26 +@@ -7,6 +7,7 @@
27 + #include <iostream>
28 + #include <complex>
29 + #include <cstdio>
30 ++#include "boost/bind.hpp"
31 +
32 + namespace Slic3r {
33 +
34 +--- a/xs/src/libslic3r/PrintObject.cpp 2020-05-10 23:32:00.044962439 -0600
35 ++++ b/xs/src/libslic3r/PrintObject.cpp 2020-05-10 23:46:22.614152088 -0600
36 +@@ -7,6 +7,7 @@
37 + #include <algorithm>
38 + #include <vector>
39 + #include <limits>
40 ++#include "boost/bind.hpp"
41 +
42 + namespace Slic3r {
43 +
44 +--- a/xs/src/libslic3r/SupportMaterial.cpp 2020-05-10 23:32:00.044962439 -0600
45 ++++ b/xs/src/libslic3r/SupportMaterial.cpp 2020-05-10 23:54:17.078033850 -0600
46 +@@ -1,5 +1,6 @@
47 + #include "SupportMaterial.hpp"
48 + #include "Log.hpp"
49 ++#include "boost/bind.hpp"
50 +
51 + namespace Slic3r
52 + {
53 +--- a/xs/src/libslic3r/TriangleMesh.cpp 2020-05-10 23:32:00.045962432 -0600
54 ++++ b/xs/src/libslic3r/TriangleMesh.cpp 2020-05-10 23:35:44.778426800 -0600
55 +@@ -15,6 +15,7 @@
56 + #include <stdexcept>
57 + #include <boost/config.hpp>
58 + #include <boost/nowide/convert.hpp>
59 ++#include "boost/bind.hpp"
60 +
61 + #ifdef SLIC3R_DEBUG
62 + #include "SVG.hpp"
63
64 diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
65 index d4bc4f6a67a..61ef1b641af 100644
66 --- a/media-gfx/slic3r/slic3r-9999.ebuild
67 +++ b/media-gfx/slic3r/slic3r-9999.ebuild
68 @@ -1,4 +1,4 @@
69 -# Copyright 1999-2019 Gentoo Authors
70 +# Copyright 1999-2020 Gentoo Authors
71 # Distributed under the terms of the GNU General Public License v2
72
73 EAPI=6
74 @@ -75,6 +75,7 @@ src_prepare() {
75 pushd "${WORKDIR}/slic3r-${PV}" || die
76 sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
77 eapply "${FILESDIR}"/${P}-no-locallib.patch
78 + eapply "${FILESDIR}"/${P}-boost-173.patch
79 eapply_user
80 popd || die
81 }