prusaslicer: update to 2.6.0rc2.

[Paul Ripke <stix%stix.id.au@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Thu Jun 15 19:21:07 2023 +1000
Changeset:	543027c429b0bb413c8b98162e2925c33e86ebc6

Modified Files:
	prusaslicer/Makefile
	prusaslicer/distinfo
	prusaslicer/patches/patch-src_slic3r_GUI_PresetComboBoxes.cpp

Log Message:
prusaslicer: update to 2.6.0rc2.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=543027c429b0bb413c8b98162e2925c33e86ebc6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 prusaslicer/Makefile                                  |  2 +-
 prusaslicer/distinfo                                  |  8 ++++----
 .../patches/patch-src_slic3r_GUI_PresetComboBoxes.cpp | 19 +++++--------------
 3 files changed, 10 insertions(+), 19 deletions(-)

diffs:
diff --git a/prusaslicer/Makefile b/prusaslicer/Makefile
index dfd11deb36..457c7bed81 100644
--- a/prusaslicer/Makefile
+++ b/prusaslicer/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKGVERSION=	2.6.0rc1
+PKGVERSION=	2.6.0rc2
 PKGNAME=	prusaslicer-${PKGVERSION}
 DISTNAME=	PrusaSlicer-${PKGVERSION:C/(beta|rc)/-\1/}
 CATEGORIES=	cad
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index 90f3ff0e60..9a39b10a7b 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (PrusaSlicer-2.6.0-rc1.tar.gz) = 3c4d606aa2adff49a7b7e8d308af5cee40141b3f404e768a317cfecd374ea43f
-SHA512 (PrusaSlicer-2.6.0-rc1.tar.gz) = 3a3650fbec0bb44c1ed390810d32746e8853cd9eca67a5c522ec6c50e954d0866538ef062b4f13a638b29930faafcf42704feaf58a7946cd4215475f754c1ef9
-Size (PrusaSlicer-2.6.0-rc1.tar.gz) = 56413475 bytes
+BLAKE2s (PrusaSlicer-2.6.0-rc2.tar.gz) = 8104d24f309020e4a75e45af8dd0ca217aafaf125b9db203d1b3027148b00c85
+SHA512 (PrusaSlicer-2.6.0-rc2.tar.gz) = 789d04a6c4e6eccec46374398bc056013dc593045f20737a1570406894851c77fec664f4d9a99b98f6051fc08db9a0bc2d7d5d35b80d1b4661f1e6e1dcd0e120
+Size (PrusaSlicer-2.6.0-rc2.tar.gz) = 56424950 bytes
 SHA1 (patch-CMakeLists.txt) = 33eb39d85ba7b33226f2cc022250872c3ffa28d8
 SHA1 (patch-cmake_modules_FindOpenVDB.cmake) = 4f2afc423a70fe60617b33ff7f26859b39775faa
 SHA1 (patch-src_CMakeLists_txt) = fe61037cd75fe49f7de593986c864222dac0ca44
@@ -42,7 +42,7 @@ SHA1 (patch-src_slic3r_GUI_OpenGLManager.cpp) = 594d8a99824fead23010cdbf8f97d8ba
 SHA1 (patch-src_slic3r_GUI_OptionsGroup.cpp) = c413f24a9a50069b93bdd611b95fa85ccab45567
 SHA1 (patch-src_slic3r_GUI_Plater.cpp) = a9c45bac6bf524b411882f3eedc859401e8a1a35
 SHA1 (patch-src_slic3r_GUI_Preferences.cpp) = 522ee0f2b024836b2b1d5521f0d368c3dd2c24c5
-SHA1 (patch-src_slic3r_GUI_PresetComboBoxes.cpp) = 89654aa2e0384b35b61a19a22399683e7f4417ae
+SHA1 (patch-src_slic3r_GUI_PresetComboBoxes.cpp) = ae083491bb2b1228c0f666fdc36b1b3ca4008c3c
 SHA1 (patch-src_slic3r_GUI_PresetComboBoxes.hpp) = 0c84c1b706a1f4e00f60c1677c7edf53845d4467
 SHA1 (patch-src_slic3r_GUI_PrintHostDialogs.cpp) = bbdd89d236b4596f009616e553d601d3e032114c
 SHA1 (patch-src_slic3r_GUI_RemovableDriveManager.cpp) = 413499908128be48106d5fd6aea5d413bb959b35
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_PresetComboBoxes.cpp b/prusaslicer/patches/patch-src_slic3r_GUI_PresetComboBoxes.cpp
index f72ce23787..859730aaf1 100644
--- a/prusaslicer/patches/patch-src_slic3r_GUI_PresetComboBoxes.cpp
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_PresetComboBoxes.cpp
@@ -2,23 +2,14 @@ $NetBSD$
 
 Treat NetBSD like Linux.
 
---- src/slic3r/GUI/PresetComboBoxes.cpp.orig	2021-12-17 14:00:02.000000000 +0000
+--- src/slic3r/GUI/PresetComboBoxes.cpp.orig	2023-06-14 14:36:02.000000000 +0000
 +++ src/slic3r/GUI/PresetComboBoxes.cpp
-@@ -584,7 +584,7 @@ PlaterPresetComboBox::PlaterPresetComboB
-     {
-         // In a case of a physical printer, for its editing open PhysicalPrinterDialog
-         if (m_type == Preset::TYPE_PRINTER
--#ifdef __linux__
-+#if defined(__linux__) || defined(__NetBSD__)
-             // To edit extruder color from the sidebar
-             || m_type == Preset::TYPE_FILAMENT
- #endif //__linux__
-@@ -716,7 +716,7 @@ void PlaterPresetComboBox::show_edit_men
-     append_menu_item(menu, wxID_ANY, _L("Edit preset"), "",
+@@ -779,7 +779,7 @@ void PlaterPresetComboBox::show_edit_men
          [this](wxCommandEvent&) { this->switch_to_tab(); }, "cog", menu, []() { return true; }, wxGetApp().plater());
  
+     if (m_type == Preset::TYPE_FILAMENT) {
 -#ifdef __linux__
 +#if defined(__linux__) || defined(__NetBSD__)
-     // To edit extruder color from the sidebar
-     if (m_type == Preset::TYPE_FILAMENT) {
+         // To edit extruder color from the sidebar
          append_menu_item(menu, wxID_ANY, _L("Change extruder color"), "",
+             [this](wxCommandEvent&) { this->change_extruder_color(); }, "funnel", menu, []() { return true; }, wxGetApp().plater());