pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/editors/codelite
Module Name: pkgsrc
Committed By: nros
Date: Thu Oct 26 10:46:58 UTC 2023
Modified Files:
pkgsrc/editors/codelite: Makefile PLIST distinfo
Added Files:
pkgsrc/editors/codelite: PLIST.Darwin
pkgsrc/editors/codelite/patches: patch-CMakeLists.txt
patch-CodeLite_MSYS2.hpp patch-CodeLite_cpp__expr__parser.cpp
patch-CodeLite_cpp__func__parser.cpp patch-CodeLite_pp.cpp
patch-CodeLite_scope__parser.cpp patch-CodeLite_typedef__parser.cpp
patch-CodeLite_var__parser.cpp patch-LiteEditor_CMakeLists.txt
patch-LiteEditor_clConfigurationSelectionCtrl.h
patch-LiteEditor_tabgroupmanager.h patch-Plugin_DiffUI.h
patch-Plugin_clEditorEditEventsHandler.cpp
patch-Plugin_clFileSystemWorkspaceView.hpp
patch-Plugin_clLocaleManager.cpp patch-Plugin_clPluginsFindBar.h
patch-Remoty_sample__codelite__remote__json.cpp
Removed Files:
pkgsrc/editors/codelite/patches: patch-Plugin_DiffSideBySidePanel.h
patch-wxcrafter_myxh__propgrid.cpp
Log Message:
Update codelite to version 17.0.0
Changelog from release notes
bug fixes:
* codelite-ctags is now built as part of CodeLite sources and is
not provided as a prebuilt binary
* ctagsd finds the wrong definition of a method
* Respect user-supplied/alternate wx-config Alternate wx-config
is not respected by ctagsd and codelite-cli subsystems
* Filesystem Workspace: Make Build and Run Project and Rebuild
Project work with filesystem workspace (rlbxku1r)
* restore frame attributes: MAXIMIZE, FULLSCREEN
* Editor margin offset with fractional scaling enabled
* Fixed: CodeLite crashes when opening the resource dialog when
no workspace is opened
* Fixed: CodeLite crashes when the LSP command is invalid
* Fixed the issue that OpenFileAsync would not trigger the
callback function to open soft-linked files
* FIX: Git, The first commit failed (liuanlin-mx)
* fix:git plugin: show file diff, file path is incorrect
* git: add Show file Log (liuanlin-mx)
* Fix: Replace All, Regular expressions don't work (liuanlin-mx)
* Clicking the "Refresh" button in the FSW toolbar, refreshes
the entire tree, unconditionally
* Tab control navigation: use the same keyboard on all major
platforms
* Tab control navigation dialog: show the dialog when using
WSL2 on Windows
* Fix issue with "Open Resource..." searches containing
:line[:column] When search pattern includes :line[:column]
the current search only uses the filename - paths before the
filename are ignored (Uffe Jakobsen)
* fixed: Outline view is unreadable - bad colors
* Add support for Alacritty terminal emulator
* wxCrafter: Subclass of wxSpinCtrl crashes wxCrafter
Impovements:
* Source code formatter: added support for cmake-format
* CodeLite startup time improved
* Updated the Replace UI to fit the other controls
* Preferences dialog has been re-written and now fits better on
small screen, as a side bonus, it loads instantly
* Reloading a file opened remotely, now loads it from the
remote server ( Ctrl+R )
* Language Server plugin: LSP server detection code improvements
* Code Formatter plugin: the plugin was re-written.
By default CodeLite now configure code formatters for:
C++ clang-format
JSON jq
XML xmllint
Rust rustfmt
PHP php-cs-fixer & phpcbf
Python black
* Code Formatter plugin: support "Format On Save": the user can
now configure that the editor will be formatted after a save
operation
* Code Formatter plugin: is now supporting invoking formatting
on remote files opened via the Remoty plugin
* Hidden folders are now displayed in the UI using gray text and
disabled image
* Remoty workspace tree view: added an option to copy a remote
folder path
* File system workspace tree view: the top level folder no longer
displays the fullpath, but rather that last dir name
* A modified tab now displays a round circle indicating that the
file is modified
* All template files have been updated to use the
dap - Debug Adapter Client by default
* Welcome Page has been updated, mainly, the list of Recently
opened workspaces now includes list of workspaces opened by
other plugins (e.g. Remoty)
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/editors/codelite/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/editors/codelite/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/codelite/PLIST.Darwin
cvs rdiff -u -r1.12 -r1.13 pkgsrc/editors/codelite/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/editors/codelite/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
pkgsrc/editors/codelite/patches/patch-CodeLite_MSYS2.hpp \
pkgsrc/editors/codelite/patches/patch-CodeLite_cpp__expr__parser.cpp \
pkgsrc/editors/codelite/patches/patch-CodeLite_cpp__func__parser.cpp \
pkgsrc/editors/codelite/patches/patch-CodeLite_pp.cpp \
pkgsrc/editors/codelite/patches/patch-CodeLite_scope__parser.cpp \
pkgsrc/editors/codelite/patches/patch-CodeLite_typedef__parser.cpp \
pkgsrc/editors/codelite/patches/patch-CodeLite_var__parser.cpp \
pkgsrc/editors/codelite/patches/patch-LiteEditor_clConfigurationSelectionCtrl.h \
pkgsrc/editors/codelite/patches/patch-LiteEditor_tabgroupmanager.h \
pkgsrc/editors/codelite/patches/patch-Plugin_DiffUI.h \
pkgsrc/editors/codelite/patches/patch-Plugin_clEditorEditEventsHandler.cpp \
pkgsrc/editors/codelite/patches/patch-Plugin_clFileSystemWorkspaceView.hpp \
pkgsrc/editors/codelite/patches/patch-Plugin_clLocaleManager.cpp \
pkgsrc/editors/codelite/patches/patch-Plugin_clPluginsFindBar.h \
pkgsrc/editors/codelite/patches/patch-Remoty_sample__codelite__remote__json.cpp
cvs rdiff -u -r0 -r1.4 \
pkgsrc/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
pkgsrc/editors/codelite/patches/patch-Plugin_DiffSideBySidePanel.h \
pkgsrc/editors/codelite/patches/patch-wxcrafter_myxh__propgrid.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/editors/codelite/Makefile
diff -u pkgsrc/editors/codelite/Makefile:1.56 pkgsrc/editors/codelite/Makefile:1.57
--- pkgsrc/editors/codelite/Makefile:1.56 Tue Oct 24 22:09:00 2023
+++ pkgsrc/editors/codelite/Makefile Thu Oct 26 10:46:58 2023
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.56 2023/10/24 22:09:00 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2023/10/26 10:46:58 nros Exp $
-DISTNAME= codelite-16.0
-PKGREVISION= 8
+DISTNAME= codelite-17.0.0
CATEGORIES= editors x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=eranif/}
-GITHUB_TAG= 16.0.0-1
+GITHUB_RELEASE= ${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://codelite.org/
COMMENT= Cross platform C/C++/PHP and Node.js IDE written in C++
LICENSE= gnu-gpl-v2
-USE_CMAKE= yes
-USE_PKGLOCALEDIR= yes
+WRKSRC= ${WRKDIR}/${DISTNAME:R}
+
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config bash
+USE_CXX_FEATURES= c++11
-CMAKE_ARGS+= -DPREFIX:STRING=${PREFIX}
-
-# Uses alloca, cannot use standard C++ on NetBSD.
-FORCE_CXX_STD= gnu++11
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_STANDARD=11
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_EXTENSIONS:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
.include "../../mk/bsd.prefs.mk"
@@ -30,14 +30,6 @@ CHECK_PORTABILITY_SKIP+= sdk/wxsqlite3/c
CHECK_PORTABILITY_SKIP+= InnoSetup/output/finalize-upload.sh
CHECK_PORTABILITY_SKIP+= wxcrafter/pack-osx.sh
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+= ena-netbsd
-SUBST_STAGE.ena-netbsd= pre-configure
-SUBST_MESSAGE.ena-netbsd= Enable NetBSD
-SUBST_FILES.ena-netbsd= CMakeLists.txt
-SUBST_SED.ena-netbsd+= -e 's,IS_NETBSD 0,IS_NETBSD 1,g'
-.endif
-
SUBST_CLASSES+= fix-bash
SUBST_STAGE.fix-bash= pre-configure
SUBST_MESSAGE.fix-bash= Fix bash path
@@ -53,16 +45,17 @@ SUBST_FILES.fix-bash+= Remoty/RemotyWor
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_FILES.fix-bash+= Docker/clDockerDriver.cpp
SUBST_SED.fix-bash+= -e 's,/bin/bash,${BASH},g'
-SUBST_CLASSES+= fix-man-path
-SUBST_STAGE.fix-man-path= pre-configure
-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+= ctags/misc/review
+REPLACE_BASH+= ctags/Units/parser-sh.r/array-alike-function.d/input.bash
+REPLACE_BASH+= ctags/Units/parser-sh.r/sh-herestring.d/input.sh
REPLACE_BASH+= docs/docs/deploy.sh
-REPLACE_BASH+= make-weekly
+REPLACE_BASH+= weekly/make-weekly-common
+REPLACE_BASH+= weekly/make-weekly-linux
+REPLACE_BASH+= weekly/make-weekly-macos
+REPLACE_BASH+= weekly/make-weekly-msw
REPLACE_NODEJS+= LanguageServer/codelite-lsp/codelite-lsp-helper
REPLACE_PYTHON+= Runtime/codelite-remote
REPLACE_PYTHON+= codelite_open_helper.py
@@ -71,6 +64,24 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX
BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--disable-new-dtags
+TOOL_DEPENDS+= dos2unix-[0-9]*:../../converters/dos2unix
+
+pre-patch:
+ dos2unix ${WRKSRC}/CodeLite/cpp_expr_parser.cpp
+ dos2unix ${WRKSRC}/CodeLite/cpp_func_parser.cpp
+ dos2unix ${WRKSRC}/CodeLite/pp.cpp
+ dos2unix ${WRKSRC}/CodeLite/scope_parser.cpp
+ dos2unix ${WRKSRC}/CodeLite/typedef_parser.cpp
+ dos2unix ${WRKSRC}/CodeLite/var_parser.cpp
+ dos2unix ${WRKSRC}/LiteEditor/tabgroupmanager.h
+ dos2unix ${WRKSRC}/Plugin/clPluginsFindBar.h
+
+PLIST_VARS+= notdarwin
+.if ${OPSYS} != "Darwin"
+PLIST.notdarwin= YES
+.endif
+
+.include "../../devel/cmake/build.mk"
.include "../../lang/nodejs/application.mk"
.include "../../lang/nodejs/buildlink3.mk"
.include "../../lang/python/application.mk"
@@ -79,7 +90,7 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--dis
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../net/libcares/buildlink3.mk"
.include "../../textproc/hunspell/buildlink3.mk"
-.include "../../textproc//uchardet/buildlink3.mk"
+.include "../../textproc/uchardet/buildlink3.mk"
.include "../../security/libssh/buildlink3.mk"
.include "../../x11/wxGTK32/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/codelite/PLIST
diff -u pkgsrc/editors/codelite/PLIST:1.7 pkgsrc/editors/codelite/PLIST:1.8
--- pkgsrc/editors/codelite/PLIST:1.7 Mon Oct 17 16:50:03 2022
+++ pkgsrc/editors/codelite/PLIST Thu Oct 26 10:46:58 2023
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.7 2022/10/17 16:50:03 andvar Exp $
+@comment $NetBSD: PLIST,v 1.8 2023/10/26 10:46:58 nros 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
+${PLIST.notdarwin}bin/codelite-terminal
bin/codelite_cppcheck
bin/codelite_exec
bin/codelite_fix_files
@@ -17,10 +16,13 @@ bin/ctagsd
bin/ctagsd-tests
lib/codelite/AutoSave.so
lib/codelite/CMakePlugin.so
+lib/codelite/CallGraph.so
lib/codelite/CodeFormatter.so
lib/codelite/CodeLiteDiff.so
+lib/codelite/ContinuousBuild.so
lib/codelite/Copyright.so
lib/codelite/DatabaseExplorer.so
+lib/codelite/DebugAdapterClient.so
lib/codelite/Docker.so
lib/codelite/EOSWiki.so
lib/codelite/EditorConfigPlugin.so
@@ -52,6 +54,7 @@ lib/codelite/cppchecker.so
lib/codelite/cscope.so
lib/codelite/debuggers/DebuggerGDB.so
lib/codelite/git.so
+lib/codelite/libdapcxx.so
lib/codelite/libdatabaselayersqlite.so
lib/codelite/liblibcodelite.so
lib/codelite/libplugin.so
@@ -116,6 +119,7 @@ share/codelite/images/splashscreen%2x.pn@localhost
share/codelite/lexers/lexers.json
share/codelite/php.sample
share/codelite/phprefactor.phar
+share/codelite/rc/menu.macos.xrc
share/codelite/rc/menu.xrc
share/codelite/resources/abbrev.png
share/codelite/resources/compfile.png
@@ -216,10 +220,8 @@ share/codelite/templates/projects/cpp_gt
share/codelite/templates/projects/custom-makefile/custom-makefile.project
share/codelite/templates/projects/custom-makefile/icon.png
share/codelite/templates/projects/dynamic-library-wx-enabled/dynamic-library-wx-enabled.project
-share/codelite/templates/projects/dynamic-library-wx-enabled/dynamic-library-wx-enabled.project.windows
share/codelite/templates/projects/dynamic-library-wx-enabled/icon.png
share/codelite/templates/projects/dynamic-library/dynamic-library.project
-share/codelite/templates/projects/dynamic-library/dynamic-library.project.windows
share/codelite/templates/projects/dynamic-library/icon.png
share/codelite/templates/projects/executable-cobra/executable-cobra.project
share/codelite/templates/projects/executable-cobra/main.cobra
Index: pkgsrc/editors/codelite/distinfo
diff -u pkgsrc/editors/codelite/distinfo:1.12 pkgsrc/editors/codelite/distinfo:1.13
--- pkgsrc/editors/codelite/distinfo:1.12 Mon Oct 17 16:50:03 2022
+++ pkgsrc/editors/codelite/distinfo Thu Oct 26 10:46:58 2023
@@ -1,13 +1,28 @@
-$NetBSD: distinfo,v 1.12 2022/10/17 16:50:03 andvar Exp $
+$NetBSD: distinfo,v 1.13 2023/10/26 10:46:58 nros Exp $
-BLAKE2s (codelite-16.0.tar.gz) = 9f1d0335b0d7571e2aa2add64996a70141571ab8ae67fd360f3db9bfa9f6a3cf
-SHA512 (codelite-16.0.tar.gz) = 4965207a11869bb5f5ec33538bdc2a7312f8d444c615cf7e5a653a26abe2e823bd35a07d1bce73812935025e9a2dc3d6b970e02c7eb2da75f3a22c14d7670af7
-Size (codelite-16.0.tar.gz) = 89755705 bytes
+BLAKE2s (codelite-17.0.0.tar.gz) = f87eff56ee8f9af203a6212cc19e9031f70a396982a9f6fe276dc879f960f4dc
+SHA512 (codelite-17.0.0.tar.gz) = e36b6dcc37cd036a301a78714e8d5f2a61714b58fe006398fe0e959be59992dd7cc7d2a59661d364e371c750ca15cc21d4085d207738a7e3ede09ec0de125cff
+Size (codelite-17.0.0.tar.gz) = 33541958 bytes
+SHA1 (patch-CMakeLists.txt) = 00128fd4c090b6d0ce69c290e12ce6717008fd53
+SHA1 (patch-CodeLite_MSYS2.hpp) = 6e4019a99a28478a6cc10ba10835d4a73979bf3a
+SHA1 (patch-CodeLite_cpp__expr__parser.cpp) = 672e675d6b9f6049de5da282855fa40f8d025b37
+SHA1 (patch-CodeLite_cpp__func__parser.cpp) = 02cbdca2ba0e880d4865ba6453b1abc5850f7d61
+SHA1 (patch-CodeLite_pp.cpp) = 056c7dc59924476fe547fbca2672ead0f3634e18
+SHA1 (patch-CodeLite_scope__parser.cpp) = b7cc03dd965abb4bdf88ad231c5045f7dd61f8a2
SHA1 (patch-CodeLite_tags_storage_sqlite3.h) = 5de0ea959cbdcec260f4d7e8ad55a59ec65b83aa
+SHA1 (patch-CodeLite_typedef__parser.cpp) = 3778e1978e6445849ed17321913f14272960993f
+SHA1 (patch-CodeLite_var__parser.cpp) = 110ad9f032d31376ae1e92fc78255e687f0eb969
SHA1 (patch-LanguageServer_LanguageServerLogView.h) = e098709cd6e6cf76a5416b1b8e93f60a6b636bd6
-SHA1 (patch-Plugin_DiffSideBySidePanel.h) = bfc07ea848244a2d2295f10816da4f37edc1e2e4
+SHA1 (patch-LiteEditor_CMakeLists.txt) = 34a788336a9a90b1b2960385c28cc5ace4abbfa0
+SHA1 (patch-LiteEditor_clConfigurationSelectionCtrl.h) = 3432007081056ca29f71324f47d994e00a592d86
+SHA1 (patch-LiteEditor_tabgroupmanager.h) = b537238557f99ad83eb39937ce16f65caab45783
+SHA1 (patch-Plugin_DiffUI.h) = 66780d7ddc659df446f5f6361c8c69d966dfeb5d
+SHA1 (patch-Plugin_clEditorEditEventsHandler.cpp) = dc354802d62160a101983931526479e566680e89
+SHA1 (patch-Plugin_clFileSystemWorkspaceView.hpp) = 3d45e377e1721daf612742d6d3bc032aea1441bf
+SHA1 (patch-Plugin_clLocaleManager.cpp) = de9b9e6f5dfd9a20e5eed78a6f10f827d828ff89
+SHA1 (patch-Plugin_clPluginsFindBar.h) = c4ec0c44829d73d7ab7beb1d19b0021a1da99a0b
+SHA1 (patch-Remoty_sample__codelite__remote__json.cpp) = 2082c01aac36eb28d46879c1a125972b32fd37aa
SHA1 (patch-ctagsd_CMakeLists.txt) = 2f86721027013407fd662b4f5b3df3f47ad5c5c7
SHA1 (patch-sdk_asio-1.12.1_asio_detail_impl_kqueue__reactor.ipp) = 20b605046b94de06a8491a282ec8788bea7a50c7
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
Added files:
Index: pkgsrc/editors/codelite/PLIST.Darwin
diff -u /dev/null pkgsrc/editors/codelite/PLIST.Darwin:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/PLIST.Darwin Thu Oct 26 10:46:58 2023
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2023/10/26 10:46:58 nros Exp $
+bin/codelite-lsp-helper
Index: pkgsrc/editors/codelite/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-CMakeLists.txt:1.3
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-CMakeLists.txt Thu Oct 26 10:46:58 2023
@@ -0,0 +1,40 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2023/10/26 10:46:58 nros Exp $
+
+Set IS_NETBSD and IS_FREEBSD based on CMAKE_SYSTEM_NAME.
+Don't look for homebrew libs.
+Don't include harfbuzz outside the buildlink system.
+
+--- CMakeLists.txt.orig 2023-10-22 11:47:37.862356052 +0000
++++ CMakeLists.txt
+@@ -95,13 +95,21 @@ if(NOT SQLite3_FOUND)
+ set(SQLite3_LIBRARIES "-lsqlite3lib")
+ endif()
+
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++set(IS_FREEBSD 1)
++else()
+ set(IS_FREEBSD 0)
++endif()
++if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
++set(IS_NETBSD 1)
++else()
+ set(IS_NETBSD 0)
++endif()
+ set(BUILD_WXC 0)
+ set(CL_COPY_WX_LIBS 0)
+ set(WITH_SFTP 1)
+
+-if(APPLE)
++if(OFF)
+ # add homebrew path to cmake search pathsbrew --prefix
+ execute_process(
+ COMMAND brew --prefix
+@@ -113,7 +121,7 @@ endif()
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") # Avoid very multiple warnings spam due to
+ # deprecated wx methods
+-if(UNIX AND NOT APPLE)
++if(OFF)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem /usr/include/harfbuzz"
+ )# Needed for fedora 31 so far, but will spread. See https://gitlab.kitware.com/cmake/cmake/issues/19531
+ endif()
Index: pkgsrc/editors/codelite/patches/patch-CodeLite_MSYS2.hpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-CodeLite_MSYS2.hpp:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-CodeLite_MSYS2.hpp Thu Oct 26 10:46:58 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-CodeLite_MSYS2.hpp,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Missing declarations of wxArrayString, wxFilename and wxGetEnv
+
+--- CodeLite/MSYS2.hpp.orig 2023-01-11 21:18:07.000000000 +0000
++++ CodeLite/MSYS2.hpp
+@@ -3,6 +3,9 @@
+
+ #include "PlatformCommon.hpp"
+ #include "codelite_exports.h"
++#include <wx/arrstr.h>
++#include <wx/filename.h>
++#include <wx/utils.h>
+
+ class WXDLLIMPEXP_CL MSYS2 : public PlatformCommon
+ {
Index: pkgsrc/editors/codelite/patches/patch-CodeLite_cpp__expr__parser.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-CodeLite_cpp__expr__parser.cpp:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-CodeLite_cpp__expr__parser.cpp Thu Oct 26 10:46:58 2023
@@ -0,0 +1,34 @@
+$NetBSD: patch-CodeLite_cpp__expr__parser.cpp,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Fix Warning: ISO C++ forbids converting a string constant to char*
+
+--- CodeLite/cpp_expr_parser.cpp.orig 2023-10-25 12:56:08.662150675 +0000
++++ CodeLite/cpp_expr_parser.cpp
+@@ -47,6 +47,9 @@ void cl_expr_error(char *string);
+
+ static ExpressionResult result;
+
++static char semsg[] = "syntax error";
++static char ysomsg[] = "yacc stack overflow";
++
+ /*---------------------------------------------*/
+ /* externs defined in the lexer*/
+ /*---------------------------------------------*/
+@@ -595,7 +598,7 @@ yyloop:
+ goto yynewerror;
+ #endif
+ yynewerror:
+- yyerror("syntax error");
++ yyerror(semsg);
+ #ifdef lint
+ goto yyerrlab;
+ #endif
+@@ -968,7 +971,7 @@ to state %d\n", YYPREFIX, *yyssp, yystat
+ *++yyvsp = yyval;
+ goto yyloop;
+ yyoverflow:
+- yyerror("yacc stack overflow");
++ yyerror(ysomsg);
+ yyabort:
+ return (1);
+ yyaccept:
Index: pkgsrc/editors/codelite/patches/patch-CodeLite_cpp__func__parser.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-CodeLite_cpp__func__parser.cpp:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-CodeLite_cpp__func__parser.cpp Thu Oct 26 10:46:58 2023
@@ -0,0 +1,33 @@
+$NetBSD: patch-CodeLite_cpp__func__parser.cpp,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Fix Warning: ISO C++ forbids converting a string constant to char*
+
+--- CodeLite/cpp_func_parser.cpp.orig 2023-10-25 12:56:08.665232425 +0000
++++ CodeLite/cpp_func_parser.cpp
+@@ -55,6 +55,8 @@ void cl_func_error(char *string);
+ static FunctionList *g_funcs = NULL;
+ static clFunction curr_func;
+
++static char semsg[] = "syntax error";
++static char ysomsg[] = "yacc stack overflow";
+ /*---------------------------------------------*/
+ /* externs defined in the lexer*/
+ /*---------------------------------------------*/
+@@ -689,7 +691,7 @@ yyloop:
+ goto yynewerror;
+ #endif
+ yynewerror:
+- yyerror("syntax error");
++ yyerror(semsg);
+ #ifdef lint
+ goto yyerrlab;
+ #endif
+@@ -1042,7 +1044,7 @@ to state %d\n", YYPREFIX, *yyssp, yystat
+ *++yyvsp = yyval;
+ goto yyloop;
+ yyoverflow:
+- yyerror("yacc stack overflow");
++ yyerror(ysomsg);
+ yyabort:
+ return (1);
+ yyaccept:
Index: pkgsrc/editors/codelite/patches/patch-CodeLite_pp.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-CodeLite_pp.cpp:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-CodeLite_pp.cpp Thu Oct 26 10:46:58 2023
@@ -0,0 +1,33 @@
+$NetBSD: patch-CodeLite_pp.cpp,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Fix Warning: ISO C++ forbids converting a string constant to char*
+
+--- CodeLite/pp.cpp.orig 2023-10-25 17:36:29.887514094 +0000
++++ CodeLite/pp.cpp
+@@ -79,6 +79,8 @@ extern wxString g_filename;
+
+ /* Static*/
+ static std::vector<wxString> g_tmpMacros;
++static char semsg[] = "syntax error";
++static char ysomsg[] = "yacc stack overflow";
+
+ /*************** Standard ytab.c continues here *********************/
+ #define PP_DEFINE 257
+@@ -370,7 +372,7 @@ yyloop:
+ goto yynewerror;
+ #endif
+ yynewerror:
+- yyerror("syntax error");
++ yyerror(semsg);
+ #ifdef lint
+ goto yyerrlab;
+ #endif
+@@ -577,7 +579,7 @@ to state %d\n", YYPREFIX, *yyssp, yystat
+ *++yyvsp = yyval;
+ goto yyloop;
+ yyoverflow:
+- yyerror("yacc stack overflow");
++ yyerror(ysomsg);
+ yyabort:
+ return (1);
+ yyaccept:
Index: pkgsrc/editors/codelite/patches/patch-CodeLite_scope__parser.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-CodeLite_scope__parser.cpp:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-CodeLite_scope__parser.cpp Thu Oct 26 10:46:58 2023
@@ -0,0 +1,33 @@
+$NetBSD: patch-CodeLite_scope__parser.cpp,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Fix Warning: ISO C++ forbids converting a string constant to char*
+
+--- CodeLite/scope_parser.cpp.orig 2023-10-25 12:56:08.667128461 +0000
++++ CodeLite/scope_parser.cpp
+@@ -54,6 +54,8 @@ void cl_scope_error(char *string);
+ void syncParser();
+
+ static std::vector<std::string> gs_additionlNS;
++static char semsg[] = "syntax error";
++static char ysomsg[] = "yacc stack overflow";
+
+ /*---------------------------------------------*/
+ /* externs defined in the lexer*/
+@@ -899,7 +901,7 @@ yyloop:
+ goto yynewerror;
+ #endif
+ yynewerror:
+- yyerror("syntax error");
++ yyerror(semsg);
+ #ifdef lint
+ goto yyerrlab;
+ #endif
+@@ -1354,7 +1356,7 @@ to state %d\n", YYPREFIX, *yyssp, yystat
+ *++yyvsp = yyval;
+ goto yyloop;
+ yyoverflow:
+- yyerror("yacc stack overflow");
++ yyerror(ysomsg);
+ yyabort:
+ return (1);
+ yyaccept:
Index: pkgsrc/editors/codelite/patches/patch-CodeLite_typedef__parser.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-CodeLite_typedef__parser.cpp:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-CodeLite_typedef__parser.cpp Thu Oct 26 10:46:58 2023
@@ -0,0 +1,33 @@
+$NetBSD: patch-CodeLite_typedef__parser.cpp,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Fix Warning: ISO C++ forbids converting a string constant to char*
+
+--- CodeLite/typedef_parser.cpp.orig 2023-10-25 12:56:08.668865476 +0000
++++ CodeLite/typedef_parser.cpp
+@@ -62,6 +62,8 @@ static Variable curr_va
+ static clTypedefList gs_typedefs;
+ static clTypedef gs_currentTypedef;
+ static std::string s_templateInitList;
++static char semsg[] = "syntax error";
++static char ysomsg[] = "yacc stack overflow";
+
+ /*---------------------------------------------*/
+ /* externs defined in the lexer*/
+@@ -605,7 +607,7 @@ yyloop:
+ goto yynewerror;
+ #endif
+ yynewerror:
+- yyerror("syntax error");
++ yyerror(semsg);
+ #ifdef lint
+ goto yyerrlab;
+ #endif
+@@ -955,7 +957,7 @@ to state %d\n", YYPREFIX, *yyssp, yystat
+ *++yyvsp = yyval;
+ goto yyloop;
+ yyoverflow:
+- yyerror("yacc stack overflow");
++ yyerror(ysomsg);
+ yyabort:
+ return (1);
+ yyaccept:
Index: pkgsrc/editors/codelite/patches/patch-CodeLite_var__parser.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-CodeLite_var__parser.cpp:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-CodeLite_var__parser.cpp Thu Oct 26 10:46:58 2023
@@ -0,0 +1,33 @@
+$NetBSD: patch-CodeLite_var__parser.cpp,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Fix Warning: ISO C++ forbids converting a string constant to char*
+
+--- CodeLite/var_parser.cpp.orig 2023-10-25 12:56:08.670851597 +0000
++++ CodeLite/var_parser.cpp
+@@ -62,6 +62,8 @@ static std::string s_tmpStrin
+ static Variable curr_var;
+ static std::string s_templateInitList;
+ static bool isBasicType = false;
++static char semsg[] = "syntax error";
++static char ysomsg[] = "yacc stack overflow";
+
+ /*---------------------------------------------*/
+ /* externs defined in the lexer*/
+@@ -810,7 +812,7 @@ yyloop:
+ goto yynewerror;
+ #endif
+ yynewerror:
+- yyerror("syntax error");
++ yyerror(semsg);
+ #ifdef lint
+ goto yyerrlab;
+ #endif
+@@ -1414,7 +1416,7 @@ to state %d\n", YYPREFIX, *yyssp, yystat
+ *++yyvsp = yyval;
+ goto yyloop;
+ yyoverflow:
+- yyerror("yacc stack overflow");
++ yyerror(ysomsg);
+ yyabort:
+ return (1);
+ yyaccept:
Index: pkgsrc/editors/codelite/patches/patch-LiteEditor_clConfigurationSelectionCtrl.h
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-LiteEditor_clConfigurationSelectionCtrl.h:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-LiteEditor_clConfigurationSelectionCtrl.h Thu Oct 26 10:46:58 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-LiteEditor_clConfigurationSelectionCtrl.h,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Missing declaration of wxChoice
+
+--- LiteEditor/clConfigurationSelectionCtrl.h.orig 2023-01-11 21:18:07.000000000 +0000
++++ LiteEditor/clConfigurationSelectionCtrl.h
+@@ -5,6 +5,7 @@
+ #include "cl_command_event.h"
+
+ #include <wx/arrstr.h>
++#include <wx/choice.h>
+ #include <wx/panel.h>
+
+ #define OPEN_CONFIG_MGR_STR _("Open Workspace Configuration Manager...")
Index: pkgsrc/editors/codelite/patches/patch-LiteEditor_tabgroupmanager.h
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-LiteEditor_tabgroupmanager.h:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-LiteEditor_tabgroupmanager.h Thu Oct 26 10:46:58 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-LiteEditor_tabgroupmanager.h,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Missing declaration of wxXmlNode
+
+--- LiteEditor/tabgroupmanager.h.orig 2023-10-22 11:38:56.025877281 +0000
++++ LiteEditor/tabgroupmanager.h
+@@ -33,6 +33,7 @@
+ #include <wx/arrstr.h>
+ #include <wx/event.h>
+ #include <wx/string.h>
++#include <wx/xml/xml.h>
+
+ /**
+ * Each pair consists of the tabgroup name, and an array of the names of the constituent tabs
Index: pkgsrc/editors/codelite/patches/patch-Plugin_DiffUI.h
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-Plugin_DiffUI.h:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-Plugin_DiffUI.h Thu Oct 26 10:46:58 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-Plugin_DiffUI.h,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Missing declaration of wxFrame
+
+--- Plugin/DiffUI.h.orig 2023-01-11 21:18:07.000000000 +0000
++++ Plugin/DiffUI.h
+@@ -15,6 +15,7 @@
+ #include <wx/dataview.h>
+ #include <wx/dialog.h>
+ #include <wx/filepicker.h>
++#include <wx/frame.h>
+ #include <wx/iconbndl.h>
+ #include <wx/panel.h>
+ #include <wx/settings.h>
Index: pkgsrc/editors/codelite/patches/patch-Plugin_clEditorEditEventsHandler.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-Plugin_clEditorEditEventsHandler.cpp:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-Plugin_clEditorEditEventsHandler.cpp Thu Oct 26 10:46:58 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-Plugin_clEditorEditEventsHandler.cpp,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Missing declaration of wxTheApp
+
+--- Plugin/clEditorEditEventsHandler.cpp.orig 2023-01-11 21:18:07.000000000 +0000
++++ Plugin/clEditorEditEventsHandler.cpp
+@@ -2,6 +2,7 @@
+
+ #include "event_notifier.h"
+
++#include <wx/app.h>
+ #include <wx/combobox.h>
+ #include <wx/stc/stc.h>
+ #include <wx/textctrl.h>
Index: pkgsrc/editors/codelite/patches/patch-Plugin_clFileSystemWorkspaceView.hpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-Plugin_clFileSystemWorkspaceView.hpp:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-Plugin_clFileSystemWorkspaceView.hpp Thu Oct 26 10:46:58 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-Plugin_clFileSystemWorkspaceView.hpp,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Missing declaration of wxChoice
+
+--- Plugin/clFileSystemWorkspaceView.hpp.orig 2023-01-11 21:18:07.000000000 +0000
++++ Plugin/clFileSystemWorkspaceView.hpp
+@@ -7,6 +7,8 @@
+ #include "cl_command_event.h"
+ #include "cl_config.h"
+
++#include <wx/choice.h>
++
+ class clThemedButton;
+ class WXDLLIMPEXP_SDK clFileSystemWorkspaceView : public clTreeCtrlPanel
+ {
Index: pkgsrc/editors/codelite/patches/patch-Plugin_clLocaleManager.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-Plugin_clLocaleManager.cpp:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-Plugin_clLocaleManager.cpp Thu Oct 26 10:46:58 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-Plugin_clLocaleManager.cpp,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Only use threads on GNU/Linux,
+fixes crash on codelite startup on NetBSD
+
+--- Plugin/clLocaleManager.cpp.orig 2023-01-11 21:18:07.000000000 +0000
++++ Plugin/clLocaleManager.cpp
+@@ -53,7 +53,7 @@ void clLocaleManager::load()
+ manager->CallAfter(&clLocaleManager::OnScanCompleted, d);
+ };
+
+-#ifdef __WXGTK__
++#ifdef __gnu_linux__
+ thread thr(entry_point, this);
+ thr.detach();
+ #else
+@@ -72,4 +72,4 @@ clLocaleManager& clLocaleManager::get()
+ {
+ static clLocaleManager locale_mgr;
+ return locale_mgr;
+-}
+\ No newline at end of file
++}
Index: pkgsrc/editors/codelite/patches/patch-Plugin_clPluginsFindBar.h
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-Plugin_clPluginsFindBar.h:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-Plugin_clPluginsFindBar.h Thu Oct 26 10:46:58 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-Plugin_clPluginsFindBar.h,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Missing declaration of wxStaticText
+
+--- Plugin/clPluginsFindBar.h.orig 2023-10-22 11:38:56.024425430 +0000
++++ Plugin/clPluginsFindBar.h
+@@ -33,6 +33,7 @@
+ #include <codelite_exports.h>
+ #include <wx/combobox.h>
+ #include <wx/panel.h>
++#include <wx/stattext.h>
+
+ class wxStyledTextCtrl;
+
Index: pkgsrc/editors/codelite/patches/patch-Remoty_sample__codelite__remote__json.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-Remoty_sample__codelite__remote__json.cpp:1.1
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-Remoty_sample__codelite__remote__json.cpp Thu Oct 26 10:46:58 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-Remoty_sample__codelite__remote__json.cpp,v 1.1 2023/10/26 10:46:58 nros Exp $
+
+Missing declaration of wxString
+
+--- Remoty/sample_codelite_remote_json.cpp.orig 2023-01-11 21:18:07.000000000 +0000
++++ Remoty/sample_codelite_remote_json.cpp
+@@ -1,6 +1,8 @@
+ #ifndef SAMPLE_CODELITE_REMOTE_JSON_HPP
+ #define SAMPLE_CODELITE_REMOTE_JSON_HPP
+
++#include <wx/string.h>
++
+ const wxString DEFAULT_CODELITE_REMOTE_JSON = R"EOF(
+ {
+ "Language Server Plugin": {
Index: pkgsrc/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt:1.4
--- /dev/null Thu Oct 26 10:46:58 2023
+++ pkgsrc/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt Thu Oct 26 10:46:58 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-LiteEditor_CMakeLists.txt,v 1.4 2023/10/26 10:46:58 nros Exp $
+
+Install manpages in the right place
+
+--- LiteEditor/CMakeLists.txt.orig 2023-01-11 21:18:07.000000000 +0000
++++ LiteEditor/CMakeLists.txt
+@@ -151,7 +151,7 @@ if(NOT APPLE)
+ install(FILES ${CL_SRC_ROOT}/LICENSE DESTINATION ${CL_RESOURCES_DIR})
+
+ # Manual pages
+- install(DIRECTORY ${CL_SRC_ROOT}/Runtime/man1 DESTINATION ${CL_RESOURCES_DIR}/man)
++ install(DIRECTORY ${CL_SRC_ROOT}/Runtime/man1 DESTINATION ${CMAKE_INSTALL_MANDIR})
+
+ # Copy default configuration files
+ install(FILES ${CL_SRC_ROOT}/Runtime/config/build_settings.xml.default DESTINATION ${CL_RESOURCES_DIR}/config)
Home |
Main Index |
Thread Index |
Old Index