Accepting request 1135619 from science
- Add PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch * Fixes a compilation error with wxWidgets 3.2.4 * gh#prusa3d/PrusaSlicer#11769 (forwarded request 1135618 from bnavigator) OBS-URL: https://build.opensuse.org/request/show/1135619 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/PrusaSlicer?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
280222bc92
@ -1,76 +0,0 @@
|
||||
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(-)
|
||||
|
||||
Index: PrusaSlicer-version_2.6.1/src/slic3r/GUI/Field.cpp
|
||||
===================================================================
|
||||
--- PrusaSlicer-version_2.6.1.orig/src/slic3r/GUI/Field.cpp
|
||||
+++ PrusaSlicer-version_2.6.1/src/slic3r/GUI/Field.cpp
|
||||
@@ -1668,7 +1668,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) {
|
||||
Index: PrusaSlicer-version_2.6.1/src/slic3r/GUI/FirmwareDialog.cpp
|
||||
===================================================================
|
||||
--- PrusaSlicer-version_2.6.1.orig/src/slic3r/GUI/FirmwareDialog.cpp
|
||||
+++ PrusaSlicer-version_2.6.1/src/slic3r/GUI/FirmwareDialog.cpp
|
||||
@@ -845,7 +845,7 @@ FirmwareDialog::FirmwareDialog(wxWindow
|
||||
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);
|
||||
Index: PrusaSlicer-version_2.6.1/src/slic3r/GUI/Tab.cpp
|
||||
===================================================================
|
||||
--- PrusaSlicer-version_2.6.1.orig/src/slic3r/GUI/Tab.cpp
|
||||
+++ PrusaSlicer-version_2.6.1/src/slic3r/GUI/Tab.cpp
|
||||
@@ -236,7 +236,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));
|
||||
|
||||
@@ -262,7 +262,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
|
||||
Index: PrusaSlicer-version_2.6.1/src/slic3r/GUI/WipeTowerDialog.cpp
|
||||
===================================================================
|
||||
--- PrusaSlicer-version_2.6.1.orig/src/slic3r/GUI/WipeTowerDialog.cpp
|
||||
+++ PrusaSlicer-version_2.6.1/src/slic3r/GUI/WipeTowerDialog.cpp
|
||||
@@ -357,7 +357,7 @@ WipingPanel::WipingPanel(wxWindow* paren
|
||||
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);
|
||||
}
|
||||
37
PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch
Normal file
37
PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch
Normal file
@ -0,0 +1,37 @@
|
||||
From f67a877d583eba5472003f0ea4df3f7420d70734 Mon Sep 17 00:00:00 2001
|
||||
From: Gregor Riepl <onitake@gmail.com>
|
||||
Date: Mon, 27 Nov 2023 13:01:55 +0100
|
||||
Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString
|
||||
overloads
|
||||
|
||||
---
|
||||
src/slic3r/GUI/PhysicalPrinterDialog.cpp | 2 +-
|
||||
src/slic3r/GUI/Plater.cpp | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
||||
index 2364c56247..bc2c918a60 100644
|
||||
--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
||||
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
||||
@@ -467,7 +467,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
|
||||
// Always fill in the "printhost_port" combo box from the config and select it.
|
||||
{
|
||||
Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
|
||||
- choice->set_values({ m_config->opt_string("printhost_port") });
|
||||
+ choice->set_values(std::vector<std::string>({ m_config->opt_string("printhost_port") }));
|
||||
choice->set_selection();
|
||||
}
|
||||
|
||||
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
|
||||
index c2b8e8694f..2f540bfe9d 100644
|
||||
--- a/src/slic3r/GUI/Plater.cpp
|
||||
+++ b/src/slic3r/GUI/Plater.cpp
|
||||
@@ -5390,7 +5390,7 @@ void Plater::load_project(const wxString& filename)
|
||||
|
||||
p->reset();
|
||||
|
||||
- if (! load_files({ into_path(filename) }).empty()) {
|
||||
+ if (! load_files(std::vector<boost::filesystem::path>({ into_path(filename) })).empty()) {
|
||||
// At least one file was loaded.
|
||||
p->set_project_filename(filename);
|
||||
// Save the names of active presets and project specific config into ProjectDirtyStateManager.
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
|
||||
size 58479800
|
||||
3
PrusaSlicer-version_2.7.1.tar.gz
Normal file
3
PrusaSlicer-version_2.7.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5daa8e8bcd3556d6effa7369618923079a5eb710ad6cbfd62b9b874586c9a4a3
|
||||
size 64975776
|
||||
@ -1,3 +1,55 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 29 09:47:16 UTC 2023 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
- Add PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch
|
||||
* Fixes a compilation error with wxWidgets 3.2.4
|
||||
* gh#prusa3d/PrusaSlicer#11769
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 25 13:59:05 UTC 2023 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
- Update to 2.7.1
|
||||
## Improvements fixed with respect to 2.7.0
|
||||
* The option Export as binary G-code was removed from Print
|
||||
Settings. Instead, there is a new option in Printer Settings
|
||||
named Supports binary G-code so it can be set at printer level.
|
||||
There is also a new global switch in Preferences->Other, which
|
||||
controls whether binary G-code will be generated for printers
|
||||
which support it. It is therefore easy to turn the feature on
|
||||
or off without doing any changes in profiles (#11734, #11873).
|
||||
* Wipe tower weight was added into G-code metadata so it can be
|
||||
easily displayed in the print statistics on the printer's
|
||||
display.
|
||||
## Bugs fixed with respect to 2.7.0
|
||||
* When ramping travels were enabled, sometimes a perimeter was
|
||||
missing at the layer where the spiral starts.
|
||||
* Fixed a crash when selecting embossed text while an SVG tool is
|
||||
opened (#11759).
|
||||
* Helical layer changes could result in out of bed moves
|
||||
(#11754).
|
||||
* Helical layer change was enabled even when there was no
|
||||
retraction on layer change (#11709, #11761).
|
||||
- Release 2.7.0
|
||||
* This is the stable release of PrusaSlicer 2.7.0, introducing
|
||||
SVG emboss, binary G-codes, ramping travels, support for G2/G3
|
||||
G-codes, support for Cancel object function and much more. It
|
||||
also fixes many bugs.
|
||||
* Important note for Original Prusa MINI, MK4 and XL owners: The
|
||||
new configuration update of our system profiles will enable
|
||||
binary G-code and G2/G3 features. Users using older firmware
|
||||
need to update to 5.1.0-alpha2 or later or manually turn these
|
||||
features off. On older firmware, new binary G-code is not
|
||||
visible or recognized and the G2/G3 G-codes may not work
|
||||
perfectly.
|
||||
* Travel moves improvements
|
||||
* SVG embossing tool (#6916, #9373)
|
||||
* G2 and G3 G-code support #4352
|
||||
* Binary G-code
|
||||
* Improved user interface
|
||||
* Custom G-code editor
|
||||
* Cancel object (Marlin, RRF and Klipper)
|
||||
- D PrusaSlicer-2.6.0-wxWidgets-CheckResizerFlags-assert-fix.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 15 19:03:08 UTC 2023 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
|
||||
@ -17,19 +17,19 @@
|
||||
|
||||
|
||||
Name: PrusaSlicer
|
||||
Version: 2.6.1
|
||||
Version: 2.7.1
|
||||
Release: 0
|
||||
Summary: G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
|
||||
License: AGPL-3.0-only
|
||||
Group: Hardware/Printing
|
||||
URL: https://www.prusa3d.com/prusaslicer/
|
||||
Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%{version}.tar.gz#/%{name}-version_%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch gh#prusa3d/PrusaSlicer#11769
|
||||
Patch1: PrusaSlicer-2.7.1-slic3r-wxWidgets-3.2.4.patch
|
||||
# PATCH-FIX-OPENSUSE up-occt-version.patch mike.chikov@gmail.com -- install wrapper so into libdir, not bindir
|
||||
Patch0: up-occt-version.patch
|
||||
Patch10: up-occt-version.patch
|
||||
# PATCH-FIX-OPENSUSE PrusaSlicer-2.6.0-octoprint-name-fix.patch -- cast lambda expression to same type
|
||||
Patch1: PrusaSlicer-2.6.0-octoprint-name-fix.patch
|
||||
# PATCH-FIX-UPSTREAM PrusaSlicer-2.6.0-wxWidgets-CheckResizerFlags-assert-fix.patch -- https://github.com/prusa3d/PrusaSlicer/pull/10811
|
||||
Patch2: PrusaSlicer-2.6.0-wxWidgets-CheckResizerFlags-assert-fix.patch
|
||||
Patch11: PrusaSlicer-2.6.0-octoprint-name-fix.patch
|
||||
BuildRequires: blosc-devel
|
||||
BuildRequires: cereal-devel
|
||||
BuildRequires: cgal-devel >= 5.6
|
||||
@ -68,6 +68,8 @@ BuildRequires: update-desktop-files
|
||||
BuildRequires: wxWidgets-devel >= 3.2
|
||||
# need the fltk fork, see deps/NanoSVG/NanoSVG.cmake
|
||||
BuildRequires: nanosvg-devel >= 2022.12.22
|
||||
BuildRequires: (cmake(Catch2) >= 2.9 with cmake(Catch2) < 3)
|
||||
BuildRequires: cmake(LibBGCode)
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
BuildRequires: pkgconfig(gl)
|
||||
BuildRequires: pkgconfig(glew)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user