diff options
Diffstat (limited to 'Move-Slic3r-data-to-usr-share-slic3r.patch')
| -rw-r--r-- | Move-Slic3r-data-to-usr-share-slic3r.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/Move-Slic3r-data-to-usr-share-slic3r.patch b/Move-Slic3r-data-to-usr-share-slic3r.patch deleted file mode 100644 index 580e3ced1006..000000000000 --- a/Move-Slic3r-data-to-usr-share-slic3r.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43d7dee7..40c7a815 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -45,9 +45,8 @@ find_package(Perl REQUIRED) - add_subdirectory(xs) - - enable_testing () --get_filename_component(PERL_BIN_PATH "${PERL_EXECUTABLE}" DIRECTORY) --add_test (NAME xs COMMAND "${PERL_EXECUTABLE}" ${PERL_BIN_PATH}/prove -I ${PROJECT_SOURCE_DIR}/local-lib/lib/perl5 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/xs) --add_test (NAME integration COMMAND "${PERL_EXECUTABLE}" ${PERL_BIN_PATH}/prove WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) -+add_test (NAME xs COMMAND prove -I ${PROJECT_SOURCE_DIR}/local-lib/lib/perl5 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/xs) -+add_test (NAME integration COMMAND prove WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) - - install(PROGRAMS slic3r.pl DESTINATION bin RENAME slic3r-prusa3d) - -diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm -index 17b78326..8411fad7 100644 ---- a/lib/Slic3r.pm -+++ b/lib/Slic3r.pm -@@ -51,7 +51,7 @@ warn "Running Slic3r under Perl 5.16 is neither supported nor recommended\n" - - use FindBin; - # Path to the images. --our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] }; -+our $var = sub { '/usr/share/slic3r-prusa3d/' . $_[0] }; - - use Moo 1.003001; - -diff --git a/slic3r.pl b/slic3r.pl -index 4b6e43e4..d833ed1b 100755 ---- a/slic3r.pl -+++ b/slic3r.pl -@@ -5,8 +5,7 @@ use warnings; - - BEGIN { - use FindBin; -- use lib "$FindBin::Bin/lib"; -- use local::lib '--no-create', "$FindBin::Bin/local-lib"; -+ use lib "$FindBin::Bin/lib", "/usr/lib/slic3r-prusa3d/"; - } - - use File::Basename qw(basename); |