prusaslicer: Silence wxSizer warnings introduced with 2.6.0rc1.

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

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Sun Jun 11 14:26:55 2023 +1000
Changeset:	25d06f2a3ca4740ba6f2bed672a137dd0af4f31e

Modified Files:
	prusaslicer/distinfo
	prusaslicer/patches/patch-src_slic3r_GUI_GUI__App.cpp

Log Message:
prusaslicer: Silence wxSizer warnings introduced with 2.6.0rc1.

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

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

diffstat:
 prusaslicer/distinfo                               |  2 +-
 .../patches/patch-src_slic3r_GUI_GUI__App.cpp      | 38 ++++++++++++++--------
 2 files changed, 26 insertions(+), 14 deletions(-)

diffs:
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index fb57190a1b..90f3ff0e60 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -26,7 +26,7 @@ SHA1 (patch-src_slic3r_GUI_Field.cpp) = a0901064c68aa5e6c2396ccec36018e45f92fbcb
 SHA1 (patch-src_slic3r_GUI_GLCanvas3D.cpp) = c6ba7c5418cbe0cd09310ed0c0f724de027ee2b6
 SHA1 (patch-src_slic3r_GUI_GUI.cpp) = ab8bb26e14f17eed20587693ac1ef568b8cd8cd5
 SHA1 (patch-src_slic3r_GUI_GUI.hpp) = 52442f3881564cfe7c31ff51d63c96129f162aed
-SHA1 (patch-src_slic3r_GUI_GUI__App.cpp) = d01d66603eb0913a0594d054f567d35de0e6ab46
+SHA1 (patch-src_slic3r_GUI_GUI__App.cpp) = bc9a4dc325caec2c3a7774b70e4074c73476b170
 SHA1 (patch-src_slic3r_GUI_GUI__Factories.cpp) = a3db8dc6e41c4df3cba7282fdd0cdadd1bc7d956
 SHA1 (patch-src_slic3r_GUI_GUI__ObjectLayers.cpp) = da99be89d62efffceaccc81ade8e55e1fadb7919
 SHA1 (patch-src_slic3r_GUI_GUI__ObjectManipulation.cpp) = 8c4e9e451642d5d5139d2ef64b3ca666655d05a5
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_GUI__App.cpp b/prusaslicer/patches/patch-src_slic3r_GUI_GUI__App.cpp
index a514b1e040..e5bf10fd61 100644
--- a/prusaslicer/patches/patch-src_slic3r_GUI_GUI__App.cpp
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_GUI__App.cpp
@@ -2,9 +2,11 @@ $NetBSD$
 
 Treat NetBSD like Linux.
 
---- src/slic3r/GUI/GUI_App.cpp.orig	2023-06-02 13:41:15.000000000 +0000
+Silence wxSizer warnings introduced with 2.6.0rc1.
+
+--- src/slic3r/GUI/GUI_App.cpp.orig	2023-06-09 11:34:33.000000000 +0000
 +++ src/slic3r/GUI/GUI_App.cpp
-@@ -394,7 +394,7 @@ private:
+@@ -395,7 +395,7 @@ private:
  };
  
  
@@ -13,7 +15,7 @@ Treat NetBSD like Linux.
  bool static check_old_linux_datadir(const wxString& app_name) {
      // If we are on Linux and the datadir does not exist yet, look into the old
      // location where the datadir was before version 2.3. If we find it there,
-@@ -937,7 +937,7 @@ void GUI_App::init_app_config()
+@@ -972,7 +972,7 @@ void GUI_App::init_app_config()
  	// Mac : "~/Library/Application Support/Slic3r"
  
      if (data_dir().empty()) {
@@ -22,7 +24,17 @@ Treat NetBSD like Linux.
              set_data_dir(wxStandardPaths::Get().GetUserDataDir().ToUTF8().data());
          #else
              // Since version 2.3, config dir on Linux is in ${XDG_CONFIG_HOME}.
-@@ -1122,7 +1122,7 @@ bool GUI_App::on_init_inner()
+@@ -1130,6 +1130,9 @@ bool GUI_App::on_init_inner()
+     // Set initialization of image handlers before any UI actions - See GH issue #7469
+     wxInitAllImageHandlers();
+ 
++    // Silence warnings generated with wxWidgets 3.2
++    wxSizerFlags::DisableConsistencyChecks();
++
+ #if defined(_WIN32) && ! defined(_WIN64)
+     // Win32 32bit build.
+     if (wxPlatformInfo::Get().GetArchName().substr(0, 2) == "64") {
+@@ -1157,7 +1160,7 @@ bool GUI_App::on_init_inner()
      wxCHECK_MSG(wxDirExists(resources_dir), false,
          wxString::Format("Resources path does not exist or is not a directory: %s", resources_dir));
  
@@ -31,7 +43,7 @@ Treat NetBSD like Linux.
      if (! check_old_linux_datadir(GetAppName())) {
          std::cerr << "Quitting, user chose to move their data to new location." << std::endl;
          return false;
-@@ -1227,7 +1227,7 @@ bool GUI_App::on_init_inner()
+@@ -1262,7 +1265,7 @@ bool GUI_App::on_init_inner()
          if (!default_splashscreen_pos)
              // revert "restore_win_position" value if application wasn't crashed
              get_app_config()->set("restore_win_position", "1");
@@ -40,7 +52,7 @@ Treat NetBSD like Linux.
          wxYield();
  #endif
          scrn->SetText(_L("Loading configuration")+ dots);
-@@ -1375,7 +1375,7 @@ bool GUI_App::on_init_inner()
+@@ -1410,7 +1413,7 @@ bool GUI_App::on_init_inner()
          // and wxEVT_SET_FOCUS before GUI_App::post_init is called) wasn't called before GUI_App::post_init and OpenGL wasn't initialized.
          // Since issue #9774 Where same problem occured on MacOS Ventura, we decided to have this check on MacOS as well.
  
@@ -49,7 +61,7 @@ Treat NetBSD like Linux.
          if (!m_post_initialized && m_opengl_initialized) {
  #else
          if (!m_post_initialized) {
-@@ -2018,7 +2018,7 @@ bool GUI_App::switch_language()
+@@ -2053,7 +2056,7 @@ bool GUI_App::switch_language()
      }
  }
  
@@ -58,7 +70,7 @@ Treat NetBSD like Linux.
  static const wxLanguageInfo* linux_get_existing_locale_language(const wxLanguageInfo* language,
                                                                  const wxLanguageInfo* system_language)
  {
-@@ -2217,7 +2217,7 @@ bool GUI_App::load_language(wxString lan
+@@ -2252,7 +2255,7 @@ bool GUI_App::load_language(wxString lan
  				m_language_info_best = wxLocale::FindLanguageInfo(best_language);
  	        	BOOST_LOG_TRIVIAL(trace) << boost::format("Best translation language detected (may be different from user locales): %1%") % m_language_info_best->CanonicalName.ToUTF8().data();
  			}
@@ -67,7 +79,7 @@ Treat NetBSD like Linux.
              wxString lc_all;
              if (wxGetEnv("LC_ALL", &lc_all) && ! lc_all.IsEmpty()) {
                  // Best language returned by wxWidgets on Linux apparently does not respect LC_ALL.
-@@ -2270,7 +2270,7 @@ bool GUI_App::load_language(wxString lan
+@@ -2305,7 +2308,7 @@ bool GUI_App::load_language(wxString lan
      } else if (m_language_info_system != nullptr && language_info->CanonicalName.BeforeFirst('_') == m_language_info_system->CanonicalName.BeforeFirst('_'))
          language_info = m_language_info_system;
  
@@ -76,7 +88,7 @@ Treat NetBSD like Linux.
      // If we can't find this locale , try to use different one for the language
      // instead of just reporting that it is impossible to switch.
      if (! wxLocale::IsAvailable(language_info->Language)) {
-@@ -2397,7 +2397,7 @@ void GUI_App::add_config_menu(wxMenuBar 
+@@ -2425,7 +2428,7 @@ void GUI_App::add_config_menu(wxMenuBar 
          local_menu->Append(config_id_base + ConfigMenuTakeSnapshot, _L("Take Configuration &Snapshot"), _L("Capture a configuration snapshot"));
          local_menu->Append(config_id_base + ConfigMenuUpdateConf, _L("Check for Configuration Updates"), _L("Check for configuration updates"));
          local_menu->Append(config_id_base + ConfigMenuUpdateApp, _L("Check for Application Updates"), _L("Check for new version of application"));
@@ -85,7 +97,7 @@ Treat NetBSD like Linux.
          //if (DesktopIntegrationDialog::integration_possible())
          local_menu->Append(config_id_base + ConfigMenuDesktopIntegration, _L("Desktop Integration"), _L("Desktop Integration"));    
  #endif //(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)        
-@@ -2444,7 +2444,7 @@ void GUI_App::add_config_menu(wxMenuBar 
+@@ -2472,7 +2475,7 @@ void GUI_App::add_config_menu(wxMenuBar 
          case ConfigMenuUpdateApp:
              app_version_check(true);
              break;
@@ -94,7 +106,7 @@ Treat NetBSD like Linux.
          case ConfigMenuDesktopIntegration:
              show_desktop_integration_dialog();
              break;
-@@ -3061,7 +3061,7 @@ bool GUI_App::run_wizard(ConfigWizard::R
+@@ -3089,7 +3092,7 @@ bool GUI_App::run_wizard(ConfigWizard::R
  
  void GUI_App::show_desktop_integration_dialog()
  {
@@ -103,7 +115,7 @@ Treat NetBSD like Linux.
      //wxCHECK_MSG(mainframe != nullptr, false, "Internal error: Main frame not created / null");
      DesktopIntegrationDialog dialog(mainframe);
      dialog.ShowModal();
-@@ -3081,7 +3081,7 @@ void GUI_App::show_downloader_registrati
+@@ -3109,7 +3112,7 @@ void GUI_App::show_downloader_registrati
      if (msg.ShowModal() == wxID_YES) {
          auto downloader_worker = new DownloaderUtils::Worker(nullptr);
          downloader_worker->perform_register(app_config->get("url_downloader_dest"));