[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/

[Ian Stakenvicius]

commit:     a518be0477d307f35f0c21005062bede753e2b0a
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 14:38:35 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 14:39:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a518be04

media-gfx/slic3r-9999: fix patch so it applies against git head

Package-Manager: portage-2.2.28

 media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch
index 9dc93a5..4769cc6 100644
--- a/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch
+++ b/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch
@@ -1,11 +1,11 @@
---- a/lib/Slic3r.pm	2015-06-17 04:38:28.000000000 -0400
-+++ b/lib/Slic3r.pm	2015-06-19 11:56:07.005873299 -0400
+--- a/lib/Slic3r.pm	2016-07-22 11:52:51.423390877 -0400
++++ b/lib/Slic3r.pm	2016-07-22 12:00:57.272715174 -0400
 @@ -30,7 +30,7 @@
      if $^V == v5.16;
  
  use FindBin;
--our $var = decode_path($FindBin::Bin) . "/var";
-+our $var = decode_path($FindBin::RealBin) . "/var";
+-our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] };
++our $var = sub { decode_path($FindBin::RealBin) . "/var/" . $_[0] };
  
  use Moo 1.003001;
  

[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/

[Amy Winston]

commit:     7c7de1b272fd57383359334b499b0a6352bb9b77
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 14:32:18 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 14:32:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c7de1b2

media-gfx/slic3r: fix patch lines bug #602976

Suggested-by: Philippe Trottier (tchiwam <AT> gmail.com)

Package-Manager: portage-2.3.0

 media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch
index 4769cc6..ff22b24 100644
--- a/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch
+++ b/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch
@@ -1,9 +1,9 @@
---- a/lib/Slic3r.pm	2016-07-22 11:52:51.423390877 -0400
-+++ b/lib/Slic3r.pm	2016-07-22 12:00:57.272715174 -0400
-@@ -30,7 +30,7 @@
-     if $^V == v5.16;
+--- a/lib/Slic3r.pm	2016-12-18 15:24:37.520000000 +0100
++++ b/lib/Slic3r.pm	2016-12-18 15:25:23.430000000 +0100
+@@ -42,7 +42,7 @@
  
  use FindBin;
+ # Path to the images.
 -our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] };
 +our $var = sub { decode_path($FindBin::RealBin) . "/var/" . $_[0] };
  

[gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/files/

[Aaron Bauman]

commit:     57422b4d9e26cec6d6976c5e573f7a72b636fd75
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Mar  1 17:31:52 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 03:13:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57422b4d

media-gfx/slic3r: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/slic3r-1.2.9-adjust_var_path.patch       | 11 -------
 media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch    | 38 ----------------------
 2 files changed, 49 deletions(-)

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
deleted file mode 100644
index 9dc93a52dde..00000000000
--- a/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/Slic3r.pm	2015-06-17 04:38:28.000000000 -0400
-+++ b/lib/Slic3r.pm	2015-06-19 11:56:07.005873299 -0400
-@@ -30,7 +30,7 @@
-     if $^V == v5.16;
- 
- use FindBin;
--our $var = decode_path($FindBin::Bin) . "/var";
-+our $var = decode_path($FindBin::RealBin) . "/var";
- 
- use Moo 1.003001;
- 

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
deleted file mode 100644
index f6b15d70a1a..00000000000
--- a/media-gfx/slic3r/files/slic3r-1.2.9-c++11.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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);
-     };
- };
-