summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2017-09-27 11:46:18 -0400
committerIan Stakenvicius <axs@gentoo.org>2017-09-27 11:48:08 -0400
commit583527c74d677920d06fdcbbd91931e090eed384 (patch)
tree186160a834cdd86479e5ea66d3477ff2829374f3 /media-gfx/slic3r
parentdev-python/libvirt-python: version bump to 3.7.0, bug #632118 (diff)
downloadgentoo-583527c74d677920d06fdcbbd91931e090eed384.tar.gz
gentoo-583527c74d677920d06fdcbbd91931e090eed384.tar.bz2
gentoo-583527c74d677920d06fdcbbd91931e090eed384.zip
media-gfx/slic3r: make v1.2.9 code c++11 compatible for gcc6+
Bug: http://bugs.gentoo.org/622338 Package-Manager: Portage-2.3.8, Repoman-2.3.1
Diffstat (limited to 'media-gfx/slic3r')
-rw-r--r--media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch38
-rw-r--r--media-gfx/slic3r/slic3r-1.2.9-r2.ebuild3
2 files changed, 40 insertions, 1 deletions
diff --git a/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch b/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch
new file mode 100644
index 00000000000..f6b15d70a1a
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch
@@ -0,0 +1,38 @@
+--- a/xs/src/libslic3r/Config.hpp 2015-06-17 04:38:28.000000000 -0400
++++ b/xs/src/libslic3r/Config.hpp 2017-09-27 10:59:26.527103728 -0400
+@@ -65,7 +65,7 @@
+
+ bool deserialize(std::string str) {
+ std::istringstream iss(str);
+- return iss >> this->value;
++ return static_cast<bool>(iss >> this->value);
+ };
+ };
+
+@@ -124,7 +124,7 @@
+
+ bool deserialize(std::string str) {
+ std::istringstream iss(str);
+- return iss >> this->value;
++ return static_cast<bool>(iss >> this->value);
+ };
+ };
+
+@@ -249,7 +249,7 @@
+ bool deserialize(std::string str) {
+ // don't try to parse the trailing % since it's optional
+ std::istringstream iss(str);
+- return iss >> this->value;
++ return static_cast<bool>(iss >> this->value);
+ };
+ };
+
+@@ -279,7 +279,7 @@
+ bool deserialize(std::string str) {
+ this->percent = str.find_first_of("%") != std::string::npos;
+ std::istringstream iss(str);
+- return iss >> this->value;
++ return static_cast<bool>(iss >> this->value);
+ };
+ };
+
diff --git a/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild
index 541c5bbd7b3..21f22728472 100644
--- a/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild
+++ b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -64,6 +64,7 @@ S="${WORKDIR}/Slic3r-${PV}/xs"
src_prepare() {
pushd "${WORKDIR}/Slic3r-${PV}" || die
eapply "${FILESDIR}/${P}-adjust_var_path.patch"
+ eapply "${FILESDIR}/${P}-c++11.patch"
eapply_user
popd || die
}