Benjamin Greiner
07f7b199d0
- disable slic3r_jobs_tests.cpp, as it fails sometimes
- PrusaSlicer-2.6.0-wxWidgets-CheckResizerFlags-assert-fix.patch
applied
- Update to version 2.6.0
* too many changes to list here, you may want to check:
https://github.com/prusa3d/PrusaSlicer/commits/version_2.6.0
* PrusaSlicer-boost1.79.patch was applied upstream: removed
* PrusaSlicer-cereal.patch was applied upstream: removed
* gentoo-887055-boost-fix.patch was applied upstream: removed
* new dependencies: nanosvg (new package), glu and glew
* more sed fiddling required for system expat and qhull support
* PrusaSlicer-2.6.0-octoprint-name-fix.patch added to work around
compile error: cast lambda expressionn to same type
* wxWidgets 3.0 is not supported anymore (even project states
otherwise). Let's hope, it will work with 3.2 better now.
upstream is using a patched 3.1 version.
OBS-URL: https://build.opensuse.org/request/show/1097058
OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=59
14 lines
824 B
Diff
14 lines
824 B
Diff
Index: b/src/slic3r/Utils/OctoPrint.cpp
|
|
===================================================================
|
|
--- a/src/slic3r/Utils/OctoPrint.cpp
|
|
+++ b/src/slic3r/Utils/OctoPrint.cpp
|
|
@@ -746,7 +746,7 @@ bool PrusaLink::get_storage(wxArrayStrin
|
|
if (path && (!available || *available)) {
|
|
StorageInfo si;
|
|
si.path = boost::nowide::widen(*path);
|
|
- si.name = name ? boost::nowide::widen(*name) : wxString();
|
|
+ si.name = name ? wxString(boost::nowide::widen(*name)) : wxString();
|
|
// If read_only is missing, assume it is NOT read only.
|
|
// si.read_only = read_only ? *read_only : false; // version without "ro"
|
|
si.read_only = (read_only ? *read_only : (ro ? *ro : false));
|