summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmy Liffey <amynka@gentoo.org>2017-05-06 16:42:37 +0200
committerAmy Liffey <amynka@gentoo.org>2017-05-06 17:11:03 +0200
commit6443f68173b24e1901d133757f5a369f821fc2eb (patch)
treea23f788df407f4c8a936f17c2e8bb5019da20612 /media-gfx
parentwww-servers/tomcat: amd64 stable wrt bug #615868 (diff)
downloadgentoo-6443f68173b24e1901d133757f5a369f821fc2eb.tar.gz
gentoo-6443f68173b24e1901d133757f5a369f821fc2eb.tar.bz2
gentoo-6443f68173b24e1901d133757f5a369f821fc2eb.zip
media-gfx/slic3r: fix patching bug #617640
Submitted-by: Philipp Psurek <philipp.psurek+gentoo@gmail.com> Package-Manager: portage-2.3.3
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch11
-rw-r--r--media-gfx/slic3r/slic3r-9999.ebuild4
2 files changed, 2 insertions, 13 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
deleted file mode 100644
index ff22b24e227f..000000000000
--- a/media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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] };
-
- use Moo 1.003001;
-
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index 3d54436739ee..4c89cffa5255 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.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
@@ -71,7 +71,7 @@ src_unpack() {
src_prepare() {
pushd "${WORKDIR}/slic3r-${PV}" || die
- eapply "${FILESDIR}/${P}-adjust_var_path.patch"
+ sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
eapply_user
popd || die
}