codelite: add RCSID to patches and revise them to rearrange imports instead of duplication.

[Andrius Varanavicius <vezhlys%netscape.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Andrius Varanavicius <vezhlys%netscape.net@localhost>
Pushed By:	vezhlys
Date:		Sat Oct 15 19:19:50 2022 +0300
Changeset:	cadffc7a0cb0b750bfed8907e002d9d7a5398d63

Modified Files:
	codelite/Makefile
	codelite/distinfo
	codelite/patches/patch-CodeLite_tags_storage_sqlite3.h
	codelite/patches/patch-Plugin_DiffSideBySidePanel.h
Added Files:
	codelite/patches/patch-LanguageServer_LanguageServerLogView.h
Removed Files:
	codelite/patches/patch-LanguageServer_UI.h

Log Message:
codelite: add RCSID to patches and revise them to rearrange imports instead of duplication.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cadffc7a0cb0b750bfed8907e002d9d7a5398d63

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 codelite/Makefile                                          |  1 -
 codelite/distinfo                                          |  6 +++---
 codelite/patches/patch-CodeLite_tags_storage_sqlite3.h     | 14 ++++++++++++--
 .../patches/patch-LanguageServer_LanguageServerLogView.h   | 11 +++++++++++
 codelite/patches/patch-LanguageServer_UI.h                 | 11 -----------
 codelite/patches/patch-Plugin_DiffSideBySidePanel.h        | 13 +++++++++++--
 6 files changed, 37 insertions(+), 19 deletions(-)

diffs:
diff --git a/codelite/Makefile b/codelite/Makefile
index 74312de6f5..859c68a121 100644
--- a/codelite/Makefile
+++ b/codelite/Makefile
@@ -64,7 +64,6 @@ 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
 
 BUILDLINK_TRANSFORM+=	opt:-std=c++11:-std=gnu++11 # alloca
diff --git a/codelite/distinfo b/codelite/distinfo
index 5269977e00..13645e4770 100644
--- a/codelite/distinfo
+++ b/codelite/distinfo
@@ -3,9 +3,9 @@ $NetBSD: distinfo,v 1.11 2021/10/26 10:21:25 nia Exp $
 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) = 89ba11011c33a4de82f246c1ba198ab61f478d8d
-SHA1 (patch-LanguageServer_UI.h) = 8a40c5cc65bb210bb5f7e6b198580694503a4d95
-SHA1 (patch-Plugin_DiffSideBySidePanel.h) = a62fd170d51bc6ba650d5d7862d5c9633d5dcedb
+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) = 4b7f216ae9384f4e4293463a3dbbd588d1e907f1
 SHA1 (patch-sdk_asio-1.12.1_asio_detail_impl_kqueue__reactor.ipp) = bdbcf78c6198da9ceb123373fd6b99419ae94896
 SHA1 (patch-svgs_svgs-dark_create-logo.sh) = d794ca7bb16a248a7aead3ca30e6c9f16073e1a3
diff --git a/codelite/patches/patch-CodeLite_tags_storage_sqlite3.h b/codelite/patches/patch-CodeLite_tags_storage_sqlite3.h
index d35f7bc354..11732a8994 100644
--- a/codelite/patches/patch-CodeLite_tags_storage_sqlite3.h
+++ b/codelite/patches/patch-CodeLite_tags_storage_sqlite3.h
@@ -1,11 +1,21 @@
+$NetBSD$
 
---- CodeLite/tags_storage_sqlite3.h.orig	2022-10-15 00:18:53.652035696 +0300
+--- CodeLite/tags_storage_sqlite3.h	2022-05-03 22:38:34.770034020 +0300
 +++ CodeLite/tags_storage_sqlite3.h
-@@ -25,6 +25,7 @@
+@@ -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/codelite/patches/patch-LanguageServer_LanguageServerLogView.h b/codelite/patches/patch-LanguageServer_LanguageServerLogView.h
new file mode 100644
index 0000000000..b4108035d0
--- /dev/null
+++ b/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/codelite/patches/patch-LanguageServer_UI.h b/codelite/patches/patch-LanguageServer_UI.h
deleted file mode 100644
index 9f01e3ece9..0000000000
--- a/codelite/patches/patch-LanguageServer_UI.h
+++ /dev/null
@@ -1,11 +0,0 @@
-
---- LanguageServer/UI.h.orig	2022-10-15 00:18:53.648295948 +0300
-+++ LanguageServer/UI.h
-@@ -8,6 +8,7 @@
- #define _CODELITE_LANGUAGESERVER_UI_BASE_CLASSES_H
- 
- // clang-format off
-+#include <wx/menu.h>
- #include <wx/settings.h>
- #include <wx/xrc/xmlres.h>
- #include <wx/xrc/xh_bmp.h>
diff --git a/codelite/patches/patch-Plugin_DiffSideBySidePanel.h b/codelite/patches/patch-Plugin_DiffSideBySidePanel.h
index 980b479f5e..1634ce34e8 100644
--- a/codelite/patches/patch-Plugin_DiffSideBySidePanel.h
+++ b/codelite/patches/patch-Plugin_DiffSideBySidePanel.h
@@ -1,12 +1,21 @@
+$NetBSD$
 
---- Plugin/DiffSideBySidePanel.h.orig	2022-10-15 00:18:53.650326388 +0300
+--- Plugin/DiffSideBySidePanel.h.orig	2022-04-18 08:09:00.000000000 +0300
 +++ Plugin/DiffSideBySidePanel.h
-@@ -26,6 +26,8 @@
+@@ -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