From f44bb1bf2709c3359a83710a553ccfc71c8b1bdf Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 11 Oct 2021 09:12:16 -0400 Subject: [PATCH] codelite: update to 15.0.6. --- srcpkgs/codelite/patches/92ed90e07.patch | 48 ---------------------- srcpkgs/codelite/patches/musl.patch | 52 ++++++++++++++---------- srcpkgs/codelite/template | 34 +++++----------- 3 files changed, 41 insertions(+), 93 deletions(-) delete mode 100644 srcpkgs/codelite/patches/92ed90e07.patch diff --git a/srcpkgs/codelite/patches/92ed90e07.patch b/srcpkgs/codelite/patches/92ed90e07.patch deleted file mode 100644 index 5a469602e40f..000000000000 --- 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 ---- a/codelite_terminal/TextView.cpp -+++ b/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 index d911036ddb94..6dfbdb42152f 100644 --- a/srcpkgs/codelite/patches/musl.patch +++ b/srcpkgs/codelite/patches/musl.patch @@ -1,36 +1,42 @@ ---- a/codelitegcc/main.cpp 2019-06-29 08:37:38.818622077 +0200 -+++ b/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 ) - { ---- a/sdk/codelite_indexer/libctags/read.c 2019-06-29 08:54:26.592208449 +0200 -+++ b/sdk/codelite_indexer/libctags/read.c 2019-06-29 08:56:18.688608501 +0200 -@@ -605,6 +605,9 @@ extern int readChars (char *buffer, size +diff --git a/codelitegcc/main.cpp b/codelitegcc/main.cpp +index 1b78e0825..a4ffdc3e7 100644 +--- a/codelitegcc/main.cpp ++++ b/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 a/sdk/codelite_indexer/libctags/read.c b/sdk/codelite_indexer/libctags/read.c +index 144032de5..bfabf75d3 100644 +--- a/sdk/codelite_indexer/libctags/read.c ++++ b/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; - #else - if(location.__pos < 0) + #elif defined(__NetBSD__) + if(location._pos < 0) return 0; -@@ -619,6 +622,8 @@ extern int readChars (char *buffer, size +@@ -622,6 +625,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 - sizeToRead = endPos.__pos - location.__pos; - #endif ---- a/sdk/codelite_indexer/network/named_pipe.cpp 2019-06-29 09:06:20.260132366 +0200 -+++ b/sdk/codelite_indexer/network/named_pipe.cpp 2019-06-29 09:06:38.468360112 +0200 +diff --git a/sdk/codelite_indexer/network/named_pipe.cpp b/sdk/codelite_indexer/network/named_pipe.cpp +index 6e729946d..3e587a428 100644 +--- a/sdk/codelite_indexer/network/named_pipe.cpp ++++ b/sdk/codelite_indexer/network/named_pipe.cpp @@ -27,9 +27,9 @@ #ifndef __WXMSW__ @@ -42,8 +48,10 @@ #endif #ifdef __WXMSW__ ---- a/sdk/codelite_indexer/network/named_pipe_server.cpp 2019-06-29 09:07:26.077955618 +0200 -+++ b/sdk/codelite_indexer/network/named_pipe_server.cpp 2019-06-29 09:07:35.484073269 +0200 +diff --git a/sdk/codelite_indexer/network/named_pipe_server.cpp b/sdk/codelite_indexer/network/named_pipe_server.cpp +index 708df483d..68d7e3958 100644 +--- a/sdk/codelite_indexer/network/named_pipe_server.cpp ++++ b/sdk/codelite_indexer/network/named_pipe_server.cpp @@ -26,8 +26,8 @@ #include "named_pipe_server.h" #ifndef __WXMSW__ diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template index cedc1e11c247..a31eadca0220 100644 --- a/srcpkgs/codelite/template +++ b/srcpkgs/codelite/template @@ -1,38 +1,26 @@ # Template file for 'codelite' pkgname=codelite -version=13.0 -revision=5 -archs="i686* x86_64* ppc64le*" +version=15.0.6 +revision=1 build_style=cmake build_helper=cmake-wxWidgets-gtk3 -configure_args="-DWITH_PCH=0 - $(vopt_if sftp -DENABLE_SFTP=1) - $(vopt_if lldb -DENABLE_LLDB=1)" -hostmakedepends="pkg-config clang which" +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)" +hostmakedepends="pkg-config which" makedepends="gtk+3-devel wxWidgets-gtk3-devel sqlite-devel $(vopt_if lldb lldb-devel) $(vopt_if hunspell hunspell-devel) - $(vopt_if mysql libmariadbclient-devel) $(vopt_if sftp libssh-devel)" + $(vopt_if sftp libssh-devel)" short_desc="Open-source, cross platform IDE for the C/C++ programming languages" 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=28430c37d163219b1001b6e539e520e4f3e750ea5b8ee2457d92d0961fee15bb +python_version=3 -build_options="hunspell lldb mysql sftp" -build_options_default="hunspell sftp" +build_options="hunspell lldb sftp" +build_options_default="hunspell lldb 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" - -case "$XBPS_TARGET_MACHINE" in - x86_64*|ppc64le*) build_options_default+=" lldb";; -esac - -pre_configure() { - sed -i -e 's,wx-config,&-gtk3,g' \ - CMakeLists.txt -}