summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2020-08-01 12:58:38 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2020-08-01 12:58:52 +0200
commitdd0cc9b3c115e218e3ecb7f54b233a83e4b28610 (patch)
tree29ea55a029a4e4da29637cd958c8056d56f5ec6a
parentdev-python/dask: Bump to 2.22.0 (diff)
downloadgentoo-dd0cc9b3c115e218e3ecb7f54b233a83e4b28610.tar.gz
gentoo-dd0cc9b3c115e218e3ecb7f54b233a83e4b28610.tar.bz2
gentoo-dd0cc9b3c115e218e3ecb7f54b233a83e4b28610.zip
media-gfx/slic3r: fixed compilation with boost 1.73 for 9999
Bug: https://bugs.gentoo.org/722308 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
-rw-r--r--media-gfx/slic3r/files/slic3r-9999-boost-173.patch39
-rw-r--r--media-gfx/slic3r/slic3r-9999.ebuild3
2 files changed, 41 insertions, 1 deletions
diff --git a/media-gfx/slic3r/files/slic3r-9999-boost-173.patch b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
new file mode 100644
index 00000000000..ef7289afcd8
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
@@ -0,0 +1,39 @@
+--- a/xs/src/libslic3r/SLAPrint.cpp 2020-05-10 23:32:00.044962439 -0600
++++ b/xs/src/libslic3r/SLAPrint.cpp 2020-05-10 23:40:48.867348908 -0600
+@@ -7,6 +7,7 @@
+ #include <iostream>
+ #include <complex>
+ #include <cstdio>
++#include "boost/bind.hpp"
+
+ namespace Slic3r {
+
+--- a/xs/src/libslic3r/PrintObject.cpp 2020-05-10 23:32:00.044962439 -0600
++++ b/xs/src/libslic3r/PrintObject.cpp 2020-05-10 23:46:22.614152088 -0600
+@@ -7,6 +7,7 @@
+ #include <algorithm>
+ #include <vector>
+ #include <limits>
++#include "boost/bind.hpp"
+
+ namespace Slic3r {
+
+--- a/xs/src/libslic3r/SupportMaterial.cpp 2020-05-10 23:32:00.044962439 -0600
++++ b/xs/src/libslic3r/SupportMaterial.cpp 2020-05-10 23:54:17.078033850 -0600
+@@ -1,5 +1,6 @@
+ #include "SupportMaterial.hpp"
+ #include "Log.hpp"
++#include "boost/bind.hpp"
+
+ namespace Slic3r
+ {
+--- a/xs/src/libslic3r/TriangleMesh.cpp 2020-05-10 23:32:00.045962432 -0600
++++ b/xs/src/libslic3r/TriangleMesh.cpp 2020-05-10 23:35:44.778426800 -0600
+@@ -15,6 +15,7 @@
+ #include <stdexcept>
+ #include <boost/config.hpp>
+ #include <boost/nowide/convert.hpp>
++#include "boost/bind.hpp"
+
+ #ifdef SLIC3R_DEBUG
+ #include "SVG.hpp"
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index d4bc4f6a67a..61ef1b641af 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -75,6 +75,7 @@ src_prepare() {
pushd "${WORKDIR}/slic3r-${PV}" || die
sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
eapply "${FILESDIR}"/${P}-no-locallib.patch
+ eapply "${FILESDIR}"/${P}-boost-173.patch
eapply_user
popd || die
}