diff --git a/packages/c/codelite/files/fix-wxwidgets-build.patch b/packages/c/codelite/files/fix-wxwidgets-build.patch new file mode 100644 index 000000000000..de47fc8fd865 --- /dev/null +++ b/packages/c/codelite/files/fix-wxwidgets-build.patch @@ -0,0 +1,51 @@ +From c5c975afa30c958b87399255abf13e653138a697 Mon Sep 17 00:00:00 2001 +From: Eran Ifrah +Date: Tue, 21 Mar 2023 01:37:47 +0200 +Subject: [PATCH] fixed build against latest wx-master + +--- + LiteEditor/editorsettingsdockingwidows.cpp | 4 ++-- + codelitephp/php-plugin/php_open_resource_dlg.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/LiteEditor/editorsettingsdockingwidows.cpp b/LiteEditor/editorsettingsdockingwidows.cpp +index d14341863e..973f194a39 100644 +--- a/LiteEditor/editorsettingsdockingwidows.cpp ++++ b/LiteEditor/editorsettingsdockingwidows.cpp +@@ -59,7 +59,7 @@ EditorSettingsDockingWindows::EditorSettingsDockingWindows(wxWindow* parent, Opt + std::unordered_map orientation_map = { { "UP", wxUP }, { "DOWN", wxDOWN } }; + std::unordered_map orientation_map_reverse = { { wxUP, "UP" }, { wxDOWN, "DOWN" } }; + +- AddProperty(_("Workspace tabs orientation"), { "UP", "DOWN" }, ++ AddProperty(_("Workspace tabs orientation"), std::vector{ "UP", "DOWN" }, + orientation_map_reverse[m_options->GetWorkspaceTabsDirection()], + [this, orientation_map](const wxString&, const wxAny& value) mutable { + wxString str_value; +@@ -67,7 +67,7 @@ EditorSettingsDockingWindows::EditorSettingsDockingWindows(wxWindow* parent, Opt + m_options->SetWorkspaceTabsDirection(orientation_map[str_value]); + } + }); +- AddProperty(_("Output tabs orientation"), { "UP", "DOWN" }, ++ AddProperty(_("Output tabs orientation"), std::vector{ "UP", "DOWN" }, + orientation_map_reverse[m_options->GetOutputTabsDirection()], + [this, orientation_map](const wxString&, const wxAny& value) mutable { + wxString str_value; +diff --git a/codelitephp/php-plugin/php_open_resource_dlg.h b/codelitephp/php-plugin/php_open_resource_dlg.h +index fb91ee0c80..2379737455 100644 +--- a/codelitephp/php-plugin/php_open_resource_dlg.h ++++ b/codelitephp/php-plugin/php_open_resource_dlg.h +@@ -26,13 +26,13 @@ + #ifndef __php_open_resource_dlg__ + #define __php_open_resource_dlg__ + +-#include + #include "php_ui.h" + #include + #include "PHPEntityVariable.h" + #include "PHPEntityBase.h" + #include "PHPLookupTable.h" + #include "bitmap_loader.h" ++#include + + struct ResourceItem { + enum { kRI_Invalid = -1, kRI_File, kRI_Class, kRI_Constant, kRI_Function, kRI_Member, kRI_Variable, kRI_Namespace }; diff --git a/packages/c/codelite/package.yml b/packages/c/codelite/package.yml index 2bb13b0a724c..0bf4e67b25a8 100644 --- a/packages/c/codelite/package.yml +++ b/packages/c/codelite/package.yml @@ -1,6 +1,6 @@ name : codelite version : 17.0.0 -release : 25 +release : 26 source : - https://github.com/eranif/codelite/releases/download/17.0.0/codelite-17.0.0.tar.gz : c0dfe6df38426d761ef5622b7a9ab91481244a09ad751f5daafa37bb9b611d57 homepage : https://codelite.org/ @@ -21,6 +21,8 @@ setup : | #Fix build with GCC 14. sed -i 's/void enableTrivial() const { this->trivial = true; }/void enableTrivial() { this->trivial = true; }/' $workdir/Plugin/dtl/Diff.hpp %patch -p1 -i $pkgfiles/3428.patch + #Fix build with wxwidgets + %patch -p1 -i $pkgfiles/fix-wxwidgets-build.patch %cmake -B build \ -DENABLE_LLDB=0 \ -DWITH_MYSQL=0 \ diff --git a/packages/c/codelite/pspec_x86_64.xml b/packages/c/codelite/pspec_x86_64.xml index e5ce1436afff..6acbb4ee5e85 100644 --- a/packages/c/codelite/pspec_x86_64.xml +++ b/packages/c/codelite/pspec_x86_64.xml @@ -342,8 +342,8 @@ - - 2024-08-03 + + 2024-12-17 17.0.0 Packaging update Jakob Gezelius