Update PrusaSlicer to version 2.6.0 / rev 28 via SR 1099891

https://build.opensuse.org/request/show/1099891 by user bnavigator + anag+factory - Require wxWidgets >= 3.1.6 * Add PrusaSlicer-drop-wx3.0.patch * gh#prusa3d/PrusaSlicer#11026, gh#prusa3d/PrusaSlicer#11027 (forwarded request 1099890 from bnavigator)
bmwiedemann · Jul 25, 2023 · 3bbd538 · 3bbd538
1 parent c1317cb
commit 3bbd538
Show file tree

Hide file tree

Showing 12 changed files with 251 additions and 250 deletions.
diff --git a/packages/p/PrusaSlicer/.files b/packages/p/PrusaSlicer/.files
diff --git a/packages/p/PrusaSlicer/.rev b/packages/p/PrusaSlicer/.rev
@@ -278,4 +278,14 @@ Resubmitting in the hope that all bots and maintainers pick it up this time. The
     <comment></comment>
     <requestid>1082115</requestid>
   </revision>
+  <revision rev="28" vrev="1">
+    <srcmd5>b5b154e67ec3dd139c8db934e3d5d4f6</srcmd5>
+    <version>2.6.0</version>
+    <time>1690277374</time>
+    <user>anag+factory</user>
+    <comment>- Require wxWidgets &gt;= 3.1.6
+  * Add PrusaSlicer-drop-wx3.0.patch
+  * gh#prusa3d/PrusaSlicer#11026, gh#prusa3d/PrusaSlicer#11027 (forwarded request 1099890 from bnavigator)</comment>
+    <requestid>1099891</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/p/PrusaSlicer/PrusaSlicer-2.5.2.tar.gz b/packages/p/PrusaSlicer/PrusaSlicer-2.5.2.tar.gz
diff --git a/packages/p/PrusaSlicer/PrusaSlicer-2.6.0-octoprint-name-fix.patch b/packages/p/PrusaSlicer/PrusaSlicer-2.6.0-octoprint-name-fix.patch
@@ -0,0 +1,13 @@
+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));
diff --git a/packages/p/PrusaSlicer/PrusaSlicer-2.6.0-wxWidgets-CheckResizerFlags-assert-fix.patch b/packages/p/PrusaSlicer/PrusaSlicer-2.6.0-wxWidgets-CheckResizerFlags-assert-fix.patch
@@ -0,0 +1,76 @@
+From 24a5ebd65c9d25a0fd69a3716d079fd1b00eb15c Mon Sep 17 00:00:00 2001
+From: Pascal de Bruijn <pmjdebruijn@pcode.nl>
+Date: Wed, 14 Jun 2023 19:56:35 +0200
+Subject: [PATCH] wxWidgets: CheckResizerFlags assert fix
+
+./src/common/sizer.cpp(2258): assert "CheckSizerFlags(!((flags) & (wxALIGN_CENTRE_VERTICAL)))"
+failed in DoInsert(): wxALIGN_CENTRE_VERTICAL will be ignored in this sizer:
+wxEXPAND overrides alignment flags in box sizers
+---
+ src/slic3r/GUI/Field.cpp           | 2 +-
+ src/slic3r/GUI/FirmwareDialog.cpp  | 2 +-
+ src/slic3r/GUI/Tab.cpp             | 4 ++--
+ src/slic3r/GUI/WipeTowerDialog.cpp | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
+index 74ad028d363..6789ce24cb5 100644
+--- a/src/slic3r/GUI/Field.cpp
++++ b/src/slic3r/GUI/Field.cpp
+@@ -1660,7 +1660,7 @@ void SliderCtrl::BUILD()
+ 	m_textctrl->SetFont(Slic3r::GUI::wxGetApp().normal_font());
+ 	m_textctrl->SetBackgroundStyle(wxBG_STYLE_PAINT);
+
+-	temp->Add(m_slider, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL, 0);
++	temp->Add(m_slider, 1, wxEXPAND, 0);
+ 	temp->Add(m_textctrl, 0, wxALIGN_CENTER_VERTICAL, 0);
+
+ 	m_slider->Bind(wxEVT_SLIDER, ([this](wxCommandEvent e) {
+diff --git a/src/slic3r/GUI/FirmwareDialog.cpp b/src/slic3r/GUI/FirmwareDialog.cpp
+index 47402644f4b..46d2fdb60d1 100644
+--- a/src/slic3r/GUI/FirmwareDialog.cpp
++++ b/src/slic3r/GUI/FirmwareDialog.cpp
+@@ -841,7 +841,7 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
+ 	grid->Add(port_sizer, 0, wxEXPAND);
+
+ 	grid->Add(label_progress, 0, wxALIGN_CENTER_VERTICAL);
+-	grid->Add(p->progressbar, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
++	grid->Add(p->progressbar, 1, wxEXPAND);
+
+ 	grid->Add(label_status, 0, wxALIGN_CENTER_VERTICAL);
+ 	grid->Add(p->txt_status, 0, wxEXPAND);
+diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
+index 184b8af707f..c95fcd44219 100644
+--- a/src/slic3r/GUI/Tab.cpp
++++ b/src/slic3r/GUI/Tab.cpp
+@@ -217,7 +217,7 @@ void Tab::create_preset_tab()
+
+     const float scale_factor = em_unit(this)*0.1;// GetContentScaleFactor();
+     m_top_hsizer = new wxBoxSizer(wxHORIZONTAL);
+-    sizer->Add(m_top_hsizer, 0, wxEXPAND | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 3);
++    sizer->Add(m_top_hsizer, 0, wxEXPAND | wxBOTTOM, 3);
+     m_top_hsizer->Add(m_presets_choice, 0, wxLEFT | wxRIGHT | wxTOP | wxALIGN_CENTER_VERTICAL, 3);
+     m_top_hsizer->AddSpacer(int(4*scale_factor));
+
+@@ -243,7 +243,7 @@ void Tab::create_preset_tab()
+     m_h_buttons_sizer->AddSpacer(int(8*scale_factor));
+     m_h_buttons_sizer->Add(m_btn_compare_preset, 0, wxALIGN_CENTER_VERTICAL);
+
+-    m_top_hsizer->Add(m_h_buttons_sizer, 1, wxEXPAND | wxALIGN_CENTRE_VERTICAL);
++    m_top_hsizer->Add(m_h_buttons_sizer, 1, wxEXPAND);
+     m_top_hsizer->AddSpacer(int(16*scale_factor));
+     // StretchSpacer has a strange behavior under OSX, so
+     // There is used just additional sizer for m_mode_sizer with right alignment
+diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp
+index 4d117ff8d62..6d48daa6292 100644
+--- a/src/slic3r/GUI/WipeTowerDialog.cpp
++++ b/src/slic3r/GUI/WipeTowerDialog.cpp
+@@ -353,7 +353,7 @@ WipingPanel::WipingPanel(wxWindow* parent, const std::vector<float>& matrix, con
+         hsizer->AddSpacer(10);
+         hsizer->Add(new wxStaticText(m_page_simple, wxID_ANY, wxString(_(L("Tool #"))) << i + 1 << ": "), 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
+
+-        gridsizer_simple->Add(hsizer, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL);
++        gridsizer_simple->Add(hsizer, 1, wxEXPAND);
+         gridsizer_simple->Add(m_old.back(),0);
+         gridsizer_simple->Add(m_new.back(),0);
+ 	}
diff --git a/packages/p/PrusaSlicer/PrusaSlicer-boost1.79.patch b/packages/p/PrusaSlicer/PrusaSlicer-boost1.79.patch
diff --git a/packages/p/PrusaSlicer/PrusaSlicer-cereal.patch b/packages/p/PrusaSlicer/PrusaSlicer-cereal.patch
diff --git a/packages/p/PrusaSlicer/PrusaSlicer-drop-wx3.0.patch b/packages/p/PrusaSlicer/PrusaSlicer-drop-wx3.0.patch
@@ -0,0 +1,85 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 49fe3437f..aa297b03b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,6 @@ endif()
+ option(SLIC3R_STATIC 			"Compile PrusaSlicer with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
+ option(SLIC3R_GUI    			"Compile PrusaSlicer with GUI components (OpenGL, wxWidgets)" 1)
+ option(SLIC3R_FHS               "Assume PrusaSlicer is to be installed in a FHS directory structure" 0)
+-option(SLIC3R_WX_STABLE         "Build against wxWidgets stable (3.0) as oppsed to dev (3.1) on Linux" 0)
+ option(SLIC3R_PCH               "Use precompiled headers" 1)
+ option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
+ option(SLIC3R_MSVC_PDB          "Generate PDB files on MSVC in Release mode" 1)
+diff --git a/doc/Dependencies.md b/doc/Dependencies.md
+index d8ced6318..5645e7169 100644
+--- a/doc/Dependencies.md
++++ b/doc/Dependencies.md
+@@ -1,7 +1,7 @@
+ # Dependency report for PrusaSlicer
+ ## Possible dynamic linking on Linux
+ * zlib: Strict dependency required from the system, linked dynamically. Many other libs depend on zlib.
+-* wxWidgets: searches for wx-3.1 by default, but with cmake option `SLIC3R_WX_STABLE=ON` it will use wx-3.0 bundled with most distros.
++* wxWidgets >= 3.1.6
+ * libcurl
+ * tbb
+ * boost
+diff --git a/doc/How to build - Linux et al.md b/doc/How to build - Linux et al.md
+index 81e6310c4..de6e365fb 100644
+--- a/doc/How to build - Linux et al.md	
++++ b/doc/How to build - Linux et al.md	
+@@ -87,7 +87,6 @@ And that's it. It is now possible to run the freshly built PrusaSlicer binary:
+ - `-DSLIC3R_ASAN=ON` enables gcc/clang address sanitizer (defaults to `OFF`, requires gcc>4.8 or clang>3.1)
+ - `-DSLIC3R_GTK=3` to use GTK3 (defaults to `2`). Note that wxWidgets must be built against the same GTK version.
+ - `-DSLIC3R_STATIC=ON` for static build (defaults to `OFF`)
+-- `-DSLIC3R_WX_STABLE=ON` to look for wxWidgets 3.0 (defaults to `OFF`)
+ - `-DCMAKE_BUILD_TYPE=Debug` to build in debug mode (defaults to `Release`)
+ - `-DSLIC3R_GUI=no` to build the console variant of PrusaSlicer
+
+@@ -101,14 +100,6 @@ As already mentioned above, dynamic linking of dependencies is possible, but Pru
+
+ The list of dependencies can be easily obtained by inspecting the CMake scripts in the `deps/` directory. Some of the dependencies don't have to be as recent as the versions listed - generally versions available on conservative Linux distros such as Debian stable, Ubuntu LTS releases or Fedora are likely sufficient. If you decide to build this way, it is your responsibility to make sure that CMake finds all required dependencies. It is possible to look at your distribution PrusaSlicer package to see how the package maintainers solved the dependency issues.
+
+-#### wxWidgets
+-By default, PrusaSlicer looks for wxWidgets 3.1. Our build script in fact downloads specific patched version of wxWidgets. If you want to link against wxWidgets 3.0 (which are still provided by most distributions because wxWidgets 3.1 have not yet been declared stable), you must set `-DSLIC3R_WX_STABLE=ON` when running CMake. Note that while PrusaSlicer can be linked against wWidgets 3.0, the combination is not well tested and there might be bugs in the resulting application. 
+-
+-When building on ubuntu 20.04 focal fossa, the package libwxgtk3.0-gtk3-dev needs to be installed instead of libwxgtk3.0-dev and you should use:
+-```
+--DSLIC3R_WX_STABLE=1 -DSLIC3R_GTK=3
+-``` 
+-
+ ## Miscellaneous
+
+ ### Installation
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 50eccfc84..1a335f2cd 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -49,23 +49,17 @@ if (SLIC3R_GUI)
+
+     if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+         set (wxWidgets_CONFIG_OPTIONS "--toolkit=gtk${SLIC3R_GTK}")
+-        if (SLIC3R_WX_STABLE)
+-            find_package(wxWidgets 3.0 REQUIRED COMPONENTS base core adv html gl)
+-        else ()
+-            find_package(wxWidgets 3.1 QUIET COMPONENTS base core adv html gl)
+-
+-            if (NOT wxWidgets_FOUND)
+-                message(FATAL_ERROR "\nCould not find wxWidgets 3.1.\n"
+-                    "Hint: On Linux you can set -DSLIC3R_WX_STABLE=1 to use wxWidgets 3.0\n")
+-            endif ()
++        find_package(wxWidgets 3.1.6 QUIET COMPONENTS base core adv html gl)
++        if (NOT wxWidgets_FOUND)
++            message(FATAL_ERROR "Could not find wxWidgets >= 3.1.6")
+         endif ()
+
+         include(${wxWidgets_USE_FILE})
+     else ()
+-        find_package(wxWidgets 3.1 COMPONENTS html adv gl core base)
++        find_package(wxWidgets 3.1.6 COMPONENTS html adv gl core base)
+         if (NOT wxWidgets_FOUND)
+             message(STATUS "Trying to find wxWidgets in CONFIG mode...")
+-            find_package(wxWidgets 3.2 CONFIG REQUIRED COMPONENTS html adv gl core base)
++            find_package(wxWidgets 3.1.6 CONFIG REQUIRED COMPONENTS html adv gl core base)
+             slic3r_remap_configs(wx::wxhtml wx::wxadv wx::wxgl wx::wxcore wx::wxbase RelWithDebInfo Release)
+         else ()
+             include(${wxWidgets_USE_FILE})
diff --git a/packages/p/PrusaSlicer/PrusaSlicer-version_2.6.0.tar.gz b/packages/p/PrusaSlicer/PrusaSlicer-version_2.6.0.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeia6nigx23acfhhqqf26nm6cwgsfuzimsy3bg2ry7kgnl3lnnpdmty
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/ipfs/bafybeia6nigx23acfhhqqf26nm6cwgsfuzimsy3bg2ry7kgnl3lnnpdmty