| 1 |
commit: 583527c74d677920d06fdcbbd91931e090eed384 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 27 15:46:18 2017 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 27 15:48:08 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=583527c7 |
| 7 |
|
| 8 |
media-gfx/slic3r: make v1.2.9 code c++11 compatible for gcc6+ |
| 9 |
|
| 10 |
Bug: http://bugs.gentoo.org/622338 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.8, Repoman-2.3.1 |
| 13 |
|
| 14 |
media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch | 38 +++++++++++++++++++++++++ |
| 15 |
media-gfx/slic3r/slic3r-1.2.9-r2.ebuild | 3 +- |
| 16 |
2 files changed, 40 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..f6b15d70a1a |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch |
| 23 |
@@ -0,0 +1,38 @@ |
| 24 |
+--- a/xs/src/libslic3r/Config.hpp 2015-06-17 04:38:28.000000000 -0400 |
| 25 |
++++ b/xs/src/libslic3r/Config.hpp 2017-09-27 10:59:26.527103728 -0400 |
| 26 |
+@@ -65,7 +65,7 @@ |
| 27 |
+ |
| 28 |
+ bool deserialize(std::string str) { |
| 29 |
+ std::istringstream iss(str); |
| 30 |
+- return iss >> this->value; |
| 31 |
++ return static_cast<bool>(iss >> this->value); |
| 32 |
+ }; |
| 33 |
+ }; |
| 34 |
+ |
| 35 |
+@@ -124,7 +124,7 @@ |
| 36 |
+ |
| 37 |
+ bool deserialize(std::string str) { |
| 38 |
+ std::istringstream iss(str); |
| 39 |
+- return iss >> this->value; |
| 40 |
++ return static_cast<bool>(iss >> this->value); |
| 41 |
+ }; |
| 42 |
+ }; |
| 43 |
+ |
| 44 |
+@@ -249,7 +249,7 @@ |
| 45 |
+ bool deserialize(std::string str) { |
| 46 |
+ // don't try to parse the trailing % since it's optional |
| 47 |
+ std::istringstream iss(str); |
| 48 |
+- return iss >> this->value; |
| 49 |
++ return static_cast<bool>(iss >> this->value); |
| 50 |
+ }; |
| 51 |
+ }; |
| 52 |
+ |
| 53 |
+@@ -279,7 +279,7 @@ |
| 54 |
+ bool deserialize(std::string str) { |
| 55 |
+ this->percent = str.find_first_of("%") != std::string::npos; |
| 56 |
+ std::istringstream iss(str); |
| 57 |
+- return iss >> this->value; |
| 58 |
++ return static_cast<bool>(iss >> this->value); |
| 59 |
+ }; |
| 60 |
+ }; |
| 61 |
+ |
| 62 |
|
| 63 |
diff --git a/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild |
| 64 |
index 541c5bbd7b3..21f22728472 100644 |
| 65 |
--- a/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild |
| 66 |
+++ b/media-gfx/slic3r/slic3r-1.2.9-r2.ebuild |
| 67 |
@@ -1,4 +1,4 @@ |
| 68 |
-# Copyright 1999-2016 Gentoo Foundation |
| 69 |
+# Copyright 1999-2017 Gentoo Foundation |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
|
| 72 |
EAPI=6 |
| 73 |
@@ -64,6 +64,7 @@ S="${WORKDIR}/Slic3r-${PV}/xs" |
| 74 |
src_prepare() { |
| 75 |
pushd "${WORKDIR}/Slic3r-${PV}" || die |
| 76 |
eapply "${FILESDIR}/${P}-adjust_var_path.patch" |
| 77 |
+ eapply "${FILESDIR}/${P}-c++11.patch" |
| 78 |
eapply_user |
| 79 |
popd || die |
| 80 |
} |
Archives