media-gfx/arcwelder: new ebuild

(also, the long-since-superseded slic3r-pe ebuilds have been removed)
This commit is contained in:
2021-03-31 10:54:33 -07:00
parent 0c095a4740
commit 15974b083f
7 changed files with 20 additions and 1197 deletions

View File

@@ -0,0 +1,2 @@
DIST arcwelder-1.1.1.tar.gz 125750 SHA256 833b9cc5c3fdbd91512cfc94c2ed92d99ccc8003556de972b795a3dc84b92d45 SHA512 6dadbe1a1363594a3915857ef71df613e251b3fa063d39bf99da7bbbb5dd1b0f5ef1dfd68175d2974fecd335238a7f83094e8db4ed049b5c4f05570ff408997a WHIRLPOOL 1e25c53817c02311bf19992a83b4e2997662845c8040692f170345a6bba5e955dcf86e66d3860eb93a8c7819bd90c52895783b716b53e5911758e0b4a020b903
EBUILD arcwelder-1.1.1.ebuild 435 SHA256 86c58f7c48757e7f6790a65e482bbd25325ede991c737199f0ed02f06a3d7029 SHA512 a9af1f6b35d28d3d74fc5d40ad7e45ce0ac5776b6faed654460e2fbe5f84fca202edc1c140315b96b1c1e9056339a69b16db4be306b0d7886cc727915a78cde8 WHIRLPOOL ae4ed02d0e4442fb61f690039eabf3080624a20e1d5f399fefb5a0f3363021c2ee384572962ec9c630b195d0d69553403f549e7f77b9cd4792b4f0625f593041

View File

@@ -0,0 +1,18 @@
EAPI=7
inherit cmake-utils
DESCRIPTION="3D printer anti-stutter tool"
HOMEPAGE="https://github.com/FormerLurker/ArcWelderLib"
SRC_URI="https://github.com/FormerLurker/ArcWelderLib/archive/refs/tags/$PV.tar.gz -> $P.tar.gz"
LICENSE=AGPL-3
SLOT=0
KEYWORDS=amd64
S=$WORKDIR/ArcWelderLib-$PV
src_install()
{
dobin $WORKDIR/${P}_build/ArcWelderConsole/ArcWelder
dobin $WORKDIR/${P}_build/ArcWelderInverseProcessor/ArcStraightener
}

View File

@@ -1,6 +0,0 @@
AUX slic3r-pe-1.41.3-no-locallib.patch 14003 SHA256 504e144a693c455c3fad1dee46e93ee6550f279cb61408f374fcbec71160119c SHA512 f24b6dcbcdffa547c3d41685116166c142d5bb6354afdcf49cc0f19b23ffde8afdbbccecb837ceb835894f3ed8a13ef59557337796655ef7f4e2bf231a7e50ad WHIRLPOOL c46758ac5190b3cd6fab905712d1f6e0f1b88a7e73d56258fdf192af6d35c16d2555c99e1dc87b9b8f24b15b30d3317e28228c91df041c0907cae0aea9736262
AUX slic3r-pe-1.42.0_beta2-no-locallib.patch 10125 SHA256 c3509385d8dbbf2e32be7281628b9daf744e435845b61a707899b782dc32142b SHA512 eef8b378dc447c5e95f224998966351fea60f5ae6c26306767170e738ba5ecfd47b282b8c849605e2faf16906379d1cd6caed6ab6f465e35d506a2c18d8fb48f WHIRLPOOL cca993db5dfff5c489a4d2229ceedcbe8d11f7a031f87d66c544d0eb2bdc1bd6174b20a4a0ca1dbca62b214bceb0e7e5c938394a5e4fe3ea2ed5d24a42309fb8
DIST slic3r-pe-1.42.0_beta2.tar.gz 10300508 SHA256 f0161a10c2c07394c3c636cb0b750199a4e4bba46539e0c16e1acbcbfbaa1e21 SHA512 d4565390354a4f32f4ef9749ba8a708d097efdfd50b3e731286c052a33f3d896e9c9b6cf087f1796f21d630f4ebdb7502739f119c7dcdf7cb33b0c2f45dfb9a8 WHIRLPOOL 3aee5ec88a8fd01c37c42d75532755c2ca40272436a33bc35fb18e07b047cb1f084d7ac2171c21f08d16c7504ef63a287f4d4555fb46fa1f44c14b4d745d7920
DIST version_1.41.3.tar.gz 7892768 SHA256 f520282b4bf90b1e7449795dd179cc0d4dfa73eced9ab81a9fcbbbf69b132c74 SHA512 df22f6dfa6d9ec5fb838307c0dd690328b75d523d2c9e16bce5d9cda73cd2fe83a5d8b01c6437527c0a61195b673b23cede4411fd5372f95022c72f92df316ca WHIRLPOOL ccd5c7ab949229f383b73cc10b1e865c61ef8edb4a9550bb079b3dbc0ec2b51ef8f72356919957cb045253054994bae1cb2ccff86cc472da11fb7b4b386f8582
EBUILD slic3r-pe-1.41.3.ebuild 3022 SHA256 9e71a7af60a3da0e6f4c9dfcd841adf48e3b863d52a1ebcefb4748093a1fad70 SHA512 d403e3d5cb17229e4c1c3cc950435972f676c4c0687fa079afc8074d97454ed2b870c1b3ffc9f1bab7bf062b8188fefee4cda4a720e9f78d3c1144d8eb736009 WHIRLPOOL 656914ef48ea3a8240419b18813aa2c9e8cf08ca40b16f3a935071c380b729c74b497defcf0c09a1050f5b1650faa314383712b17e429b5a347e94bed9b32899
EBUILD slic3r-pe-1.42.0_beta2.ebuild 2643 SHA256 7146f4b6b241a5aab8eecc09ec05c21f9925b8d78cce9af667046825af0c7728 SHA512 692f0f7819e662740e7618badc1a6d93d609934338f4ae6692a76a998d244125b8bc8078219030c6d7308e9f4ce1ee6d13ae7a0170a0060475710a759d80e3da WHIRLPOOL e90c5aac8010cb42bc5c176d1e9018975616c5336d3e30af72b78143a9fae4a3db450b112fc40b2772632beb69f04cee4ff606ad13a927cac3e2808f133f0cf3

View File

@@ -1,562 +0,0 @@
diff --git a/Build.PL b/Build.PL
index 8f882fc..f99e978 100644
--- a/Build.PL
+++ b/Build.PL
@@ -100,15 +100,6 @@ EOF
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') if ! $nolocal;
-
# make sure our cpanm is updated (old ones don't support the ~ syntax)
system $cpanm, @cpanm_args, 'App::cpanminus';
diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm
index 0c6c81b..625187b 100644
--- a/lib/Slic3r.pm
+++ b/lib/Slic3r.pm
@@ -41,7 +41,7 @@ warn "Running Slic3r under Perl 5.16 is neither supported nor recommended\n"
use FindBin;
# Let the XS module know where the GUI resources reside.
-set_resources_dir(decode_path($FindBin::Bin) . (($^O eq 'darwin') ? '/../Resources' : '/resources'));
+set_resources_dir(decode_path($FindBin::RealBin) . (($^O eq 'darwin') ? '/../Resources' : '/resources'));
set_var_dir(resources_dir() . "/icons");
set_local_dir(resources_dir() . "/localization/");
diff --git a/slic3r.pl b/slic3r.pl
index d9bed0a..f4c29df 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/angles.t b/t/angles.t
index 9dc690d..363d154 100644
--- a/t/angles.t
+++ b/t/angles.t
@@ -6,8 +6,7 @@ plan tests => 34;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
@@ -90,4 +89,4 @@ sub line_orientation {
sub line_direction {
my ($l) = @_;
return Slic3r::Line->new(@$l)->direction;
-}
\ No newline at end of file
+}
diff --git a/t/bridges.t b/t/bridges.t
index ca55862..7ff7691 100644
--- a/t/bridges.t
+++ b/t/bridges.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first sum);
diff --git a/t/clean_polylines.t b/t/clean_polylines.t
index 50c6f5b..d2f1cac 100644
--- a/t/clean_polylines.t
+++ b/t/clean_polylines.t
@@ -6,8 +6,7 @@ plan tests => 6;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
diff --git a/t/clipper.t b/t/clipper.t
index 3c98381..e5f5d6a 100644
--- a/t/clipper.t
+++ b/t/clipper.t
@@ -6,8 +6,7 @@ plan tests => 6;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(sum);
diff --git a/t/collinear.t b/t/collinear.t
index b28a360..b715b2d 100644
--- a/t/collinear.t
+++ b/t/collinear.t
@@ -6,8 +6,7 @@ plan tests => 11;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
diff --git a/t/combineinfill.t b/t/combineinfill.t
index 5402a84..02edf85 100644
--- a/t/combineinfill.t
+++ b/t/combineinfill.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/config.t b/t/config.t
index f4a1867..6228b6a 100644
--- a/t/config.t
+++ b/t/config.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
diff --git a/t/cooling.t b/t/cooling.t
index 2f444cf..a2c83c4 100644
--- a/t/cooling.t
+++ b/t/cooling.t
@@ -6,8 +6,7 @@ plan tests => 14;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(none all);
diff --git a/t/custom_gcode.t b/t/custom_gcode.t
index 4c1c1b1..7decbf4 100644
--- a/t/custom_gcode.t
+++ b/t/custom_gcode.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/dynamic.t b/t/dynamic.t
index 5d4d3ce..b0eae7d 100644
--- a/t/dynamic.t
+++ b/t/dynamic.t
@@ -7,8 +7,7 @@ plan tests => 20;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/fill.t b/t/fill.t
index dd9eee4..50d1eaa 100644
--- a/t/fill.t
+++ b/t/fill.t
@@ -8,8 +8,7 @@ plan tests => 19;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first sum);
diff --git a/t/flow.t b/t/flow.t
index 2fa0d8f..ab146fd 100644
--- a/t/flow.t
+++ b/t/flow.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first sum);
diff --git a/t/gaps.t b/t/gaps.t
index f0c75c3..b122558 100644
--- a/t/gaps.t
+++ b/t/gaps.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/gcode.t b/t/gcode.t
index 126c621..5c5ee57 100644
--- a/t/gcode.t
+++ b/t/gcode.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/geometry.t b/t/geometry.t
index 0f37c0a..9fda622 100644
--- a/t/geometry.t
+++ b/t/geometry.t
@@ -6,8 +6,7 @@ plan tests => 42;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
diff --git a/t/layers.t b/t/layers.t
index a9f7dfe..3ead931 100644
--- a/t/layers.t
+++ b/t/layers.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/loops.t b/t/loops.t
index e662469..eb956f6 100644
--- a/t/loops.t
+++ b/t/loops.t
@@ -7,8 +7,7 @@ plan tests => 4;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
diff --git a/t/multi.t b/t/multi.t
index 75ce0c2..db8525a 100644
--- a/t/multi.t
+++ b/t/multi.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/perimeters.t b/t/perimeters.t
index ee33261..c5051ca 100644
--- a/t/perimeters.t
+++ b/t/perimeters.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r::ExtrusionLoop ':roles';
diff --git a/t/polyclip.t b/t/polyclip.t
index 0808c7b..083af19 100644
--- a/t/polyclip.t
+++ b/t/polyclip.t
@@ -6,8 +6,7 @@ plan tests => 18;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
diff --git a/t/print.t b/t/print.t
index 6939d5f..376ae97 100644
--- a/t/print.t
+++ b/t/print.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/retraction.t b/t/retraction.t
index 6e6a130..c0e3a74 100644
--- a/t/retraction.t
+++ b/t/retraction.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(any);
diff --git a/t/shells.t b/t/shells.t
index eac95aa..737f210 100644
--- a/t/shells.t
+++ b/t/shells.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first sum);
diff --git a/t/skirt_brim.t b/t/skirt_brim.t
index 225b0a9..5c7ece7 100644
--- a/t/skirt_brim.t
+++ b/t/skirt_brim.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/slice.t b/t/slice.t
index 2f193aa..393709f 100644
--- a/t/slice.t
+++ b/t/slice.t
@@ -7,8 +7,7 @@ plan tests => 16;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
# temporarily disable compilation errors due to constant not being exported anymore
diff --git a/t/support.t b/t/support.t
index a0cac14..c5ea34a 100644
--- a/t/support.t
+++ b/t/support.t
@@ -7,8 +7,7 @@ plan tests => 27;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/svg.t b/t/svg.t
index 47d24ce..e610ab8 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 9147236..56c4fe9 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 7fede33..20b5bc4 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/utils/amf-to-stl.pl b/utils/amf-to-stl.pl
index 802fd9a..2648ba2 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/dump-stl.pl b/utils/dump-stl.pl
index eee3c73..0f459ff 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/pdf-slices.pl b/utils/pdf-slices.pl
index ca61da0..670a171 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 0b803ba..989b178 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 56217de..fffc576 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 bb88b21..f0d537b 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 03153ab..66f1f3e 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 e064885..2a3dabc 100755
--- a/utils/view-toolpaths.pl
+++ b/utils/view-toolpaths.pl
@@ -6,8 +6,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/utils/wireframe.pl b/utils/wireframe.pl
index 5399f31..53ac69a 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);

View File

@@ -1,410 +0,0 @@
--- a/Build.PL 2019-04-14 01:24:31.000000000 -0700
+++ a/Build.PL 2019-04-29 14:27:05.193928522 -0700
@@ -87,13 +87,6 @@
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') if ! $nolocal;
# make sure our cpanm is updated (old ones don't support the ~ syntax)
--- a/lib/Slic3r.pm 2019-04-14 01:24:31.000000000 -0700
+++ a/lib/Slic3r.pm 2019-04-29 14:27:07.137941910 -0700
@@ -29,7 +29,7 @@
use FindBin;
# Let the XS module know where the GUI resources reside.
-set_resources_dir(decode_path($FindBin::Bin) . (($^O eq 'darwin') ? '/../Resources' : '/resources'));
+set_resources_dir(decode_path($FindBin::RealBin) . (($^O eq 'darwin') ? '/../Resources' : '/resources'));
set_var_dir(resources_dir() . "/icons");
set_local_dir(resources_dir() . "/localization/");
diff --git a/t/angles.t b/t/angles.t
index 9dc690d..363d154 100644
--- a/t/angles.t
+++ b/t/angles.t
@@ -6,8 +6,7 @@ plan tests => 34;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
@@ -90,4 +89,4 @@ sub line_orientation {
sub line_direction {
my ($l) = @_;
return Slic3r::Line->new(@$l)->direction;
-}
\ No newline at end of file
+}
diff --git a/t/bridges.t b/t/bridges.t
index ca55862..7ff7691 100644
--- a/t/bridges.t
+++ b/t/bridges.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first sum);
diff --git a/t/clean_polylines.t b/t/clean_polylines.t
index 50c6f5b..d2f1cac 100644
--- a/t/clean_polylines.t
+++ b/t/clean_polylines.t
@@ -6,8 +6,7 @@ plan tests => 6;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
diff --git a/t/clipper.t b/t/clipper.t
index 3c98381..e5f5d6a 100644
--- a/t/clipper.t
+++ b/t/clipper.t
@@ -6,8 +6,7 @@ plan tests => 6;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(sum);
diff --git a/t/collinear.t b/t/collinear.t
index b28a360..b715b2d 100644
--- a/t/collinear.t
+++ b/t/collinear.t
@@ -6,8 +6,7 @@ plan tests => 11;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
diff --git a/t/combineinfill.t b/t/combineinfill.t
index 5402a84..02edf85 100644
--- a/t/combineinfill.t
+++ b/t/combineinfill.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/config.t b/t/config.t
index f4a1867..6228b6a 100644
--- a/t/config.t
+++ b/t/config.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
diff --git a/t/cooling.t b/t/cooling.t
index 2f444cf..a2c83c4 100644
--- a/t/cooling.t
+++ b/t/cooling.t
@@ -6,8 +6,7 @@ plan tests => 14;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(none all);
diff --git a/t/custom_gcode.t b/t/custom_gcode.t
index 4c1c1b1..7decbf4 100644
--- a/t/custom_gcode.t
+++ b/t/custom_gcode.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/dynamic.t b/t/dynamic.t
index 5d4d3ce..b0eae7d 100644
--- a/t/dynamic.t
+++ b/t/dynamic.t
@@ -7,8 +7,7 @@ plan tests => 20;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/fill.t b/t/fill.t
index dd9eee4..50d1eaa 100644
--- a/t/fill.t
+++ b/t/fill.t
@@ -8,8 +8,7 @@ plan tests => 19;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first sum);
diff --git a/t/flow.t b/t/flow.t
index 2fa0d8f..ab146fd 100644
--- a/t/flow.t
+++ b/t/flow.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first sum);
diff --git a/t/gaps.t b/t/gaps.t
index f0c75c3..b122558 100644
--- a/t/gaps.t
+++ b/t/gaps.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/gcode.t b/t/gcode.t
index 126c621..5c5ee57 100644
--- a/t/gcode.t
+++ b/t/gcode.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/geometry.t b/t/geometry.t
index 0f37c0a..9fda622 100644
--- a/t/geometry.t
+++ b/t/geometry.t
@@ -6,8 +6,7 @@ plan tests => 42;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
diff --git a/t/layers.t b/t/layers.t
index a9f7dfe..3ead931 100644
--- a/t/layers.t
+++ b/t/layers.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/loops.t b/t/loops.t
index e662469..eb956f6 100644
--- a/t/loops.t
+++ b/t/loops.t
@@ -7,8 +7,7 @@ plan tests => 4;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
diff --git a/t/multi.t b/t/multi.t
index 75ce0c2..db8525a 100644
--- a/t/multi.t
+++ b/t/multi.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/perimeters.t b/t/perimeters.t
index ee33261..c5051ca 100644
--- a/t/perimeters.t
+++ b/t/perimeters.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r::ExtrusionLoop ':roles';
diff --git a/t/polyclip.t b/t/polyclip.t
index 0808c7b..083af19 100644
--- a/t/polyclip.t
+++ b/t/polyclip.t
@@ -6,8 +6,7 @@ plan tests => 18;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use Slic3r;
diff --git a/t/print.t b/t/print.t
index 6939d5f..376ae97 100644
--- a/t/print.t
+++ b/t/print.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/retraction.t b/t/retraction.t
index 6e6a130..c0e3a74 100644
--- a/t/retraction.t
+++ b/t/retraction.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(any);
diff --git a/t/shells.t b/t/shells.t
index eac95aa..737f210 100644
--- a/t/shells.t
+++ b/t/shells.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first sum);
diff --git a/t/skirt_brim.t b/t/skirt_brim.t
index 225b0a9..5c7ece7 100644
--- a/t/skirt_brim.t
+++ b/t/skirt_brim.t
@@ -4,8 +4,7 @@ use warnings;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/slice.t b/t/slice.t
index 2f193aa..393709f 100644
--- a/t/slice.t
+++ b/t/slice.t
@@ -7,8 +7,7 @@ plan tests => 16;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
# temporarily disable compilation errors due to constant not being exported anymore
diff --git a/t/support.t b/t/support.t
index a0cac14..c5ea34a 100644
--- a/t/support.t
+++ b/t/support.t
@@ -7,8 +7,7 @@ plan tests => 27;
BEGIN {
use FindBin;
- use lib "$FindBin::Bin/../lib";
- use local::lib "$FindBin::Bin/../local-lib";
+ use lib "$FindBin::Bin/../lib";
}
use List::Util qw(first);
diff --git a/t/thin.t b/t/thin.t
index 9147236..56c4fe9 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;

View File

@@ -1,118 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils perl-module cmake-utils
DESCRIPTION="Prusa Edition of a mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
HOMEPAGE="https://github.com/prusa3d/Slic3r"
SRC_URI="https://github.com/prusa3d/Slic3r/archive/version_${PV}.tar.gz"
LICENSE="AGPL-3 CC-BY-3.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+gui test"
RDEPEND="!media-gfx/slic3r
!=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
dev-cpp/tbb
sci-libs/nlopt[cxx]
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-cpp/gtest-1.7
>=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 )
!media-gfx/slic3r"
S="${WORKDIR}/Slic3r-version_${PV}"
PATCHES=$FILESDIR/$P-no-locallib.patch
#src_prepare() {
# pushd "${WORKDIR}/Slic3r-version_${PV}" || die
# eapply "${FILESDIR}"/${P}-no-locallib.patch
# eapply_user
# popd || die
#}
src_configure() {
cmake-utils_src_configure
SLIC3R_NO_AUTO=1 perl-module_src_configure
}
src_test() {
perl-module_src_test
prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
}
src_install() {
MY_ARCH=$(basename $VENDOR_ARCH)
perl-module_src_install
# TODO: generate path based on perl iuse
insinto "${VENDOR_ARCH}"/auto
doins -r local-lib/lib/perl5/$MY_ARCH/auto/Slic3r
insinto "${VENDOR_ARCH}"
doins -r local-lib/lib/perl5/$MY_ARCH/Slic3r
insinto "${VENDOR_LIB}"
doins -r lib/Slic3r.pm lib/Slic3r
insinto "${VENDOR_LIB}"/Slic3r
doins -r resources
exeinto "${VENDOR_LIB}"/Slic3r
doexe slic3r.pl
dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
# exit 1
make_desktop_entry slic3r.pl \
"Slic3r Prusa Edition"\
"${VENDOR_LIB}/Slic3r/resources/icons/Slic3r_128px.png" \
"Graphics;3DGraphics;Engineering;Development"
}

View File

@@ -1,101 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils perl-module cmake-utils eapi7-ver
MY_PV=$(ver_rs 3 -)
S=${WORKDIR}/Slic3r-version_${MY_PV}
DESCRIPTION="Prusa Edition of a mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
HOMEPAGE="https://github.com/prusa3d/Slic3r"
SRC_URI="https://github.com/prusa3d/Slic3r/archive/version_$MY_PV.tar.gz -> $P.tar.gz"
LICENSE="AGPL-3 CC-BY-3.0"
SLOT="0"
KEYWORDS=""
IUSE="+gui test"
RDEPEND="!media-gfx/slic3r
!=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
dev-cpp/tbb
sci-libs/nlopt[cxx]
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-cpp/gtest-1.7
>=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 )
!media-gfx/slic3r"
PATCHES=$FILESDIR/$P-no-locallib.patch
src_configure() {
local mycmakeargs=( -DSLIC3R_WX_STABLE=1 )
cmake-utils_src_configure
SLIC3R_NO_AUTO=1 perl-module_src_configure
}
src_test() {
perl-module_src_test
prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
}
src_install() {
MY_ARCH=$(basename $VENDOR_ARCH)
perl-module_src_install
insinto "${VENDOR_LIB}"
doins -r lib/Slic3r.pm lib/Slic3r
insinto "${VENDOR_LIB}"/Slic3r
doins -r resources
# exit 1
make_desktop_entry slic3r.pl \
"Slic3r Prusa Edition"\
"${VENDOR_LIB}/Slic3r/resources/icons/Slic3r_128px.png" \
"Graphics;3DGraphics;Engineering;Development"
}