From 910620c8ff1725c75a42c54ccd576c1ee5722127 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Sat, 14 Nov 2020 19:38:09 -0600 Subject: [PATCH] codelite: update to 14.0.2 --- srcpkgs/codelite/patches/0001-musl.patch | 48 ++++++++++++++++++++ srcpkgs/codelite/patches/92ed90e07.patch | 48 -------------------- srcpkgs/codelite/patches/musl.patch | 56 ------------------------ srcpkgs/codelite/template | 20 +++++---- 4 files changed, 60 insertions(+), 112 deletions(-) create mode 100644 srcpkgs/codelite/patches/0001-musl.patch delete mode 100644 srcpkgs/codelite/patches/92ed90e07.patch delete mode 100644 srcpkgs/codelite/patches/musl.patch diff --git a/srcpkgs/codelite/patches/0001-musl.patch b/srcpkgs/codelite/patches/0001-musl.patch new file mode 100644 index 00000000000..5a2276283fd --- /dev/null +++ b/srcpkgs/codelite/patches/0001-musl.patch @@ -0,0 +1,48 @@ +From 62f450b79993ea12e81007158471aadaf2d7f67d Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Sat, 14 Nov 2020 19:37:11 -0600 +Subject: [PATCH] musl + +--- + codelitegcc/main.cpp | 1 + + sdk/codelite_indexer/libctags/read.c | 5 +++++ + 2 files changed, 6 insertions(+) + +diff --git codelitegcc/main.cpp codelitegcc/main.cpp +index 1b78e08..a4ffdc3 100644 +--- codelitegcc/main.cpp ++++ codelitegcc/main.cpp +@@ -33,6 +33,7 @@ extern int ExecuteProcessWIN(const std::string& commandline); + #include + #include + #include ++#include + + void WriteContent( const std::string& logfile, const std::string& filename, const std::string& flags ) + { +diff --git sdk/codelite_indexer/libctags/read.c sdk/codelite_indexer/libctags/read.c +index 7dffde6..d6cc961 100644 +--- sdk/codelite_indexer/libctags/read.c ++++ sdk/codelite_indexer/libctags/read.c +@@ -605,6 +605,9 @@ extern int readChars (char *buffer, size_t bufferSize, fpos_t location, fpos_t e + #if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__) + if(location < 0) + return 0; ++#elif defined(__linux__) && !defined(__GLIBC__) /* musl */ ++ if(location.__lldata < 0) ++ return 0; + #elif defined(__NetBSD__) + if(location._pos < 0) + return 0; +@@ -625,6 +628,8 @@ extern int readChars (char *buffer, size_t bufferSize, fpos_t location, fpos_t e + + #if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__) + sizeToRead = endPos - location; ++#elif defined(__linux__) && !defined(__GLIBC__) /* musl */ ++ sizeToRead = endPos.__lldata - location.__lldata; + #elif defined(__NetBSD__) + sizeToRead = endPos._pos - location._pos; + #else +-- +2.29.2 + diff --git a/srcpkgs/codelite/patches/92ed90e07.patch b/srcpkgs/codelite/patches/92ed90e07.patch deleted file mode 100644 index 89fba88f14d..00000000000 --- a/srcpkgs/codelite/patches/92ed90e07.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 92ed90e07774dfc8556bee02c66120eed4938a40 Mon Sep 17 00:00:00 2001 -From: dghart -Date: Wed, 19 Jun 2019 11:23:38 +0100 -Subject: [PATCH] Compilation fix for wx3.0 gtk+3 builds - ---- - codelite_terminal/TextView.cpp | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/codelite_terminal/TextView.cpp b/codelite_terminal/TextView.cpp -index 83d2e260c..5966f9972 100644 ---- codelite_terminal/TextView.cpp -+++ codelite_terminal/TextView.cpp -@@ -12,7 +12,11 @@ TextView::TextView(wxWindow* parent, wxWindowID winid) - m_ctrl->SetCaretStyle(wxSTC_CARETSTYLE_BLOCK); - m_ctrl->SetYCaretPolicy(wxSTC_CARET_STRICT | wxSTC_CARET_SLOP, 4); - m_ctrl->SetLexer(wxSTC_LEX_CONTAINER); -+#if wxCHECK_VERSION(3, 1, 1) - m_ctrl->StartStyling(0); -+#else -+ m_ctrl->StartStyling(0, 0x1f); -+#endif - m_ctrl->SetWrapMode(wxSTC_WRAP_CHAR); - #else - m_ctrl = new TextCtrl_t(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, -@@ -61,7 +65,11 @@ void TextView::SetDefaultStyle(const wxTextAttr& attr) - { - #if USE_STC - m_defaultAttr = attr; -+#if wxCHECK_VERSION(3, 1, 1) - m_ctrl->StartStyling(m_ctrl->GetLastPosition()); -+#else -+ m_ctrl->StartStyling(m_ctrl->GetLastPosition(), 0x1f); -+#endif - #else - m_ctrl->SetDefaultStyle(attr); - #endif -@@ -210,6 +218,10 @@ void TextView::Clear() - #if USE_STC - m_ctrl->ClearAll(); - m_ctrl->ClearDocumentStyle(); -+#if wxCHECK_VERSION(3, 1, 1) - m_ctrl->StartStyling(0); -+#else -+ m_ctrl->StartStyling(0, 0x1f); -+#endif - #endif - } diff --git a/srcpkgs/codelite/patches/musl.patch b/srcpkgs/codelite/patches/musl.patch deleted file mode 100644 index 8a345ed9753..00000000000 --- a/srcpkgs/codelite/patches/musl.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- codelitegcc/main.cpp.orig 2019-06-29 08:37:38.818622077 +0200 -+++ codelitegcc/main.cpp 2019-06-29 08:38:04.090937646 +0200 -@@ -33,6 +33,7 @@ extern int ExecuteProcessWIN(const std:: - #include - #include - #include -+#include - - void WriteContent( const std::string& logfile, const std::string& filename, const std::string& flags ) - { ---- sdk/codelite_indexer/libctags/read.c.orig 2019-06-29 08:54:26.592208449 +0200 -+++ sdk/codelite_indexer/libctags/read.c 2019-06-29 08:56:18.688608501 +0200 -@@ -605,6 +605,9 @@ extern int readChars (char *buffer, size - #if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__) - if(location < 0) - return 0; -+#elif defined(__linux__) && !defined(__GLIBC__) /* musl */ -+ if(location.__lldata < 0) -+ return 0; - #else - if(location.__pos < 0) - return 0; -@@ -619,6 +622,8 @@ extern int readChars (char *buffer, size - - #if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__) - sizeToRead = endPos - location; -+#elif defined(__linux__) && !defined(__GLIBC__) /* musl */ -+ sizeToRead = endPos.__lldata - location.__lldata; - #else - sizeToRead = endPos.__pos - location.__pos; - #endif ---- sdk/codelite_indexer/network/named_pipe.cpp.orig 2019-06-29 09:06:20.260132366 +0200 -+++ sdk/codelite_indexer/network/named_pipe.cpp 2019-06-29 09:06:38.468360112 +0200 -@@ -27,9 +27,9 @@ - - #ifndef __WXMSW__ - # include --# include - # include - # include -+# include - #endif - - #ifdef __WXMSW__ ---- sdk/codelite_indexer/network/named_pipe_server.cpp.orig 2019-06-29 09:07:26.077955618 +0200 -+++ sdk/codelite_indexer/network/named_pipe_server.cpp 2019-06-29 09:07:35.484073269 +0200 -@@ -26,8 +26,8 @@ - #include "named_pipe_server.h" - #ifndef __WXMSW__ - # include --# include - # include -+# include - #endif - clNamedPipeServer::clNamedPipeServer(const char* pipePath) - : clNamedPipe(pipePath) diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template index a2a09d79fa1..f1a197752f4 100644 --- a/srcpkgs/codelite/template +++ b/srcpkgs/codelite/template @@ -1,8 +1,8 @@ # Template file for 'codelite' pkgname=codelite -version=13.0 -revision=3 -archs="i686* x86_64* ppc64le*" +version=14.0.2 +revision=1 +#archs="i686* x86_64* ppc64le*" build_style=cmake configure_args="-DWITH_PCH=0 $(vopt_if sftp -DENABLE_SFTP=1) @@ -16,19 +16,23 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.codelite.org" distfiles="https://github.com/eranif/${pkgname}/archive/${version}.tar.gz" -checksum=f2653fa42d6214999718236998cb223e6de00a498c0cfde795e901be693fb9ac -nocross=yes -python_version=2 #unverified +checksum=76694ceed866b90a8226bbf4e3945c5898d43d5da11114148e196e5c046d735a build_options="hunspell lldb mysql sftp" -build_options_default="hunspell lldb sftp" +build_options_default="hunspell sftp" desc_option_hunspell="Enable SpellCheck plugin" desc_option_lldb="Enable support for LLDB" desc_option_mysql="Enable mysql/mariadb support" desc_option_sftp="Enable Workspace Mirroring plugin" +# Arm-based gives lldb-devel not found +case "$XBPS_TARGET_MACHINE" in + arm*|aarch64*) ;; + *) build_options_default+=" lldb" ;; +esac + pre_configure() { - sed -i -e 's,wx-config,&-gtk3,g' \ + vsed -i -e 's,wx-config,&-gtk3,g' \ -e "1i\SET(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" \ CMakeLists.txt }