Update cad/prusaslicer to 2.9.7.

boost::dll::program_location() is now supported, so the following
patches were removed:

- patches/patch-src_CLI_Setup_cpp
- patches/patch-src_libslic3r_Format_STEP_cpp


diff --git a/cad/prusaslicer/Makefile b/cad/prusaslicer/Makefile
index 9cb33121321..ff3eca2601d 100644
--- a/cad/prusaslicer/Makefile
+++ b/cad/prusaslicer/Makefile
@@ -2,9 +2,8 @@ COMMENT =       g-code generator for 3D printers
 ONLY_FOR_ARCHS = ${LP64_ARCHS}
 DPB_PROPERTIES = parallel
 
-V =            2.9.6
+V =            2.9.7
 PKGNAME =      prusaslicer-${V}
-REVISION =     0
 
 GH_ACCOUNT =   prusa3d
 GH_PROJECT =   PrusaSlicer
diff --git a/cad/prusaslicer/distinfo b/cad/prusaslicer/distinfo
index f29c0fbf660..4f7e0cec7f9 100644
--- a/cad/prusaslicer/distinfo
+++ b/cad/prusaslicer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PrusaSlicer-version_2.9.6.tar.gz) = 
j59A2Tg4uRK9ntNeWYwLfqvQgCTLGKpiDGqp+dSdC1c=
-SIZE (PrusaSlicer-version_2.9.6.tar.gz) = 82103739
+SHA256 (PrusaSlicer-version_2.9.7.tar.gz) = 
sNQqocmVVB3ZAovmHj7C4F0F/UyS2ijRplx6JrBJ9Hg=
+SIZE (PrusaSlicer-version_2.9.7.tar.gz) = 82108147
diff --git a/cad/prusaslicer/patches/patch-src_CLI_Setup_cpp 
b/cad/prusaslicer/patches/patch-src_CLI_Setup_cpp
deleted file mode 100644
index 74caaa8066d..00000000000
--- a/cad/prusaslicer/patches/patch-src_CLI_Setup_cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/CLI/Setup.cpp
---- src/CLI/Setup.cpp.orig
-+++ src/CLI/Setup.cpp
-@@ -272,9 +272,11 @@ static bool setup_common()
-     }
- #endif
- 
-+#ifndef SLIC3R_FHS
-     // See Invoking prusa-slicer from $PATH environment variable crashes #5542
-     // boost::filesystem::path path_to_binary = 
boost::filesystem::system_complete(argv[0]);
-     boost::filesystem::path path_to_binary = boost::dll::program_location();
-+#endif
- 
-     // Path from the Slic3r binary to its resources.
- #ifdef __APPLE__
-@@ -338,4 +340,4 @@ bool setup(Data& cli, int argc, char** argv)
-     return true;
- }
- 
--}
-\ No newline at end of file
-+}
diff --git a/cad/prusaslicer/patches/patch-src_libslic3r_Format_STEP_cpp 
b/cad/prusaslicer/patches/patch-src_libslic3r_Format_STEP_cpp
deleted file mode 100644
index 98c2c189a9f..00000000000
--- a/cad/prusaslicer/patches/patch-src_libslic3r_Format_STEP_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/libslic3r/Format/STEP.cpp
---- src/libslic3r/Format/STEP.cpp.orig
-+++ src/libslic3r/Format/STEP.cpp
-@@ -42,7 +42,7 @@ LoadStepFn get_load_step_fn()
- #endif
- 
-     if (!load_step_fn) {
--        auto libpath = boost::dll::program_location().parent_path();
-+        auto libpath = boost::filesystem::path(SLIC3R_FHS_LIBDIR);
- #ifdef _WIN32
-         libpath /= "OCCTWrapper.dll";
-         HMODULE module = LoadLibraryW(libpath.wstring().c_str());

Reply via email to