Global update
This commit is contained in:
@@ -1,4 +0,0 @@
|
||||
AUX slic3r-9999-adjust_var_path.patch 477 BLAKE2B 0e0590aac466f4e2e6972144c5e12cd1f0d3eb85d33350d8b35ace9cacaa934338821274e9a227b44572adc6a89fce2d7a75e762aacbd9e6368cc2a0cbafd10a SHA512 ffe841707eca3a312b31a9ae6618f2d41004100547176e092436fb02d6d17f6bafe431e61f72f426f3c4894da208d8043d6b1f0e46fe6beffe90ee33d4f49894
|
||||
AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
|
||||
EBUILD slic3r-9999.ebuild 2640 BLAKE2B dc3e00d9a55cfa5214e3792ff254bca7c62f65c0d0b34ee84574d6ffd93b18768e30aa555ee949e52abc6c39b583f7dc360d736fcfbc254385c9cc716197c02d SHA512 9c43b598a38677ce47e97fc5c191a32b3e1300932593ea2d2c79facdfde68b008ac28d3613b59a9b32b8830feae791c08905dbb248948357e2f46e93ecbbe688
|
||||
MISC metadata.xml 1166 BLAKE2B c5ccfe10e50fef8d5729e4c5887a66a524ede1262acc8934e393dd0d3c4bae24cce2b34bd8cb5a1063bf5b8950ee6837e74a48caa6100bf7cbe25e41716914bb SHA512 8fa8adf81c468d72253218f1e5c4c42e8546a89166c3a3158db17b7504c13920abe7bc4ce3efadb4e6fa035d23d3a509c844699ac80b417dd16b570a6f6f213e
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -ur slic3r-9999.orig/lib/Slic3r.pm slic3r-9999/lib/Slic3r.pm
|
||||
--- slic3r-9999.orig/lib/Slic3r.pm 2017-05-08 09:38:37.478019637 +0200
|
||||
+++ slic3r-9999/lib/Slic3r.pm 2017-05-08 09:41:32.370470244 +0200
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
use FindBin;
|
||||
# Path to the images.
|
||||
-my $varpath = decode_path($FindBin::Bin) . "/var";
|
||||
+my $varpath = decode_path($FindBin::RealBin) . "/var";
|
||||
if ($^O eq 'darwin' && !-d $varpath) {
|
||||
$varpath = decode_path($FindBin::Bin) . "/../Resources/var";
|
||||
}
|
||||
@@ -1,609 +0,0 @@
|
||||
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);
|
||||
@@ -1,29 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>tomboy64@sina.cn</email>
|
||||
<name>Proxy-Maintainer; please assign him to bugs.</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Gentoo Proxy Maintainers Project</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>3dprint@gentoo.org</email>
|
||||
<name>Gentoo 3D Printer Project</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>perl@gentoo.org</email>
|
||||
<name>Gentoo Perl Project</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="gui">Enable GUI</flag>
|
||||
</use>
|
||||
<longdescription lang="en">
|
||||
Slic3r is the tool you need to convert a 3D model into printing instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="github">alexrj/Slic3r</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,113 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit eutils git-r3 perl-module
|
||||
|
||||
DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
|
||||
HOMEPAGE="https://slic3r.org"
|
||||
SRC_URI=""
|
||||
EGIT_REPO_URI="https://github.com/Slic3r/Slic3r.git"
|
||||
|
||||
LICENSE="AGPL-3 CC-BY-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS=""
|
||||
IUSE="+gui test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# check Build.PL for dependencies
|
||||
RDEPEND="!=dev-lang/perl-5.16*
|
||||
>=dev-libs/boost-1.55
|
||||
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_unpack() {
|
||||
git-r3_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
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user