pkg/57057: Patch for codelite 16.0

[vezhlys%gmail.com@localhost]

>Number:         57057
>Category:       pkg
>Synopsis:       Patch for codelite 16.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Oct 15 18:55:01 +0000 2022
>Originator:     Andrius V
>Release:        
>Organization:
>Environment:
>Description:
I updated codelite package to 16.0 version. Release was back in April, however the upgrade process wasn't straightforward this time, thus only now I had time to resolve issues. I am still uncertain why few files failed without #include rearrangment (see concerns in changes description). The code is pushed to wip: https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=tree;f=codelite;h=5be5fb03a1030945566fcaa4d45ac48c8ce64304;hb=HEAD

Performed changes:
* Updated package files and hashes
* Updated bash/python path replacements in source code
* wxGTK points to wxGTK31 instead of wxGTK30
* patches/patch-CodeLite_fileextmanager.cpp patch was deleted.
* patches/patch-wxcrafter_myxh__propgrid.cpp patch was created to downport upstream fix which fails the build with current wxWidgets versions (some internal undocumented function was used).
* patches/patch-ctagsd_CMakeLists.txt patch was created to resolve -ldl reference
* patches/patch-CodeLite_tags_storage_sqlite3.h, patches/patch-LanguageServer_LanguageServerLogView.h, patches/patch-Plugin_DiffSideBySidePanel.h were created to re-arrange wxWidgets imports before headers which use them, otherwise build fails without recognising some wxWidgets types. The need for these three patches I can't fully understand though. Maybe it is related to gcc version or some compiler options? If somebody can look into this, it would be appreciated.

I guess I have rights to commit code directly to pkgsrc now, but I have never done that yet, and still I would like a review and testing from others before doing so. Thank you.

Full patch below:

diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index f072a92f4377..859c68a121b7 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2022/08/11 05:08:15 gutteridge Exp $
+ $NetBSD: Makefile,v 1.43 2022/04/18 19:10:56 adam Exp $
 
-DISTNAME=	codelite-15.0
-PKGREVISION=	7
+DISTNAME=	codelite-16.0
+GITHUB_TAG=	16.0.0-1
+PKGREVISION=
 CATEGORIES=	editors x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=eranif/}
 
@@ -37,17 +38,18 @@ SUBST_SED.ena-netbsd+=		-e 's,IS_NETBSD 0,IS_NETBSD 1,g'
 SUBST_CLASSES+=			fix-bash
 SUBST_STAGE.fix-bash=		pre-configure
 SUBST_MESSAGE.fix-bash=		Fix bash path
-SUBST_FILES.fix-bash+=		codelite_terminal/wxTerminalCtrl.cpp
+SUBST_FILES.fix-bash+=		CodeLite/TerminalEmulator.cpp
 SUBST_FILES.fix-bash+=		CodeLite/clConsoleBash.cpp
 SUBST_FILES.fix-bash+=		CodeLite/clConsoleGnomeTerminal.cpp
 SUBST_FILES.fix-bash+=		CodeLite/clConsoleRXVTerminal.cpp
-SUBST_FILES.fix-bash+=		CodeLite/TerminalEmulator.cpp
 SUBST_FILES.fix-bash+=		CodeLite/fileutils.cpp
-SUBST_FILES.fix-bash+=		Docker/clDockerDriver.cpp
-SUBST_FILES.fix-bash+=		Plugin/clRemoteBuilder.cpp
 SUBST_FILES.fix-bash+=		Plugin/custombuildrequest.cpp
 SUBST_FILES.fix-bash+=		Plugin/pipedprocess.cpp
 SUBST_FILES.fix-bash+=		Plugin/wxterminal.cpp
+SUBST_FILES.fix-bash+=		Remoty/RemotyWorkspace.cpp
+SUBST_FILES.fix-bash+=		cmake/Modules/UtilsHelper.cmake
+SUBST_FILES.fix-bash+=		codelite_terminal/wxTerminalCtrl.cpp
+SUBST_FILES.fix-bash+=		ctagsd/lib/Settings.cpp
 SUBST_SED.fix-bash+=		-e 's,/bin/bash,${BASH},g'
 
 SUBST_CLASSES+=			fix-man-path
@@ -56,8 +58,10 @@ SUBST_MESSAGE.fix-man-path=	Fix man path
 SUBST_FILES.fix-man-path=	LiteEditor/CMakeLists.txt
 SUBST_SED.fix-man-path+=	-e 's,${CL_PREFIX}/share/man,${CL_PREFIX}/${PKGMANDIR},g'
 
+REPLACE_BASH+=		docs/docs/deploy.sh
 REPLACE_BASH+=		make-weekly
 REPLACE_NODEJS+=	LanguageServer/codelite-lsp/codelite-lsp-helper
+REPLACE_PYTHON+=	Runtime/codelite-remote
 REPLACE_PYTHON+=	codelite_open_helper.py
 
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/codelite
@@ -74,5 +78,5 @@ BUILDLINK_TRANSFORM+=	opt:-std=c++11:-std=gnu++11 # alloca
 .include "../../textproc/hunspell/buildlink3.mk"
 .include "../../textproc//uchardet/buildlink3.mk"
 .include "../../security/libssh/buildlink3.mk"
-.include "../../x11/wxGTK30/buildlink3.mk"
+.include "../../x11/wxGTK31/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/codelite/PLIST b/editors/codelite/PLIST
index e79d9ffd25af..9fcefa10b472 100644
--- a/editors/codelite/PLIST
+++ b/editors/codelite/PLIST
@@ -1,17 +1,20 @@
 @comment $NetBSD: PLIST,v 1.6 2021/03/06 16:08:32 wiz Exp $
 bin/codelite
 bin/codelite-cc
+bin/codelite-ctags
 bin/codelite-echo
 bin/codelite-lsp-helper
 bin/codelite-make
+bin/codelite-remote
 bin/codelite-terminal
 bin/codelite_cppcheck
 bin/codelite_exec
 bin/codelite_fix_files
-bin/codelite_indexer
 bin/codelite_kill_children
 bin/codelite_open_helper.py
 bin/codelite_xterm
+bin/ctagsd
+bin/ctagsd-tests
 lib/codelite/AutoSave.so
 lib/codelite/CMakePlugin.so
 lib/codelite/CodeFormatter.so
@@ -29,6 +32,8 @@ lib/codelite/Outline.so
 lib/codelite/PHPLint.so
 lib/codelite/PHPRefactoring.so
 lib/codelite/QMakePlugin.so
+lib/codelite/Remoty.so
+lib/codelite/Rust.so
 lib/codelite/SFTP.so
 lib/codelite/SmartCompletion.so
 lib/codelite/SnipWiz.so
@@ -57,14 +62,13 @@ lib/codelite/wxFormBuilder.so
 man/man1/codelite-make.1
 man/man1/codelite.1
 man/man1/codelite_fix_files.1
+man/man1/codelite_open_helper.1
 share/applications/codelite.desktop
 share/codelite/LICENSE
 share/codelite/PHP.zip
 share/codelite/astyle.sample
-share/codelite/clang-tools.tgz
 share/codelite/codelite-bitmaps-dark.zip
 share/codelite/codelite-bitmaps-light.zip
-share/codelite/config/accelerators.conf.default
 share/codelite/config/build_settings.xml.default
 share/codelite/config/cfg/avr.cfg
 share/codelite/config/cfg/bsd.cfg
@@ -96,7 +100,10 @@ share/codelite/gdb_printers/libstdcxx/__init__.py
 share/codelite/gdb_printers/libstdcxx/v6/__init__.py
 share/codelite/gdb_printers/libstdcxx/v6/printers.py
 share/codelite/gdb_printers/libstdcxx/v6/xmethods.py
-share/codelite/gdb_printers/qt4.py
+share/codelite/gdb_printers/rustlib/etc/gdb_load_rust_pretty_printers.py
+share/codelite/gdb_printers/rustlib/etc/gdb_lookup.py
+share/codelite/gdb_printers/rustlib/etc/gdb_providers.py
+share/codelite/gdb_printers/rustlib/etc/rust_types.py
 share/codelite/gdb_printers/wx.py
 share/codelite/images/common_tasks.png
 share/codelite/images/help_earth.png
@@ -106,7 +113,6 @@ share/codelite/images/recent_files.png
 share/codelite/images/recent_workspaces.png
 share/codelite/images/splashscreen.png
 share/codelite/images/splashscreen%2x.png@localhost
-share/codelite/jsctags.zip
 share/codelite/lexers/lexers.json
 share/codelite/php.sample
 share/codelite/phprefactor.phar
@@ -255,23 +261,23 @@ share/codelite/templates/projects/executable-wx-xrc/icon.png
 share/codelite/templates/projects/executable-wx-xrc/main.cpp
 share/codelite/templates/projects/executable-wx-xrc/main.h
 share/codelite/templates/projects/executable-wxcrafter-dialog/MainDialog.cpp
-share/codelite/templates/projects/executable-wxcrafter-dialog/MainDialog.h
+share/codelite/templates/projects/executable-wxcrafter-dialog/MainDialog.hpp
 share/codelite/templates/projects/executable-wxcrafter-dialog/icon.png
 share/codelite/templates/projects/executable-wxcrafter-dialog/main.cpp
 share/codelite/templates/projects/executable-wxcrafter-dialog/win_resources.rc
 share/codelite/templates/projects/executable-wxcrafter-dialog/wxCrafter_MainDialog.project
 share/codelite/templates/projects/executable-wxcrafter-dialog/wxcrafter.cpp
-share/codelite/templates/projects/executable-wxcrafter-dialog/wxcrafter.h
+share/codelite/templates/projects/executable-wxcrafter-dialog/wxcrafter.hpp
 share/codelite/templates/projects/executable-wxcrafter-dialog/wxcrafter.wxcp
 share/codelite/templates/projects/executable-wxcrafter-dialog/wxcrafter_bitmaps.cpp
 share/codelite/templates/projects/executable-wxcrafter-frame/MainFrame.cpp
-share/codelite/templates/projects/executable-wxcrafter-frame/MainFrame.h
+share/codelite/templates/projects/executable-wxcrafter-frame/MainFrame.hpp
 share/codelite/templates/projects/executable-wxcrafter-frame/icon.png
 share/codelite/templates/projects/executable-wxcrafter-frame/main.cpp
 share/codelite/templates/projects/executable-wxcrafter-frame/win_resources.rc
 share/codelite/templates/projects/executable-wxcrafter-frame/wxCrafter_MainFrame.project
 share/codelite/templates/projects/executable-wxcrafter-frame/wxcrafter.cpp
-share/codelite/templates/projects/executable-wxcrafter-frame/wxcrafter.h
+share/codelite/templates/projects/executable-wxcrafter-frame/wxcrafter.hpp
 share/codelite/templates/projects/executable-wxcrafter-frame/wxcrafter.wxcp
 share/codelite/templates/projects/executable-wxcrafter-frame/wxcrafter_bitmaps.cpp
 share/codelite/templates/projects/executable/executable.project
@@ -306,5 +312,6 @@ share/icons/hicolor/32x32@2x/apps/codelite.png
 share/icons/hicolor/64x64/apps/codelite.png
 share/icons/hicolor/64x64@2x/apps/codelite.png
 share/locale/cs/LC_MESSAGES/codelite.mo
+share/locale/ja_JP/LC_MESSAGES/codelite.mo
 share/locale/ru_RU/LC_MESSAGES/codelite.mo
 share/locale/zh_CN/LC_MESSAGES/codelite.mo
diff --git a/editors/codelite/distinfo b/editors/codelite/distinfo
index b2ec57d414b6..4f4e98f15f05 100644
--- a/editors/codelite/distinfo
+++ b/editors/codelite/distinfo
@@ -1,9 +1,13 @@
 $NetBSD: distinfo,v 1.11 2021/10/26 10:21:25 nia Exp $
 
-BLAKE2s (codelite-15.0.tar.gz) = f733026f59670dad4949d55186594c5f7d300b79e90e10fc5b8782467872b5ba
-SHA512 (codelite-15.0.tar.gz) = fd5777cdb57d184407cff4503d255b4bcdf14041420ff9daf7043f710c159d6bdb47d467e92948f96ce4eb15eef40b782feec7195f5f66845f3c82d911b3f0b8
-Size (codelite-15.0.tar.gz) = 104970727 bytes
-SHA1 (patch-CodeLite_fileextmanager.cpp) = 1eaf696d3bde907a635d767b3d022e1d92692087
+BLAKE2s (codelite-16.0.tar.gz) = 9f1d0335b0d7571e2aa2add64996a70141571ab8ae67fd360f3db9bfa9f6a3cf
+SHA512 (codelite-16.0.tar.gz) = 4965207a11869bb5f5ec33538bdc2a7312f8d444c615cf7e5a653a26abe2e823bd35a07d1bce73812935025e9a2dc3d6b970e02c7eb2da75f3a22c14d7670af7
+Size (codelite-16.0.tar.gz) = 89755705 bytes
+SHA1 (patch-CodeLite_tags_storage_sqlite3.h) = 7c00f06f7472e056ec8745ac8f72c3c8a1d6baf3
+SHA1 (patch-LanguageServer_LanguageServerLogView.h) = 6b6d64b444c7aff59558ed37a76c77edf41ef505
+SHA1 (patch-Plugin_DiffSideBySidePanel.h) = c9f5842c073ce802dc511a6007f63e0c44bfebfa
+SHA1 (patch-ctagsd_CMakeLists.txt) = f80c55528cdd789929d79a90f6ecb23845e99108
 SHA1 (patch-sdk_asio-1.12.1_asio_detail_impl_kqueue__reactor.ipp) = bdbcf78c6198da9ceb123373fd6b99419ae94896
 SHA1 (patch-svgs_svgs-dark_create-logo.sh) = d794ca7bb16a248a7aead3ca30e6c9f16073e1a3
 SHA1 (patch-svgs_svgs-light_create-logo.sh) = 4b0d06911baf89636311cc10e7042f3a2b4f22b3
+SHA1 (patch-wxcrafter_myxh__propgrid.cpp) = 2cdf5abea02aabb187098fb08d5f9ceb1d4148f1
diff --git a/editors/codelite/patches/patch-CodeLite_fileextmanager.cpp b/editors/codelite/patches/patch-CodeLite_fileextmanager.cpp
deleted file mode 100644
index eb14e5069d50..000000000000
--- a/editors/codelite/patches/patch-CodeLite_fileextmanager.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-CodeLite_fileextmanager.cpp,v 1.1 2020/03/23 11:57:13 nia Exp $
-
-Add NetBSD specific matchers
-
---- CodeLite/fileextmanager.cpp.orig	2020-03-07 01:58:26.515745479 +0200
-+++ CodeLite/fileextmanager.cpp
-@@ -171,13 +171,15 @@
- 
-         // Initialize regexes:
-         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/bash", TypeScript));
--        m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/bash", TypeScript));
-+        m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/pkg/bin/bash", TypeScript));
-         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/sh", TypeScript));
-         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/bash", TypeScript));
-         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/python", TypePython));
-         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/python", TypePython));
-+        m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/pkg/bin/python[2-3][.][0-9]+", TypePython));
-         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/node", TypeJS));
-         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/node", TypeJS));
-+        m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/pkg/bin/node", TypeJS));
-         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/nodejs", TypeJS));
-         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/nodejs", TypeJS));
-         m_matchers.push_back(Matcher("<?xml", TypeXml, false));
diff --git a/editors/codelite/patches/patch-CodeLite_tags_storage_sqlite3.h b/editors/codelite/patches/patch-CodeLite_tags_storage_sqlite3.h
new file mode 100644
index 000000000000..11732a8994d2
--- /dev/null
+++ b/editors/codelite/patches/patch-CodeLite_tags_storage_sqlite3.h
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- CodeLite/tags_storage_sqlite3.h	2022-05-03 22:38:34.770034020 +0300
++++ CodeLite/tags_storage_sqlite3.h
+@@ -25,6 +25,8 @@
+ #ifndef CODELITE_TAGS_DATABASE_H
+ #define CODELITE_TAGS_DATABASE_H
+ 
++#include <wx/filename.h>
++
+ #include "codelite_exports.h"
+ #include "entry.h"
+ #include "fileentry.h"
+@@ -33,7 +35,6 @@
+ #include "wxStringHash.h"
+ 
+ #include <unordered_map>
+-#include <wx/filename.h>
+ #include <wx/wxsqlite3.h>
+ 
+ /**
diff --git a/editors/codelite/patches/patch-LanguageServer_LanguageServerLogView.h b/editors/codelite/patches/patch-LanguageServer_LanguageServerLogView.h
new file mode 100644
index 000000000000..b4108035d09b
--- /dev/null
+++ b/editors/codelite/patches/patch-LanguageServer_LanguageServerLogView.h
@@ -0,0 +1,11 @@
+$NetBSD$
+
+--- LanguageServer/LanguageServerLogView.h	2022-05-02 22:26:31.620093956 +0300
++++ LanguageServer/LanguageServerLogView.h
+@@ -1,5 +1,6 @@
+ #ifndef LANGUAGESERVERLOGVIEW_H
+ #define LANGUAGESERVERLOGVIEW_H
++#include <wx/menu.h>
+ #include "UI.h"
+ 
+ class LanguageServerLogView : public LanguageServerLogViewBase
diff --git a/editors/codelite/patches/patch-Plugin_DiffSideBySidePanel.h b/editors/codelite/patches/patch-Plugin_DiffSideBySidePanel.h
new file mode 100644
index 000000000000..1634ce34e829
--- /dev/null
+++ b/editors/codelite/patches/patch-Plugin_DiffSideBySidePanel.h
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- Plugin/DiffSideBySidePanel.h.orig	2022-04-18 08:09:00.000000000 +0300
++++ Plugin/DiffSideBySidePanel.h
+@@ -26,13 +26,15 @@
+ #ifndef DIFFSIDEBYSIDEPANEL_H
+ #define DIFFSIDEBYSIDEPANEL_H
+ 
++#include <wx/filename.h>
++
++#include "wxcrafter_plugin.h"
+ #include "DiffConfig.h"
+ #include "clDTL.h"
+ #include "clPluginsFindBar.h"
+ #include "wxcrafter_plugin.h"
+ 
+ #include <vector>
+-#include <wx/filename.h>
+ 
+ class clToolBar;
+ class WXDLLIMPEXP_SDK DiffSideBySidePanel : public DiffSideBySidePanelBase
diff --git a/editors/codelite/patches/patch-ctagsd_CMakeLists.txt b/editors/codelite/patches/patch-ctagsd_CMakeLists.txt
new file mode 100644
index 000000000000..7ce52ee97c9f
--- /dev/null
+++ b/editors/codelite/patches/patch-ctagsd_CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- ctagsd/CMakeLists.txt.orig
++++ ctagsd/CMakeLists.txt	2022-10-15 19:55:44.830876033 +0300
+@@ -42,7 +42,11 @@ include_directories("${CL_SRC_ROOT}/Plug
+ 
+ set(UTIL_LIB "")
+ if(UNIX)
+-    set(UTIL_LIB "-lutil -ldl")
++    if(CMAKE_DL_LIBS)
++        set(UTIL_LIB "-lutil ${CMAKE_DL_LIBS}")
++    else()
++        set(UTIL_LIB "-lutil")
++    endif() 
+ endif(UNIX)
+ 
+ FILE(GLOB LIBSRC "lib/*.cpp")
diff --git a/editors/codelite/patches/patch-wxcrafter_myxh__propgrid.cpp b/editors/codelite/patches/patch-wxcrafter_myxh__propgrid.cpp
new file mode 100644
index 000000000000..386bfc882a0f
--- /dev/null
+++ b/editors/codelite/patches/patch-wxcrafter_myxh__propgrid.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix from upstream: SetSplitterLeft was internal function in wxWidgets and became protected.
+
+--- wxcrafter/myxh_propgrid.cpp.orig	2022-04-18 08:09:00.000000000 +0300
++++ wxcrafter/myxh_propgrid.cpp
+@@ -48,7 +48,7 @@ wxObject* MyWxPropGridXmlHandler::DoCrea
+ 
+         // 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); }

>How-To-Repeat:

>Fix: