mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-15 21:57:02 +02:00
codelite: update to 17.0.0.
This commit is contained in:
Daniel Martinez
Andrew J. Hesford
parent
06d8cce02e
commit
098aa941cb
5 changed files with 61 additions and 165 deletions
22
srcpkgs/codelite/patches/ctags-cross.patch
Normal file
22
srcpkgs/codelite/patches/ctags-cross.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
CMake doesn't find_path ctags properly when crossbuilding.
|
||||
The CTAGS_SUBMODULE variable is never used though,
|
||||
and ctags are still built and installed properly
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index c88083fd1..ee251c58f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -179,14 +179,6 @@ else(APPLE)
|
||||
set(WX_COMPONENTS "std aui propgrid stc ribbon richtext")
|
||||
endif()
|
||||
|
||||
-if(UNIX)
|
||||
- find_path(CTAGS_SUBMODULE CMakeLists.txt PATHS ${CMAKE_SOURCE_DIR}/ctags/)
|
||||
- if(NOT CTAGS_SUBMODULE)
|
||||
- message(STATUS "Could not locate `${CMAKE_SOURCE_DIR}/ctags/CMakeLists.txt` file")
|
||||
- message(FATAL_ERROR "Please make sure you have run `git submodule update --init`")
|
||||
- endif()
|
||||
-endif()
|
||||
-
|
||||
if(WITH_WXPATH)
|
||||
set(ENV{PATH} ${WITH_WXPATH}:$ENV{PATH})
|
||||
endif()
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -744,3 +744,8 @@
|
||||
## Scan for user plugins
|
||||
CL_SCAN_FOR_PLUGINS()
|
||||
endif() # NOT WXC_APP
|
||||
+
|
||||
+if (UNIX)
|
||||
+ set_target_properties(ctags PROPERTIES OUTPUT_NAME "codelite-ctags")
|
||||
+ install(TARGETS ctags DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
|
||||
+endif()
|
||||
32
srcpkgs/codelite/patches/wx-master.patch
Normal file
32
srcpkgs/codelite/patches/wx-master.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
From c5c975afa30c958b87399255abf13e653138a697 Mon Sep 17 00:00:00 2001
|
||||
From: Eran Ifrah <eran@codelite.org>
|
||||
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<wxString, wxDirection> orientation_map = { { "UP", wxUP }, { "DOWN", wxDOWN } };
|
||||
std::unordered_map<int, wxString> orientation_map_reverse = { { wxUP, "UP" }, { wxDOWN, "DOWN" } };
|
||||
|
||||
- AddProperty(_("Workspace tabs orientation"), { "UP", "DOWN" },
|
||||
+ AddProperty(_("Workspace tabs orientation"), std::vector<wxString>{ "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<wxString>{ "UP", "DOWN" },
|
||||
orientation_map_reverse[m_options->GetOutputTabsDirection()],
|
||||
[this, orientation_map](const wxString&, const wxAny& value) mutable {
|
||||
wxString str_value;
|
||||
|
|
@ -1,131 +0,0 @@
|
|||
From 427af358d41deb00a4628e5b39c63a929cef894a Mon Sep 17 00:00:00 2001
|
||||
From: Eran Ifrah <eran@codelite.org>
|
||||
Date: Fri, 10 Jun 2022 10:15:52 +0300
|
||||
Subject: [PATCH] macos: hunspell: use the library from brew fixed build
|
||||
against wx3.1.7 temporarly: disable building LLDB on macos
|
||||
|
||||
---
|
||||
CMakeLists.txt | 5 +-
|
||||
SpellChecker/CMakeLists.txt | 27 +-
|
||||
sdk/hunspell/include/affentry.hxx | 144 -----------
|
||||
sdk/hunspell/include/affixmgr.hxx | 252 -------------------
|
||||
sdk/hunspell/include/atypes.hxx | 107 --------
|
||||
sdk/hunspell/include/baseaffix.hxx | 32 ---
|
||||
sdk/hunspell/include/csutil.hxx | 223 ----------------
|
||||
sdk/hunspell/include/dictmgr.hxx | 39 ---
|
||||
sdk/hunspell/include/filemgr.hxx | 28 ---
|
||||
sdk/hunspell/include/hashmgr.hxx | 69 -----
|
||||
sdk/hunspell/include/htypes.hxx | 32 ---
|
||||
sdk/hunspell/include/hunspell.hxx | 184 --------------
|
||||
sdk/hunspell/include/hunzip.hxx | 47 ----
|
||||
sdk/hunspell/include/langnum.hxx | 38 ---
|
||||
sdk/hunspell/include/phonet.hxx | 52 ----
|
||||
sdk/hunspell/include/replist.hxx | 30 ---
|
||||
sdk/hunspell/include/suggestmgr.hxx | 115 ---------
|
||||
sdk/hunspell/include/w_char.hxx | 21 --
|
||||
sdk/hunspell/lib/osx/libhunspell-1.3.0.dylib | Bin 363876 -> 0 bytes
|
||||
wxcrafter/myxh_propgrid.cpp | 32 ++-
|
||||
20 files changed, 36 insertions(+), 1441 deletions(-)
|
||||
delete mode 100644 sdk/hunspell/include/affentry.hxx
|
||||
delete mode 100644 sdk/hunspell/include/affixmgr.hxx
|
||||
delete mode 100644 sdk/hunspell/include/atypes.hxx
|
||||
delete mode 100644 sdk/hunspell/include/baseaffix.hxx
|
||||
delete mode 100644 sdk/hunspell/include/csutil.hxx
|
||||
delete mode 100644 sdk/hunspell/include/dictmgr.hxx
|
||||
delete mode 100644 sdk/hunspell/include/filemgr.hxx
|
||||
delete mode 100644 sdk/hunspell/include/hashmgr.hxx
|
||||
delete mode 100644 sdk/hunspell/include/htypes.hxx
|
||||
delete mode 100644 sdk/hunspell/include/hunspell.hxx
|
||||
delete mode 100644 sdk/hunspell/include/hunzip.hxx
|
||||
delete mode 100644 sdk/hunspell/include/langnum.hxx
|
||||
delete mode 100644 sdk/hunspell/include/phonet.hxx
|
||||
delete mode 100644 sdk/hunspell/include/replist.hxx
|
||||
delete mode 100644 sdk/hunspell/include/suggestmgr.hxx
|
||||
delete mode 100644 sdk/hunspell/include/w_char.hxx
|
||||
delete mode 100755 sdk/hunspell/lib/osx/libhunspell-1.3.0.dylib
|
||||
|
||||
diff --git a/wxcrafter/myxh_propgrid.cpp b/wxcrafter/myxh_propgrid.cpp
|
||||
index 974bc62f0..3fcb3845d 100644
|
||||
--- a/wxcrafter/myxh_propgrid.cpp
|
||||
+++ b/wxcrafter/myxh_propgrid.cpp
|
||||
@@ -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 @@ wxObject* MyWxPropGridXmlHandler::DoCreateResource()
|
||||
|
||||
// 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 @@ bool MyWxPropGridXmlHandler::CanHandle(wxXmlNode* node)
|
||||
|
||||
void MyWxPropGridXmlHandler::HandlePgProperty(wxPGProperty* parent)
|
||||
{
|
||||
- if(!HasParam(wxT("proptype"))) { return; }
|
||||
+ if(!HasParam(wxT("proptype"))) {
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
// Property
|
||||
wxString proptype = GetText("proptype");
|
||||
@@ -116,7 +123,9 @@ void MyWxPropGridXmlHandler::HandlePgProperty(wxPGProperty* parent)
|
||||
|
||||
} 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 @@ void MyWxPropGridXmlHandler::HandlePgProperty(wxPGProperty* parent)
|
||||
|
||||
// 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 @@ void MyWxPropGridXmlHandler::HandlePgProperty(wxPGProperty* parent)
|
||||
|
||||
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;
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
|
@ -1,41 +1,25 @@
|
|||
# Template file for 'codelite'
|
||||
pkgname=codelite
|
||||
version=16.0.0
|
||||
revision=4
|
||||
create_wrksrc=yes
|
||||
version=17.0.0
|
||||
revision=1
|
||||
build_style=cmake
|
||||
build_helper=cmake-wxWidgets-gtk3
|
||||
configure_args="-DWITH_PCH=0 -DWITH_WX_CONFIG=wx-config-gtk3
|
||||
$(vopt_if sftp -DENABLE_SFTP=1 -DENABLE_SFTP=0)
|
||||
$(vopt_if lldb -DENABLE_LLDB=1 -DENABLE_LLDB=0)"
|
||||
$(vopt_if sftp -DENABLE_SFTP=1 -DENABLE_SFTP=0)"
|
||||
hostmakedepends="pkg-config which"
|
||||
makedepends="gtk+3-devel wxWidgets-gtk3-devel sqlite-devel MesaLib-devel
|
||||
$(vopt_if lldb lldb-devel) $(vopt_if hunspell hunspell-devel)
|
||||
$(vopt_if sftp libssh-devel)"
|
||||
$(vopt_if hunspell hunspell-devel) $(vopt_if sftp libssh-devel)"
|
||||
short_desc="Open-source, cross platform IDE for the C/C++ programming languages"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="http://www.codelite.org"
|
||||
distfiles="https://github.com/eranif/${pkgname}/archive/${version}.tar.gz
|
||||
https://github.com/eranif/ctags/archive/52c724d1132d78ea44894bfe2eaca44f38a9bd85.tar.gz"
|
||||
checksum="fb707b98b2f56ae0791c7cb341c6a0240ff26a785dae31f7dcd1038956737957
|
||||
7925adbe15cd240c7e65cf54e8752e7f5dbb24622342b84d151de97d2d75acea"
|
||||
distfiles=https://github.com/eranif/codelite/releases/download/${version}/codelite-${version}.tar.gz
|
||||
checksum=c0dfe6df38426d761ef5622b7a9ab91481244a09ad751f5daafa37bb9b611d57
|
||||
python_version=3
|
||||
|
||||
build_options="hunspell lldb sftp"
|
||||
build_options="hunspell sftp"
|
||||
build_options_default="hunspell sftp"
|
||||
desc_option_hunspell="Enable SpellCheck plugin"
|
||||
desc_option_lldb="Enable support for LLDB"
|
||||
desc_option_sftp="Enable Workspace Mirroring plugin"
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
x86_64*|ppc64le*|aarch64*|arm*) build_options_default+=" lldb";;
|
||||
esac
|
||||
|
||||
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
|
||||
|
||||
post_extract() {
|
||||
mv codelite-${version}/* .
|
||||
rm -rf universal-ctags
|
||||
mv ctags-52c724d1132d78ea44894bfe2eaca44f38a9bd85 universal-ctags
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue