1 |
commit: 6443f68173b24e1901d133757f5a369f821fc2eb |
2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 6 14:42:37 2017 +0000 |
4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 6 15:11:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6443f681 |
7 |
|
8 |
media-gfx/slic3r: fix patching bug #617640 |
9 |
|
10 |
Submitted-by: Philipp Psurek <philipp.psurek+gentoo <AT> gmail.com> |
11 |
Package-Manager: portage-2.3.3 |
12 |
|
13 |
media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch | 11 ----------- |
14 |
media-gfx/slic3r/slic3r-9999.ebuild | 4 ++-- |
15 |
2 files changed, 2 insertions(+), 13 deletions(-) |
16 |
|
17 |
diff --git a/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch |
18 |
deleted file mode 100644 |
19 |
index ff22b24e227..00000000000 |
20 |
--- a/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch |
21 |
+++ /dev/null |
22 |
@@ -1,11 +0,0 @@ |
23 |
---- a/lib/Slic3r.pm 2016-12-18 15:24:37.520000000 +0100 |
24 |
-+++ b/lib/Slic3r.pm 2016-12-18 15:25:23.430000000 +0100 |
25 |
-@@ -42,7 +42,7 @@ |
26 |
- |
27 |
- use FindBin; |
28 |
- # Path to the images. |
29 |
--our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] }; |
30 |
-+our $var = sub { decode_path($FindBin::RealBin) . "/var/" . $_[0] }; |
31 |
- |
32 |
- use Moo 1.003001; |
33 |
- |
34 |
|
35 |
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild |
36 |
index 3d54436739e..4c89cffa525 100644 |
37 |
--- a/media-gfx/slic3r/slic3r-9999.ebuild |
38 |
+++ b/media-gfx/slic3r/slic3r-9999.ebuild |
39 |
@@ -1,4 +1,4 @@ |
40 |
-# Copyright 1999-2016 Gentoo Foundation |
41 |
+# Copyright 1999-2017 Gentoo Foundation |
42 |
# Distributed under the terms of the GNU General Public License v2 |
43 |
|
44 |
EAPI=6 |
45 |
@@ -71,7 +71,7 @@ src_unpack() { |
46 |
|
47 |
src_prepare() { |
48 |
pushd "${WORKDIR}/slic3r-${PV}" || die |
49 |
- eapply "${FILESDIR}/${P}-adjust_var_path.patch" |
50 |
+ sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die |
51 |
eapply_user |
52 |
popd || die |
53 |
} |