From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- .../files/slic3r-1.1.7-adjust_var_path.patch | 11 - .../slic3r/files/slic3r-1.3.0-boost-1.73.patch | 146 +++++ media-gfx/slic3r/files/slic3r-1.3.0-boost.patch | 10 - .../files/slic3r-1.3.0-use-system-clipper.patch | 44 ++ media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch | 10 + .../slic3r-1.3.1_pre20200824-boost-1.73.patch | 133 +++++ media-gfx/slic3r/files/slic3r-9999-boost-173.patch | 39 -- .../slic3r/files/slic3r-9999-no-locallib.patch | 609 --------------------- 8 files changed, 333 insertions(+), 669 deletions(-) delete mode 100644 media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch create mode 100644 media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch delete mode 100644 media-gfx/slic3r/files/slic3r-1.3.0-boost.patch create mode 100644 media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch create mode 100644 media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch create mode 100644 media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch delete mode 100644 media-gfx/slic3r/files/slic3r-9999-boost-173.patch delete mode 100644 media-gfx/slic3r/files/slic3r-9999-no-locallib.patch (limited to 'media-gfx/slic3r/files') diff --git a/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch deleted file mode 100644 index ee4d75d0122a..000000000000 --- a/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/Slic3r.pm 2016-03-31 13:27:59.431548980 +0200 -+++ b/lib/Slic3r.pm 2016-03-31 13:28:21.658675137 +0200 -@@ -29,7 +29,7 @@ - if $^V >= v5.16; - - use FindBin; --our $var = "$FindBin::Bin/var"; -+our $var = "$FindBin::RealBin/var"; - - use Encode; - use Encode::Locale; 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 000000000000..6b710a18f3af --- /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 ++#include + #include + + #endif +--- a/xs/src/admesh/stl.h ++++ b/xs/src/admesh/stl.h +@@ -26,11 +26,6 @@ + #include + #include + #include +-#include +- +-#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 + #include + #include + + 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 + #include + #include +-#include ++#include ++#include + #include + + 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 + #include + #include ++#include + + #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 + #include + #include ++#include + #include + #include + #include +--- a/xs/src/libslic3r/SLAPrint.cpp ++++ b/xs/src/libslic3r/SLAPrint.cpp +@@ -7,9 +7,12 @@ + #include + #include + #include ++#include + + 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 ++#include + #include + + 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-boost.patch b/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch deleted file mode 100644 index e77e50b3c998..000000000000 --- a/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #include - #include -+#include - - namespace Slic3r { - 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 000000000000..9f9a5ef2fbd0 --- /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 +-#include "clipper.hpp" ++#include + #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 + #include + #include + #include +--- 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 + #include "ExPolygon.hpp" + #include "Line.hpp" + #include "TriangleMesh.hpp" +--- a/xs/xsp/Clipper.xsp ++++ b/xs/xsp/Clipper.xsp +@@ -2,7 +2,7 @@ + + %{ + #include +-#include "clipper.hpp" ++#include + #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 000000000000..d2dea0208d86 --- /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/files/slic3r-1.3.1_pre20200824-boost-1.73.patch b/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch new file mode 100644 index 000000000000..d2aafecdb1e9 --- /dev/null +++ b/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch @@ -0,0 +1,133 @@ +--- a/xs/src/libslic3r/TriangleMesh.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) ++++ b/xs/src/libslic3r/TriangleMesh.cpp (date 1607117258000) +@@ -22,6 +22,8 @@ + + namespace Slic3r { + ++using boost::placeholders::_1; ++ + TriangleMesh::TriangleMesh() + : repaired(false) + { + +--- a/src/CMakeLists.txt (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) ++++ b/src/CMakeLists.txt (date 1607117046000) +@@ -115,7 +115,7 @@ + find_package(Threads REQUIRED) + + set(Boost_NO_BOOST_CMAKE ON) +-find_package(Boost REQUIRED COMPONENTS system thread filesystem) ++find_package(Boost REQUIRED COMPONENTS system thread filesystem nowide) + + set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/) + set(GUI_LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/GUI/) + +--- a/xs/src/libslic3r/PrintObject.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) ++++ b/xs/src/libslic3r/PrintObject.cpp (date 1607117227000) +@@ -4,12 +4,15 @@ + #include "Geometry.hpp" + #include "Log.hpp" + #include "TransformationMatrix.hpp" ++#include + #include + #include + #include + + 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 (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) ++++ b/xs/src/libslic3r/GCodeSender.hpp (date 1607117162000) +@@ -7,7 +7,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +@@ -15,6 +15,9 @@ + + namespace asio = boost::asio; + ++using boost::placeholders::_1; ++using boost::placeholders::_2; ++ + class GCodeSender : private boost::noncopyable { + public: + GCodeSender(); + +--- a/xs/src/libslic3r/SLAPrint.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) ++++ b/xs/src/libslic3r/SLAPrint.cpp (date 1607117248000) +@@ -7,9 +7,12 @@ + #include + #include + #include ++#include + + namespace Slic3r { + ++using boost::placeholders::_1; ++ + void + SLAPrint::slice() + { + +--- a/xs/src/libslic3r/ConfigBase.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) ++++ b/xs/src/libslic3r/ConfigBase.cpp (date 1607117107000) +@@ -16,7 +16,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include + +--- a/xs/src/libslic3r/GCodeTimeEstimator.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) ++++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp (date 1607117194000) +@@ -1,9 +1,12 @@ + #include "GCodeTimeEstimator.hpp" +-#include ++#include + #include + + namespace Slic3r { + ++using boost::placeholders::_1; ++using boost::placeholders::_2; ++ + void + GCodeTimeEstimator::parse(const std::string &gcode) + { + +--- a/xs/Build.PL (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) ++++ b/xs/Build.PL (date 1607117077000) +@@ -151,7 +151,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 + +--- a/xs/src/libslic3r/SupportMaterial.cpp (revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d) ++++ b/xs/src/libslic3r/SupportMaterial.cpp (date 1607118181000) +@@ -4,6 +4,8 @@ + namespace Slic3r + { + ++using boost::placeholders::_1; ++ + PolylineCollection _fill_surface(Fill *fill, Surface *surface) + { + PolylineCollection ps; diff --git a/media-gfx/slic3r/files/slic3r-9999-boost-173.patch b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch deleted file mode 100644 index ef7289afcd8c..000000000000 --- a/media-gfx/slic3r/files/slic3r-9999-boost-173.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/xs/src/libslic3r/SLAPrint.cpp 2020-05-10 23:32:00.044962439 -0600 -+++ b/xs/src/libslic3r/SLAPrint.cpp 2020-05-10 23:40:48.867348908 -0600 -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include "boost/bind.hpp" - - namespace Slic3r { - ---- a/xs/src/libslic3r/PrintObject.cpp 2020-05-10 23:32:00.044962439 -0600 -+++ b/xs/src/libslic3r/PrintObject.cpp 2020-05-10 23:46:22.614152088 -0600 -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include "boost/bind.hpp" - - namespace Slic3r { - ---- a/xs/src/libslic3r/SupportMaterial.cpp 2020-05-10 23:32:00.044962439 -0600 -+++ b/xs/src/libslic3r/SupportMaterial.cpp 2020-05-10 23:54:17.078033850 -0600 -@@ -1,5 +1,6 @@ - #include "SupportMaterial.hpp" - #include "Log.hpp" -+#include "boost/bind.hpp" - - namespace Slic3r - { ---- a/xs/src/libslic3r/TriangleMesh.cpp 2020-05-10 23:32:00.045962432 -0600 -+++ b/xs/src/libslic3r/TriangleMesh.cpp 2020-05-10 23:35:44.778426800 -0600 -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include "boost/bind.hpp" - - #ifdef SLIC3R_DEBUG - #include "SVG.hpp" diff --git a/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch b/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch deleted file mode 100644 index 8cb7fd6d16dc..000000000000 --- a/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch +++ /dev/null @@ -1,609 +0,0 @@ -commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f -Author: Ian Stakenvicius -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); -- cgit v1.2.3