Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/
Date: Mon, 04 Mar 2019 03:14:31
Message-Id: 1551669197.57422b4d9e26cec6d6976c5e573f7a72b636fd75.bman@gentoo
1 commit: 57422b4d9e26cec6d6976c5e573f7a72b636fd75
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Mar 1 17:31:52 2019 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 4 03:13:17 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57422b4d
7
8 media-gfx/slic3r: remove unused patches
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
12
13 .../files/slic3r-1.2.9-adjust_var_path.patch | 11 -------
14 media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch | 38 ----------------------
15 2 files changed, 49 deletions(-)
16
17 diff --git a/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch
18 deleted file mode 100644
19 index 9dc93a52dde..00000000000
20 --- a/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch
21 +++ /dev/null
22 @@ -1,11 +0,0 @@
23 ---- a/lib/Slic3r.pm 2015-06-17 04:38:28.000000000 -0400
24 -+++ b/lib/Slic3r.pm 2015-06-19 11:56:07.005873299 -0400
25 -@@ -30,7 +30,7 @@
26 - if $^V == v5.16;
27 -
28 - use FindBin;
29 --our $var = decode_path($FindBin::Bin) . "/var";
30 -+our $var = decode_path($FindBin::RealBin) . "/var";
31 -
32 - use Moo 1.003001;
33 -
34
35 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
36 deleted file mode 100644
37 index f6b15d70a1a..00000000000
38 --- a/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch
39 +++ /dev/null
40 @@ -1,38 +0,0 @@
41 ---- a/xs/src/libslic3r/Config.hpp 2015-06-17 04:38:28.000000000 -0400
42 -+++ b/xs/src/libslic3r/Config.hpp 2017-09-27 10:59:26.527103728 -0400
43 -@@ -65,7 +65,7 @@
44 -
45 - bool deserialize(std::string str) {
46 - std::istringstream iss(str);
47 -- return iss >> this->value;
48 -+ return static_cast<bool>(iss >> this->value);
49 - };
50 - };
51 -
52 -@@ -124,7 +124,7 @@
53 -
54 - bool deserialize(std::string str) {
55 - std::istringstream iss(str);
56 -- return iss >> this->value;
57 -+ return static_cast<bool>(iss >> this->value);
58 - };
59 - };
60 -
61 -@@ -249,7 +249,7 @@
62 - bool deserialize(std::string str) {
63 - // don't try to parse the trailing % since it's optional
64 - std::istringstream iss(str);
65 -- return iss >> this->value;
66 -+ return static_cast<bool>(iss >> this->value);
67 - };
68 - };
69 -
70 -@@ -279,7 +279,7 @@
71 - bool deserialize(std::string str) {
72 - this->percent = str.find_first_of("%") != std::string::npos;
73 - std::istringstream iss(str);
74 -- return iss >> this->value;
75 -+ return static_cast<bool>(iss >> this->value);
76 - };
77 - };
78 -