Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package codelite for openSUSE:Factory checked in at 2022-08-30 14:48:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/codelite (Old) and /work/SRC/openSUSE:Factory/.codelite.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "codelite" Tue Aug 30 14:48:47 2022 rev:20 rq:999866 version:16.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/codelite/codelite.changes 2022-05-03 21:19:36.753046822 +0200 +++ /work/SRC/openSUSE:Factory/.codelite.new.2083/codelite.changes 2022-08-30 14:48:58.680043567 +0200 @@ -1,0 +2,6 @@ +Thu Aug 25 07:28:51 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Add upstream change to fix build with wxwidgets >= 3.1.7: + * codelite_wxwidgets_3_1_7.patch + +------------------------------------------------------------------- New: ---- codelite_wxwidgets_3_1_7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ codelite.spec ++++++ --- /var/tmp/diff_new_pack.isuAyP/_old 2022-08-30 14:48:59.812046456 +0200 +++ /var/tmp/diff_new_pack.isuAyP/_new 2022-08-30 14:48:59.816046465 +0200 @@ -44,6 +44,8 @@ Patch1: fix_node_env-script-interpreter.patch # PATCH-FIX-UPSTREAM wxStl.patch con...@quisquis.de -- Fix problem with wx version 3.1.0 and 3.1.1 Patch2: wxVersion.patch +# PATCH-FIX-UPSTREAM codelite_wxwidgets_3_1_7.patch -- Fix build issues with wx >= 3.1.7 +Patch3: codelite_wxwidgets_3_1_7.patch BuildRequires: cmake BuildRequires: ctags BuildRequires: fdupes ++++++ codelite_wxwidgets_3_1_7.patch ++++++ fixed build against wx3.1.7 Origin: https://github.com/eranif/codelite/commit/427af358d (Trimmed to only fix the build failure) --- a/wxcrafter/myxh_propgrid.cpp 2022-04-18 07:09:00.000000000 +0200 +++ b/wxcrafter/myxh_propgrid.cpp 2022-08-25 09:22:55.219559527 +0200 @@ -1,4 +1,5 @@ #include "myxh_propgrid.h" + #include <wx/datetime.h> #include <wx/log.h> #include <wx/propgrid/advprops.h> @@ -48,10 +49,14 @@ // add the splitter property after the children were added int splitterLeft = GetBool("splitterleft"); - if(splitterLeft) { m_pgmgr->GetPage(0)->SetSplitterLeft(); } + if(splitterLeft) { + m_pgmgr->SetSplitterLeft(); + } int splitterPos = GetLong("splitterpos", wxNOT_FOUND); - if(splitterPos != wxNOT_FOUND) { m_pgmgr->GetPage(0)->SetSplitterPosition(splitterPos); } + if(splitterPos != wxNOT_FOUND) { + m_pgmgr->GetPage(0)->SetSplitterPosition(splitterPos); + } m_isInside = false; return m_pgmgr; @@ -67,7 +72,9 @@ void MyWxPropGridXmlHandler::HandlePgProperty(wxPGProperty* parent) { - if(!HasParam(wxT("proptype"))) { return; } + if(!HasParam(wxT("proptype"))) { + return; + } // Property wxString proptype = GetText("proptype"); @@ -116,7 +123,9 @@ } else if(proptype == "wxEnumProperty") { int sel = items.Index(value); - if(sel == wxNOT_FOUND) { sel = 0; } + if(sel == wxNOT_FOUND) { + sel = 0; + } prop = DoAppendProperty(parent, new wxEnumProperty(label, wxPG_LABEL, items, wxArrayInt(), sel)); @@ -143,8 +152,12 @@ // Handle nested children if(prop) { - if(bgcol.IsOk()) { prop->SetBackgroundColour(bgcol, bgcolRecurse); } - if(!propEditor.IsEmpty()) { prop->SetEditor(propEditor); } + if(bgcol.IsOk()) { + prop->SetBackgroundColour(bgcol, bgcolRecurse); + } + if(!propEditor.IsEmpty()) { + prop->SetEditor(propEditor); + } prop->SetHelpString(tip); // Check to see if this property has children @@ -160,12 +173,15 @@ wxArrayString MyWxPropGridXmlHandler::GetArray(const wxXmlNode* node) const { - if(!node) return wxArrayString(); + if(!node) + return wxArrayString(); wxArrayString items; wxXmlNode* child = node->GetChildren(); while(child) { - if(child->GetName() == "item") { items.Add(child->GetNodeContent()); } + if(child->GetName() == "item") { + items.Add(child->GetNodeContent()); + } child = child->GetNext(); } return items;
