* [gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/
@ 2016-04-03 21:24 Andreas Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2016-04-03 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 0ce6a1fe206c370b256d55b217a2c64783ecf9e5
Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Fri Apr 1 18:38:26 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 3 21:23:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce6a1fe
media-gfx/slic3r: Add version 1.2.9
Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
media-gfx/slic3r/Manifest | 1 +
.../files/slic3r-1.2.9-adjust_var_path.patch | 11 +++
media-gfx/slic3r/slic3r-1.2.9.ebuild | 104 +++++++++++++++++++++
3 files changed, 116 insertions(+)
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 4253099..e08cfb4 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1 +1,2 @@
DIST slic3r-1.1.7.tar.gz 2079200 SHA256 8e1f68a71d78686cf6957ee7665757a4e7d14646bdee262cef76cba47b3f0d50 SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650 WHIRLPOOL 18c95a59acff51891251852d59d4bf33b9c1ad8721f581e3c9f55b56bb62e087d030ecb701d16b07cca4567f142ea3b0693c0ab436f1c25b28d02b4a1ce351cd
+DIST slic3r-1.2.9.tar.gz 2165322 SHA256 f1c231ae56039ccd4ecf624e288c1362cab49b0f751a4663857b916b7fa51f2f SHA512 c0284f40de43c54e775baccdb2a67813a6ca4b69db78a788f2023b3f34127e780e6d0160144b9df1e17a2992b3255ef9a372b61a594f503b21efad7334387a51 WHIRLPOOL fc3bee0188ab7bd54ac19f3d874acb20dd8614594b79a8539001fd9a682f10c3436ef477d60458c49c7028c8b4bb7bf8585b4b53e73ac3a411d1a18720820eb0
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
new file mode 100644
index 0000000..9dc93a5
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.2.9-adjust_var_path.patch
@@ -0,0 +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
+@@ -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/slic3r-1.2.9.ebuild b/media-gfx/slic3r/slic3r-1.2.9.ebuild
new file mode 100644
index 0000000..85be0f2
--- /dev/null
+++ b/media-gfx/slic3r/slic3r-1.2.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="http://slic3r.org"
+SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui test"
+
+# check Build.PL for dependencies
+RDEPEND="!=dev-lang/perl-5.16*
+ >=dev-libs/boost-1.55[threads]
+ dev-perl/Class-XSAccessor
+ >=dev-perl/Encode-Locale-0.50.0
+ dev-perl/IO-stringy
+ >=dev-perl/Math-PlanePath-53.0.0
+ >=dev-perl/Moo-1.3.1
+ dev-perl/XML-SAX-ExpatXS
+ virtual/perl-Carp
+ virtual/perl-Encode
+ virtual/perl-File-Spec
+ virtual/perl-Getopt-Long
+ virtual/perl-parent
+ virtual/perl-Scalar-List-Utils
+ virtual/perl-Test-Simple
+ virtual/perl-Thread-Semaphore
+ >=virtual/perl-threads-1.960.0
+ virtual/perl-Time-HiRes
+ virtual/perl-Unicode-Normalize
+ virtual/perl-XSLoader
+ gui? ( dev-perl/Class-Accessor
+ dev-perl/Growl-GNTP
+ dev-perl/libwww-perl
+ dev-perl/Module-Pluggable
+ dev-perl/Net-Bonjour
+ dev-perl/Net-DBus
+ dev-perl/OpenGL
+ >=dev-perl/Wx-0.991.800
+ dev-perl/Wx-GLCanvas
+ >=media-libs/freeglut-3
+ virtual/perl-Math-Complex
+ >=virtual/perl-Socket-2.16.0
+ x11-libs/libXmu
+ )"
+DEPEND="${RDEPEND}
+ >=dev-perl/ExtUtils-CppGuess-0.70.0
+ >=dev-perl/ExtUtils-Typemaps-Default-1.50.0
+ >=dev-perl/ExtUtils-XSpp-0.170.0
+ >=dev-perl/Module-Build-0.380.0
+ >=dev-perl/Module-Build-WithXSpp-0.140.0
+ >=virtual/perl-ExtUtils-MakeMaker-6.800.0
+ >=virtual/perl-ExtUtils-ParseXS-3.220.0
+ test? ( virtual/perl-Test-Harness
+ virtual/perl-Test-Simple )"
+
+S="${WORKDIR}/Slic3r-${PV}/xs"
+
+src_prepare() {
+ pushd "${WORKDIR}/Slic3r-${PV}" || die
+ eapply "${FILESDIR}/${P}-adjust_var_path.patch"
+ eapply_user
+ popd || die
+}
+
+src_configure() {
+ SLIC3R_NO_AUTO=1 perl-module_src_configure
+}
+
+src_test() {
+ perl-module_src_test
+ pushd .. || die
+ prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
+ popd || die
+}
+
+src_install() {
+ perl-module_src_install
+
+ pushd .. || die
+ insinto "${VENDOR_LIB}"
+ doins -r lib/Slic3r.pm lib/Slic3r
+
+ insinto "${VENDOR_LIB}"/Slic3r
+ doins -r var
+
+ exeinto "${VENDOR_LIB}"/Slic3r
+ doexe slic3r.pl
+
+ dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+
+ make_desktop_entry slic3r.pl \
+ Slic3r \
+ "${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
+ "Graphics;3DGraphics;Engineering;Development"
+ popd || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/
@ 2017-05-06 15:11 Amy Liffey
0 siblings, 0 replies; 6+ messages in thread
From: Amy Liffey @ 2017-05-06 15:11 UTC (permalink / raw
To: gentoo-commits
commit: 6443f68173b24e1901d133757f5a369f821fc2eb
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 14:42:37 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat May 6 15:11:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6443f681
media-gfx/slic3r: fix patching bug #617640
Submitted-by: Philipp Psurek <philipp.psurek+gentoo <AT> gmail.com>
Package-Manager: portage-2.3.3
media-gfx/slic3r/files/slic3r-9999-adjust_var_path.patch | 11 -----------
media-gfx/slic3r/slic3r-9999.ebuild | 4 ++--
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 ff22b24e227..00000000000
--- 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 3d54436739e..4c89cffa525 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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/
@ 2017-09-27 17:17 Ian Stakenvicius
0 siblings, 0 replies; 6+ messages in thread
From: Ian Stakenvicius @ 2017-09-27 17:17 UTC (permalink / raw
To: gentoo-commits
commit: b99d82cf2ca7b57d411e8008b85b731b03dc08c0
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 17:17:14 2017 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 17:17:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b99d82cf
media-gfx/slic3r-9999: add missing dep, strip local::lib
local::lib is a workaround to help with the cpan-minus based
build system the package comes with, which we are circumventing
in order to perform a proper system installation. This commit
includes a patch that reverts the upstream addition of local::lib.
Also adds dev-perl/Devel-CheckLib to the dependency list
Package-Manager: Portage-2.3.8, Repoman-2.3.1
.../slic3r/files/slic3r-9999-no-locallib.patch | 609 +++++++++++++++++++++
media-gfx/slic3r/slic3r-9999.ebuild | 2 +
2 files changed, 611 insertions(+)
diff --git a/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch b/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch
new file mode 100644
index 00000000000..8cb7fd6d16d
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch
@@ -0,0 +1,609 @@
+commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f
+Author: Ian Stakenvicius <axs@gentoo.org>
+Date: Wed Sep 27 12:22:14 2017 -0400
+
+ Revert "Use --local-lib when calling cpanm"
+
+ This reverts commit e5412b5d69dc4d5415c92a7daaa47fb4860ca4ea and others
+ that add local::lib dependency
+
+diff --git a/Build.PL b/Build.PL
+index 2dd18435..18befbf8 100644
+--- a/Build.PL
++++ b/Build.PL
+@@ -109,16 +109,7 @@ EOF
+ if !$cpanm;
+ my @cpanm_args = ();
+ push @cpanm_args, "--sudo" if $sudo;
+-
+- # install local::lib without --local-lib otherwise it's not usable afterwards
+- if (!eval "use local::lib qw(local-lib); 1") {
+- my $res = system $cpanm, @cpanm_args, 'local::lib';
+- warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n"
+- if $res != 0;
+- }
+-
+- push @cpanm_args, ('--local-lib', 'local-lib');
+-
++
+ # make sure our cpanm is updated (old ones don't support the ~ syntax)
+ system $cpanm, @cpanm_args, 'App::cpanminus';
+
+diff --git a/slic3r.pl b/slic3r.pl
+index 11dc2fad..76885c90 100755
+--- a/slic3r.pl
++++ b/slic3r.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/lib";
+- use local::lib '--no-create', "$FindBin::Bin/local-lib";
+ }
+
+ use File::Basename qw(basename);
+diff --git a/t/adaptive_slicing.t b/t/adaptive_slicing.t
+index 64c3769f..5ab631fe 100644
+--- a/t/adaptive_slicing.t
++++ b/t/adaptive_slicing.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first sum);
+diff --git a/t/adaptive_width.t b/t/adaptive_width.t
+index 7a0baa75..c200f844 100644
+--- a/t/adaptive_width.t
++++ b/t/adaptive_width.t
+@@ -7,7 +7,6 @@ plan tests => 32;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/angles.t b/t/angles.t
+index 2ae00b4e..1e1a6c9c 100644
+--- a/t/angles.t
++++ b/t/angles.t
+@@ -7,9 +7,6 @@ plan tests => 34;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use lib "$FindBin::Bin/../lib";
+- use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/arcs.t b/t/arcs.t
+index ec85dfbc..65b83de4 100644
+--- a/t/arcs.t
++++ b/t/arcs.t
+@@ -7,7 +7,6 @@ plan tests => 24;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t
+index 7cd04e50..dd6c3e7b 100644
+--- a/t/avoid_crossing_perimeters.t
++++ b/t/avoid_crossing_perimeters.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first sum);
+diff --git a/t/bridges.t b/t/bridges.t
+index 677115b8..3dc6b84a 100644
+--- a/t/bridges.t
++++ b/t/bridges.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first sum);
+diff --git a/t/clean_polylines.t b/t/clean_polylines.t
+index 50c6f5bb..4526bd60 100644
+--- a/t/clean_polylines.t
++++ b/t/clean_polylines.t
+@@ -7,7 +7,6 @@ plan tests => 6;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/clipper.t b/t/clipper.t
+index 3c983814..a898a53f 100644
+--- a/t/clipper.t
++++ b/t/clipper.t
+@@ -7,7 +7,6 @@ plan tests => 6;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(sum);
+diff --git a/t/collinear.t b/t/collinear.t
+index b28a3602..9dee7770 100644
+--- a/t/collinear.t
++++ b/t/collinear.t
+@@ -7,7 +7,6 @@ plan tests => 11;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/combineinfill.t b/t/combineinfill.t
+index 66e461d4..6661cdd6 100644
+--- a/t/combineinfill.t
++++ b/t/combineinfill.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/config.t b/t/config.t
+index 829ef5f3..7f85dae8 100644
+--- a/t/config.t
++++ b/t/config.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/cooling.t b/t/cooling.t
+index 80819bdc..5b2d4b4c 100644
+--- a/t/cooling.t
++++ b/t/cooling.t
+@@ -7,7 +7,6 @@ plan tests => 13;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(none all);
+diff --git a/t/custom_gcode.t b/t/custom_gcode.t
+index 9b58344e..3ff7c35d 100644
+--- a/t/custom_gcode.t
++++ b/t/custom_gcode.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/fill.t b/t/fill.t
+index 765cfd47..d422d27a 100644
+--- a/t/fill.t
++++ b/t/fill.t
+@@ -7,7 +7,6 @@ plan tests => 95;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first sum max);
+diff --git a/t/flow.t b/t/flow.t
+index 37e9deaf..071d290c 100644
+--- a/t/flow.t
++++ b/t/flow.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first sum);
+diff --git a/t/gaps.t b/t/gaps.t
+index 01ec1b4e..16baa036 100644
+--- a/t/gaps.t
++++ b/t/gaps.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/gcode.t b/t/gcode.t
+index ec9b7bb2..525356df 100644
+--- a/t/gcode.t
++++ b/t/gcode.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/geometry.t b/t/geometry.t
+index 9c6eef55..4e6e7097 100644
+--- a/t/geometry.t
++++ b/t/geometry.t
+@@ -7,7 +7,6 @@ plan tests => 44;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/layers.t b/t/layers.t
+index a8599807..57fd2576 100644
+--- a/t/layers.t
++++ b/t/layers.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/loops.t b/t/loops.t
+index d2bf7717..725154c9 100644
+--- a/t/loops.t
++++ b/t/loops.t
+@@ -7,7 +7,6 @@ plan tests => 4;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/multi.t b/t/multi.t
+index fb8cad81..4d6f8193 100644
+--- a/t/multi.t
++++ b/t/multi.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/perimeters.t b/t/perimeters.t
+index 513c76ef..3ddde0b8 100644
+--- a/t/perimeters.t
++++ b/t/perimeters.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r::ExtrusionLoop ':roles';
+diff --git a/t/polyclip.t b/t/polyclip.t
+index 0808c7be..1292d321 100644
+--- a/t/polyclip.t
++++ b/t/polyclip.t
+@@ -7,7 +7,6 @@ plan tests => 18;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/pressure.t b/t/pressure.t
+index dde23695..6bbb81d8 100644
+--- a/t/pressure.t
++++ b/t/pressure.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw();
+diff --git a/t/print.t b/t/print.t
+index b78739e4..28cf1ee4 100644
+--- a/t/print.t
++++ b/t/print.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/retraction.t b/t/retraction.t
+index 237af3ab..37dcb64b 100644
+--- a/t/retraction.t
++++ b/t/retraction.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(any);
+diff --git a/t/shells.t b/t/shells.t
+index 2347ff36..d64eb28c 100644
+--- a/t/shells.t
++++ b/t/shells.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first sum);
+diff --git a/t/skirt_brim.t b/t/skirt_brim.t
+index d6181ba2..cfa0698e 100644
+--- a/t/skirt_brim.t
++++ b/t/skirt_brim.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/slice.t b/t/slice.t
+index 51b52163..301ae164 100644
+--- a/t/slice.t
++++ b/t/slice.t
+@@ -8,7 +8,6 @@ plan tests => 16;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ # temporarily disable compilation errors due to constant not being exported anymore
+diff --git a/t/speed.t b/t/speed.t
+index 5d9fb54c..3deab75b 100644
+--- a/t/speed.t
++++ b/t/speed.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(none);
+diff --git a/t/support.t b/t/support.t
+index 8d4655b3..b4f9ce04 100644
+--- a/t/support.t
++++ b/t/support.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/svg.t b/t/svg.t
+index 6092efe2..9299eeef 100644
+--- a/t/svg.t
++++ b/t/svg.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/thin.t b/t/thin.t
+index 2d256d28..51461480 100644
+--- a/t/thin.t
++++ b/t/thin.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/threads.t b/t/threads.t
+index 7fcd86f0..106a68af 100644
+--- a/t/threads.t
++++ b/t/threads.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/vibrationlimit.t b/t/vibrationlimit.t
+index 1a5488a6..7bfa27ac 100644
+--- a/t/vibrationlimit.t
++++ b/t/vibrationlimit.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/utils/amf-to-stl.pl b/utils/amf-to-stl.pl
+index 56df2e23..7edc1460 100755
+--- a/utils/amf-to-stl.pl
++++ b/utils/amf-to-stl.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use File::Basename qw(basename);
+diff --git a/utils/config-bundle-to-config.pl b/utils/config-bundle-to-config.pl
+index e1d7f614..beecd666 100755
+--- a/utils/config-bundle-to-config.pl
++++ b/utils/config-bundle-to-config.pl
+@@ -9,7 +9,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/dump-stl.pl b/utils/dump-stl.pl
+index 6da275ab..4df94268 100644
+--- a/utils/dump-stl.pl
++++ b/utils/dump-stl.pl
+@@ -8,7 +8,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/utils/estimate-gcode-time.pl b/utils/estimate-gcode-time.pl
+index 43c558b6..eab4f6da 100755
+--- a/utils/estimate-gcode-time.pl
++++ b/utils/estimate-gcode-time.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/utils/gcode_sectioncut.pl b/utils/gcode_sectioncut.pl
+index b94a2fc4..4d9619e4 100644
+--- a/utils/gcode_sectioncut.pl
++++ b/utils/gcode_sectioncut.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/pdf-slices.pl b/utils/pdf-slices.pl
+index 30c41ae4..fa7612bb 100755
+--- a/utils/pdf-slices.pl
++++ b/utils/pdf-slices.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/send-gcode.pl b/utils/send-gcode.pl
+index d87e6826..6f529b90 100644
+--- a/utils/send-gcode.pl
++++ b/utils/send-gcode.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/utils/split_stl.pl b/utils/split_stl.pl
+index eb659b9c..16cf5a9d 100755
+--- a/utils/split_stl.pl
++++ b/utils/split_stl.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use File::Basename qw(basename);
+diff --git a/utils/stl-to-amf.pl b/utils/stl-to-amf.pl
+index cb041893..81648b8e 100755
+--- a/utils/stl-to-amf.pl
++++ b/utils/stl-to-amf.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use File::Basename qw(basename);
+diff --git a/utils/view-mesh.pl b/utils/view-mesh.pl
+index 91cd20a2..b122faed 100644
+--- a/utils/view-mesh.pl
++++ b/utils/view-mesh.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/view-toolpaths.pl b/utils/view-toolpaths.pl
+index d4c47f07..4bbbaab4 100755
+--- a/utils/view-toolpaths.pl
++++ b/utils/view-toolpaths.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/wireframe.pl b/utils/wireframe.pl
+index f49b66e5..053581de 100644
+--- a/utils/wireframe.pl
++++ b/utils/wireframe.pl
+@@ -8,7 +8,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index 4c89cffa525..db80a647e0e 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -19,6 +19,7 @@ IUSE="+gui test"
RDEPEND="!=dev-lang/perl-5.16*
>=dev-libs/boost-1.55[threads]
dev-perl/Class-XSAccessor
+ dev-perl/Devel-CheckLib
dev-perl/Devel-Size
>=dev-perl/Encode-Locale-1.50.0
dev-perl/IO-stringy
@@ -72,6 +73,7 @@ src_unpack() {
src_prepare() {
pushd "${WORKDIR}/slic3r-${PV}" || die
sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
+ eapply "${FILESDIR}"/${P}-no-locallib.patch
eapply_user
popd || die
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/
@ 2018-06-06 13:22 Alexey Shvetsov
0 siblings, 0 replies; 6+ messages in thread
From: Alexey Shvetsov @ 2018-06-06 13:22 UTC (permalink / raw
To: gentoo-commits
commit: 36d17be523b54b0baae627121f4b7b085f49eb61
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 6 13:21:39 2018 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 13:22:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d17be5
media-gfx/slic3r: Version bump
New version of slic3r
Closes: https://bugs.gentoo.org/617640
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-gfx/slic3r/Manifest | 1 +
.../slic3r/files/slic3r-1.3.0-no-locallib.patch | 609 +++++++++++++++++++++
media-gfx/slic3r/slic3r-1.3.0.ebuild | 107 ++++
3 files changed, 717 insertions(+)
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index b41d2036880..bc22f8bc00b 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1,2 +1,3 @@
DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
DIST slic3r-1.2.9.tar.gz 2165322 BLAKE2B 49643284520e6c85ff0e32fada165c8d4c75c15e484555aac1004bc9527bacd552c6aa4916cbb56e304553a47ef6c2db703f6e9d705a585cfbac909c2e84bb79 SHA512 c0284f40de43c54e775baccdb2a67813a6ca4b69db78a788f2023b3f34127e780e6d0160144b9df1e17a2992b3255ef9a372b61a594f503b21efad7334387a51
+DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch b/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch
new file mode 100644
index 00000000000..8cb7fd6d16d
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-no-locallib.patch
@@ -0,0 +1,609 @@
+commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f
+Author: Ian Stakenvicius <axs@gentoo.org>
+Date: Wed Sep 27 12:22:14 2017 -0400
+
+ Revert "Use --local-lib when calling cpanm"
+
+ This reverts commit e5412b5d69dc4d5415c92a7daaa47fb4860ca4ea and others
+ that add local::lib dependency
+
+diff --git a/Build.PL b/Build.PL
+index 2dd18435..18befbf8 100644
+--- a/Build.PL
++++ b/Build.PL
+@@ -109,16 +109,7 @@ EOF
+ if !$cpanm;
+ my @cpanm_args = ();
+ push @cpanm_args, "--sudo" if $sudo;
+-
+- # install local::lib without --local-lib otherwise it's not usable afterwards
+- if (!eval "use local::lib qw(local-lib); 1") {
+- my $res = system $cpanm, @cpanm_args, 'local::lib';
+- warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n"
+- if $res != 0;
+- }
+-
+- push @cpanm_args, ('--local-lib', 'local-lib');
+-
++
+ # make sure our cpanm is updated (old ones don't support the ~ syntax)
+ system $cpanm, @cpanm_args, 'App::cpanminus';
+
+diff --git a/slic3r.pl b/slic3r.pl
+index 11dc2fad..76885c90 100755
+--- a/slic3r.pl
++++ b/slic3r.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/lib";
+- use local::lib '--no-create', "$FindBin::Bin/local-lib";
+ }
+
+ use File::Basename qw(basename);
+diff --git a/t/adaptive_slicing.t b/t/adaptive_slicing.t
+index 64c3769f..5ab631fe 100644
+--- a/t/adaptive_slicing.t
++++ b/t/adaptive_slicing.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first sum);
+diff --git a/t/adaptive_width.t b/t/adaptive_width.t
+index 7a0baa75..c200f844 100644
+--- a/t/adaptive_width.t
++++ b/t/adaptive_width.t
+@@ -7,7 +7,6 @@ plan tests => 32;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/angles.t b/t/angles.t
+index 2ae00b4e..1e1a6c9c 100644
+--- a/t/angles.t
++++ b/t/angles.t
+@@ -7,9 +7,6 @@ plan tests => 34;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use lib "$FindBin::Bin/../lib";
+- use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/arcs.t b/t/arcs.t
+index ec85dfbc..65b83de4 100644
+--- a/t/arcs.t
++++ b/t/arcs.t
+@@ -7,7 +7,6 @@ plan tests => 24;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t
+index 7cd04e50..dd6c3e7b 100644
+--- a/t/avoid_crossing_perimeters.t
++++ b/t/avoid_crossing_perimeters.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first sum);
+diff --git a/t/bridges.t b/t/bridges.t
+index 677115b8..3dc6b84a 100644
+--- a/t/bridges.t
++++ b/t/bridges.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first sum);
+diff --git a/t/clean_polylines.t b/t/clean_polylines.t
+index 50c6f5bb..4526bd60 100644
+--- a/t/clean_polylines.t
++++ b/t/clean_polylines.t
+@@ -7,7 +7,6 @@ plan tests => 6;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/clipper.t b/t/clipper.t
+index 3c983814..a898a53f 100644
+--- a/t/clipper.t
++++ b/t/clipper.t
+@@ -7,7 +7,6 @@ plan tests => 6;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(sum);
+diff --git a/t/collinear.t b/t/collinear.t
+index b28a3602..9dee7770 100644
+--- a/t/collinear.t
++++ b/t/collinear.t
+@@ -7,7 +7,6 @@ plan tests => 11;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/combineinfill.t b/t/combineinfill.t
+index 66e461d4..6661cdd6 100644
+--- a/t/combineinfill.t
++++ b/t/combineinfill.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/config.t b/t/config.t
+index 829ef5f3..7f85dae8 100644
+--- a/t/config.t
++++ b/t/config.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/cooling.t b/t/cooling.t
+index 80819bdc..5b2d4b4c 100644
+--- a/t/cooling.t
++++ b/t/cooling.t
+@@ -7,7 +7,6 @@ plan tests => 13;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(none all);
+diff --git a/t/custom_gcode.t b/t/custom_gcode.t
+index 9b58344e..3ff7c35d 100644
+--- a/t/custom_gcode.t
++++ b/t/custom_gcode.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/fill.t b/t/fill.t
+index 765cfd47..d422d27a 100644
+--- a/t/fill.t
++++ b/t/fill.t
+@@ -7,7 +7,6 @@ plan tests => 95;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first sum max);
+diff --git a/t/flow.t b/t/flow.t
+index 37e9deaf..071d290c 100644
+--- a/t/flow.t
++++ b/t/flow.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first sum);
+diff --git a/t/gaps.t b/t/gaps.t
+index 01ec1b4e..16baa036 100644
+--- a/t/gaps.t
++++ b/t/gaps.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/gcode.t b/t/gcode.t
+index ec9b7bb2..525356df 100644
+--- a/t/gcode.t
++++ b/t/gcode.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/geometry.t b/t/geometry.t
+index 9c6eef55..4e6e7097 100644
+--- a/t/geometry.t
++++ b/t/geometry.t
+@@ -7,7 +7,6 @@ plan tests => 44;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/layers.t b/t/layers.t
+index a8599807..57fd2576 100644
+--- a/t/layers.t
++++ b/t/layers.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/loops.t b/t/loops.t
+index d2bf7717..725154c9 100644
+--- a/t/loops.t
++++ b/t/loops.t
+@@ -7,7 +7,6 @@ plan tests => 4;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/multi.t b/t/multi.t
+index fb8cad81..4d6f8193 100644
+--- a/t/multi.t
++++ b/t/multi.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/perimeters.t b/t/perimeters.t
+index 513c76ef..3ddde0b8 100644
+--- a/t/perimeters.t
++++ b/t/perimeters.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r::ExtrusionLoop ':roles';
+diff --git a/t/polyclip.t b/t/polyclip.t
+index 0808c7be..1292d321 100644
+--- a/t/polyclip.t
++++ b/t/polyclip.t
+@@ -7,7 +7,6 @@ plan tests => 18;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/pressure.t b/t/pressure.t
+index dde23695..6bbb81d8 100644
+--- a/t/pressure.t
++++ b/t/pressure.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw();
+diff --git a/t/print.t b/t/print.t
+index b78739e4..28cf1ee4 100644
+--- a/t/print.t
++++ b/t/print.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/retraction.t b/t/retraction.t
+index 237af3ab..37dcb64b 100644
+--- a/t/retraction.t
++++ b/t/retraction.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(any);
+diff --git a/t/shells.t b/t/shells.t
+index 2347ff36..d64eb28c 100644
+--- a/t/shells.t
++++ b/t/shells.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first sum);
+diff --git a/t/skirt_brim.t b/t/skirt_brim.t
+index d6181ba2..cfa0698e 100644
+--- a/t/skirt_brim.t
++++ b/t/skirt_brim.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/slice.t b/t/slice.t
+index 51b52163..301ae164 100644
+--- a/t/slice.t
++++ b/t/slice.t
+@@ -8,7 +8,6 @@ plan tests => 16;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ # temporarily disable compilation errors due to constant not being exported anymore
+diff --git a/t/speed.t b/t/speed.t
+index 5d9fb54c..3deab75b 100644
+--- a/t/speed.t
++++ b/t/speed.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(none);
+diff --git a/t/support.t b/t/support.t
+index 8d4655b3..b4f9ce04 100644
+--- a/t/support.t
++++ b/t/support.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/svg.t b/t/svg.t
+index 6092efe2..9299eeef 100644
+--- a/t/svg.t
++++ b/t/svg.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/thin.t b/t/thin.t
+index 2d256d28..51461480 100644
+--- a/t/thin.t
++++ b/t/thin.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/t/threads.t b/t/threads.t
+index 7fcd86f0..106a68af 100644
+--- a/t/threads.t
++++ b/t/threads.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use List::Util qw(first);
+diff --git a/t/vibrationlimit.t b/t/vibrationlimit.t
+index 1a5488a6..7bfa27ac 100644
+--- a/t/vibrationlimit.t
++++ b/t/vibrationlimit.t
+@@ -5,7 +5,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/utils/amf-to-stl.pl b/utils/amf-to-stl.pl
+index 56df2e23..7edc1460 100755
+--- a/utils/amf-to-stl.pl
++++ b/utils/amf-to-stl.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use File::Basename qw(basename);
+diff --git a/utils/config-bundle-to-config.pl b/utils/config-bundle-to-config.pl
+index e1d7f614..beecd666 100755
+--- a/utils/config-bundle-to-config.pl
++++ b/utils/config-bundle-to-config.pl
+@@ -9,7 +9,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/dump-stl.pl b/utils/dump-stl.pl
+index 6da275ab..4df94268 100644
+--- a/utils/dump-stl.pl
++++ b/utils/dump-stl.pl
+@@ -8,7 +8,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/utils/estimate-gcode-time.pl b/utils/estimate-gcode-time.pl
+index 43c558b6..eab4f6da 100755
+--- a/utils/estimate-gcode-time.pl
++++ b/utils/estimate-gcode-time.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/utils/gcode_sectioncut.pl b/utils/gcode_sectioncut.pl
+index b94a2fc4..4d9619e4 100644
+--- a/utils/gcode_sectioncut.pl
++++ b/utils/gcode_sectioncut.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/pdf-slices.pl b/utils/pdf-slices.pl
+index 30c41ae4..fa7612bb 100755
+--- a/utils/pdf-slices.pl
++++ b/utils/pdf-slices.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/send-gcode.pl b/utils/send-gcode.pl
+index d87e6826..6f529b90 100644
+--- a/utils/send-gcode.pl
++++ b/utils/send-gcode.pl
+@@ -6,7 +6,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Slic3r;
+diff --git a/utils/split_stl.pl b/utils/split_stl.pl
+index eb659b9c..16cf5a9d 100755
+--- a/utils/split_stl.pl
++++ b/utils/split_stl.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use File::Basename qw(basename);
+diff --git a/utils/stl-to-amf.pl b/utils/stl-to-amf.pl
+index cb041893..81648b8e 100755
+--- a/utils/stl-to-amf.pl
++++ b/utils/stl-to-amf.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use File::Basename qw(basename);
+diff --git a/utils/view-mesh.pl b/utils/view-mesh.pl
+index 91cd20a2..b122faed 100644
+--- a/utils/view-mesh.pl
++++ b/utils/view-mesh.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/view-toolpaths.pl b/utils/view-toolpaths.pl
+index d4c47f07..4bbbaab4 100755
+--- a/utils/view-toolpaths.pl
++++ b/utils/view-toolpaths.pl
+@@ -7,7 +7,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Getopt::Long qw(:config no_auto_abbrev);
+diff --git a/utils/wireframe.pl b/utils/wireframe.pl
+index f49b66e5..053581de 100644
+--- a/utils/wireframe.pl
++++ b/utils/wireframe.pl
+@@ -8,7 +8,6 @@ use warnings;
+ BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+- use local::lib "$FindBin::Bin/../local-lib";
+ }
+
+ use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/media-gfx/slic3r/slic3r-1.3.0.ebuild b/media-gfx/slic3r/slic3r-1.3.0.ebuild
new file mode 100644
index 00000000000..52dbf45085b
--- /dev/null
+++ b/media-gfx/slic3r/slic3r-1.3.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="http://slic3r.org"
+SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui test"
+
+# check Build.PL for dependencies
+RDEPEND="!=dev-lang/perl-5.16*
+ >=dev-libs/boost-1.55[threads]
+ dev-perl/Class-XSAccessor
+ dev-perl/Devel-CheckLib
+ dev-perl/Devel-Size
+ >=dev-perl/Encode-Locale-1.50.0
+ dev-perl/IO-stringy
+ >=dev-perl/Math-PlanePath-53.0.0
+ >=dev-perl/Moo-1.3.1
+ dev-perl/XML-SAX-ExpatXS
+ virtual/perl-Carp
+ virtual/perl-Encode
+ virtual/perl-File-Spec
+ virtual/perl-Getopt-Long
+ virtual/perl-parent
+ virtual/perl-Scalar-List-Utils
+ virtual/perl-Test-Simple
+ virtual/perl-Thread-Semaphore
+ >=virtual/perl-threads-1.960.0
+ virtual/perl-Time-HiRes
+ virtual/perl-Unicode-Normalize
+ virtual/perl-XSLoader
+ gui? ( dev-perl/Class-Accessor
+ dev-perl/Growl-GNTP
+ dev-perl/libwww-perl
+ dev-perl/Module-Pluggable
+ dev-perl/Net-Bonjour
+ dev-perl/Net-DBus
+ dev-perl/OpenGL
+ >=dev-perl/Wx-0.991.800
+ dev-perl/Wx-GLCanvas
+ >=media-libs/freeglut-3
+ virtual/perl-Math-Complex
+ >=virtual/perl-Socket-2.16.0
+ x11-libs/libXmu
+ )"
+DEPEND="${RDEPEND}
+ dev-perl/Devel-CheckLib
+ >=dev-perl/ExtUtils-CppGuess-0.70.0
+ >=dev-perl/ExtUtils-Typemaps-Default-1.50.0
+ >=dev-perl/ExtUtils-XSpp-0.170.0
+ >=dev-perl/Module-Build-0.380.0
+ >=dev-perl/Module-Build-WithXSpp-0.140.0
+ >=virtual/perl-ExtUtils-MakeMaker-6.800.0
+ >=virtual/perl-ExtUtils-ParseXS-3.220.0
+ test? ( virtual/perl-Test-Harness
+ virtual/perl-Test-Simple )"
+
+S="${WORKDIR}/Slic3r-${PV}/xs"
+
+src_prepare() {
+ pushd "${WORKDIR}/Slic3r-${PV}" || die
+ sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
+ eapply "${FILESDIR}"/${P}-no-locallib.patch
+ eapply_user
+ popd || die
+}
+
+src_configure() {
+ SLIC3R_NO_AUTO=1 perl-module_src_configure
+}
+
+src_test() {
+ perl-module_src_test
+ pushd .. || die
+ prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
+ popd || die
+}
+
+src_install() {
+ perl-module_src_install
+
+ pushd .. || die
+ insinto "${VENDOR_LIB}"
+ doins -r lib/Slic3r.pm lib/Slic3r
+
+ insinto "${VENDOR_LIB}"/Slic3r
+ doins -r var
+
+ exeinto "${VENDOR_LIB}"/Slic3r
+ doexe slic3r.pl
+
+ dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+
+ make_desktop_entry slic3r.pl \
+ Slic3r \
+ "${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
+ "Graphics;3DGraphics;Engineering;Development"
+ popd || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/
@ 2019-11-07 22:12 Andreas K. Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas K. Hüttel @ 2019-11-07 22:12 UTC (permalink / raw
To: gentoo-commits
commit: f614b0c825c26ee8e1900fa5e3cf8883d09cd274
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 7 22:11:26 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Nov 7 22:11:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f614b0c8
media-gfx/slic3r: Add patch by Chris Mansfield for recent boost
Closes: https://bugs.gentoo.org/689804
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-gfx/slic3r/files/slic3r-1.3.0-boost.patch | 10 ++++++++++
media-gfx/slic3r/slic3r-1.3.0-r1.ebuild | 1 +
2 files changed, 11 insertions(+)
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch b/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch
new file mode 100644
index 00000000000..e77e50b3c99
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch
@@ -0,0 +1,10 @@
+--- Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp.old 2019-11-04 19:31:05.714869400 -0800
++++ Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp 2019-11-04 19:34:10.656330929 -0800
+@@ -9,6 +9,7 @@
+ #include <boost/asio.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/thread.hpp>
++#include <boost/core/noncopyable.hpp>
+
+ namespace Slic3r {
+
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
index 64cc0c14bc9..556d06e6628 100644
--- a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
@@ -74,6 +74,7 @@ src_prepare() {
pushd "${WORKDIR}/Slic3r-${PV}" || die
sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
eapply "${FILESDIR}"/${P}-no-locallib.patch
+ eapply "${FILESDIR}"/${P}-boost.patch
eapply_user
popd || die
# drop std=c++11 to compiler defaults...
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/
@ 2020-12-06 12:32 Dennis Lamm
0 siblings, 0 replies; 6+ messages in thread
From: Dennis Lamm @ 2020-12-06 12:32 UTC (permalink / raw
To: gentoo-commits
commit: 2af1afdd76734d65c950a5ead00e81674fb95cca
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 4 21:41:40 2020 +0000
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Sun Dec 6 12:32:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af1afdd
media-gfx/slic3r-1.3.0: fixed boost 1.73 build
also use system clipper
Bug: https://bugs.gentoo.org/722308
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
.../slic3r/files/slic3r-1.3.0-boost-1.73.patch | 146 +++++++++++++++++++++
.../files/slic3r-1.3.0-use-system-clipper.patch | 44 +++++++
media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch | 10 ++
...ic3r-1.3.0-r2.ebuild => slic3r-1.3.0-r3.ebuild} | 38 +++---
4 files changed, 217 insertions(+), 21 deletions(-)
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch b/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch
new file mode 100644
index 00000000000..6b710a18f3a
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch
@@ -0,0 +1,146 @@
+--- a/xs/src/boost/nowide/cstdlib.hpp
++++ b/xs/src/boost/nowide/cstdlib.hpp
+@@ -8,7 +8,7 @@
+ #ifndef BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED
+ #define BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED
+
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <boost/nowide/system.hpp>
+
+ #endif
+--- a/xs/src/admesh/stl.h
++++ b/xs/src/admesh/stl.h
+@@ -26,11 +26,6 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <stddef.h>
+-#include <boost/detail/endian.hpp>
+-
+-#ifndef BOOST_LITTLE_ENDIAN
+-#error "admesh works correctly on little endian machines only!"
+-#endif
+
+ #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+ #include "windows.h"
+
+--- a/xs/src/libslic3r/PrintObject.cpp
++++ b/xs/src/libslic3r/PrintObject.cpp
+@@ -2,11 +2,14 @@
+ #include "BoundingBox.hpp"
+ #include "ClipperUtils.hpp"
+ #include "Geometry.hpp"
++#include <boost/bind/bind.hpp>
+ #include <algorithm>
+ #include <vector>
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 &modobj_bbox)
+ : layer_height_spline(model_object->layer_height_spline),
+ typed_slices(false),
+--- a/xs/src/libslic3r/GCodeSender.hpp
++++ b/xs/src/libslic3r/GCodeSender.hpp
+@@ -7,13 +7,17 @@
+ #include <string>
+ #include <vector>
+ #include <boost/asio.hpp>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
++#include <boost/core/noncopyable.hpp>
+ #include <boost/thread.hpp>
+
+ namespace Slic3r {
+
+ namespace asio = boost::asio;
+
++using boost::placeholders::_1;
++using boost::placeholders::_2;
++
+ class GCodeSender : private boost::noncopyable {
+ public:
+ GCodeSender();
+--- a/xs/src/libslic3r/TriangleMesh.cpp
++++ b/xs/src/libslic3r/TriangleMesh.cpp
+@@ -14,6 +14,7 @@
+ #include <stdexcept>
+ #include <boost/config.hpp>
+ #include <boost/nowide/convert.hpp>
++#include <boost/bind/bind.hpp>
+
+ #ifdef SLIC3R_DEBUG
+ #include "SVG.hpp"
+@@ -21,6 +22,8 @@
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ TriangleMesh::TriangleMesh()
+ : repaired(false)
+ {
+--- a/xs/src/libslic3r/Config.cpp
++++ b/xs/src/libslic3r/Config.cpp
+@@ -14,6 +14,7 @@
+ #include <boost/foreach.hpp>
+ #include <boost/lexical_cast.hpp>
+ #include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+ #include <boost/property_tree/ptree.hpp>
+--- a/xs/src/libslic3r/SLAPrint.cpp
++++ b/xs/src/libslic3r/SLAPrint.cpp
+@@ -7,9 +7,12 @@
+ #include <iostream>
+ #include <complex>
+ #include <cstdio>
++#include <boost/bind/bind.hpp>
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ void
+ SLAPrint::slice()
+ {
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ set(Boost_USE_STATIC_LIBS ON)
+ set(Boost_USE_STATIC_RUNTIME ON)
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+-find_package(Boost COMPONENTS system thread filesystem)
++find_package(Boost MODULE REQUIRED)
+
+ set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/)
+
+--- a/xs/src/libslic3r/GCodeTimeEstimator.cpp
++++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp
+@@ -1,9 +1,12 @@
+ #include "GCodeTimeEstimator.hpp"
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ #include <cmath>
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++using boost::placeholders::_2;
++
+ void
+ GCodeTimeEstimator::parse(const std::string &gcode)
+ {
+--- a/xs/Build.PL
++++ b/xs/Build.PL
+@@ -142,7 +142,7 @@
+ }
+ # In order to generate the -l switches we need to know how Boost libraries are named
+ my $have_boost = 0;
+-my @boost_libraries = qw(system thread filesystem); # we need these
++my @boost_libraries = qw(system thread filesystem nowide); # we need these
+ # check without explicit lib path (works on Linux)
+ if (! $mswin) {
+ $have_boost = 1
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch b/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch
new file mode 100644
index 00000000000..9f9a5ef2fbd
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch
@@ -0,0 +1,44 @@
+--- a/xs/src/libslic3r/ClipperUtils.hpp
++++ b/xs/src/libslic3r/ClipperUtils.hpp
+@@ -2,7 +2,7 @@
+ #define slic3r_ClipperUtils_hpp_
+
+ #include <libslic3r.h>
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include "ExPolygon.hpp"
+ #include "Polygon.hpp"
+ #include "Surface.hpp"
+--- a/xs/src/libslic3r/Geometry.cpp
++++ b/xs/src/libslic3r/Geometry.cpp
+@@ -3,7 +3,7 @@
+ #include "ExPolygon.hpp"
+ #include "Line.hpp"
+ #include "PolylineCollection.hpp"
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include <algorithm>
+ #include <cassert>
+ #include <cmath>
+--- a/xs/src/libslic3r/SVG.hpp
++++ b/xs/src/libslic3r/SVG.hpp
+@@ -2,7 +2,7 @@
+ #define slic3r_SVG_hpp_
+
+ #include "libslic3r.h"
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include "ExPolygon.hpp"
+ #include "Line.hpp"
+ #include "TriangleMesh.hpp"
+--- a/xs/xsp/Clipper.xsp
++++ b/xs/xsp/Clipper.xsp
+@@ -2,7 +2,7 @@
+
+ %{
+ #include <xsinit.h>
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include "libslic3r/ClipperUtils.hpp"
+ %}
+
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch b/media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch
new file mode 100644
index 00000000000..d2dea0208d8
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch
@@ -0,0 +1,10 @@
+--- a/slic3r.pl
++++ b/slic3r.pl
+@@ -20,6 +20,7 @@ use Time::HiRes qw(gettimeofday tv_interval);
+ $|++;
+ binmode STDOUT, ':utf8';
+ binmode STDERR, ':utf8';
++$ENV{GDK_BACKEND} = 'x11';
+
+ our %opt = ();
+ my %cli_options = ();
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
similarity index 78%
rename from media-gfx/slic3r/slic3r-1.3.0-r2.ebuild
rename to media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
index 60c8950aab4..5917a9210b8 100644
--- a/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils flag-o-matic perl-module
+inherit desktop eutils perl-module
DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
HOMEPAGE="https://slic3r.org"
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
# check Build.PL for dependencies
RDEPEND="!=dev-lang/perl-5.16*
- >=dev-libs/boost-1.55[threads]
+ >=dev-libs/boost-1.73[threads]
dev-perl/Class-XSAccessor
dev-perl/Devel-CheckLib
dev-perl/Devel-Size
@@ -53,6 +53,7 @@ RDEPEND="!=dev-lang/perl-5.16*
x11-libs/libXmu
)"
DEPEND="${RDEPEND}
+ dev-libs/clipper
dev-perl/Devel-CheckLib
>=dev-perl/ExtUtils-CppGuess-0.70.0
>=dev-perl/ExtUtils-Typemaps-Default-1.50.0
@@ -64,38 +65,33 @@ DEPEND="${RDEPEND}
test? ( virtual/perl-Test-Harness
virtual/perl-Test-Simple )"
-S="${WORKDIR}/Slic3r-${PV}/xs"
+S="${WORKDIR}/Slic3r-${PV}"
+PERL_S="${S}/xs"
-pkg_pretend() {
- einfo "Checking for -std=c++11 support in compiler"
- test-flags-CXX -std=c++11 > /dev/null || die
-}
+PATCHES=(
+ "${FILESDIR}/${P}-boost-1.73.patch"
+ "${FILESDIR}/${P}-no-locallib.patch"
+ "${FILESDIR}/${P}-use-system-clipper.patch"
+ "${FILESDIR}/${P}-wayland.patch"
+)
src_prepare() {
- pushd "${WORKDIR}/Slic3r-${PV}" || die
sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
- eapply "${FILESDIR}"/${P}-no-locallib.patch
- eapply "${FILESDIR}"/${P}-boost.patch
- eapply_user
- popd || die
- # drop std=c++11 to compiler defaults...
- sed \
- -e '/c++11/d' \
- -i Build.PL || die
+ perl-module_src_prepare
}
src_configure() {
+ cd "${PERL_S}" || die
SLIC3R_NO_AUTO=1 perl-module_src_configure
}
src_test() {
+ cd "${PERL_S}" || die
perl-module_src_test
- pushd .. || die
- prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
- popd || die
}
src_install() {
+ cd "${PERL_S}" || die
perl-module_src_install
pushd .. || die
@@ -108,7 +104,7 @@ src_install() {
exeinto "${VENDOR_LIB}"/Slic3r
doexe slic3r.pl
- dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+ dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" "${EPREFIX}/usr/bin/slic3r.pl"
make_desktop_entry "slic3r.pl --gui %F" \
Slic3r \
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-12-06 12:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-06 13:22 [gentoo-commits] repo/gentoo:master commit in: media-gfx/slic3r/, media-gfx/slic3r/files/ Alexey Shvetsov
-- strict thread matches above, loose matches on Subject: below --
2020-12-06 12:32 Dennis Lamm
2019-11-07 22:12 Andreas K. Hüttel
2017-09-27 17:17 Ian Stakenvicius
2017-05-06 15:11 Amy Liffey
2016-04-03 21:24 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox