NetBSD Problem Report #54412
From www@netbsd.org Sat Jul 27 10:49:19 2019
Return-Path: <www@netbsd.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
by mollari.NetBSD.org (Postfix) with ESMTPS id 206177A175
for <gnats-bugs@gnats.NetBSD.org>; Sat, 27 Jul 2019 10:49:19 +0000 (UTC)
Message-Id: <20190727104917.5A7D57A1D3@mollari.NetBSD.org>
Date: Sat, 27 Jul 2019 10:49:17 +0000 (UTC)
From: vezhlys@gmail.com
Reply-To: vezhlys@gmail.com
To: gnats-bugs@NetBSD.org
Subject: Patch for codelite 13.0
X-Send-Pr-Version: www-1.0
>Number: 54412
>Category: pkg
>Synopsis: Patch for codelite 13.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sat Jul 27 10:50:00 +0000 2019
>Closed-Date: Sun Aug 18 03:56:26 +0000 2019
>Last-Modified: Wed Aug 28 09:10:00 +0000 2019
>Originator: Andrius V
>Release: current
>Organization:
>Environment:
>Description:
Hi,
codelite package currently builds an old 9.1 version, it was released in the beginning of 2016. I create a patch for the current version at the time of writing (13.0.0) and successfully tested in locally (on NetBSD current). Need your help to review and apply the patch. Thank you.
Regards,
Andrius V
>How-To-Repeat:
>Fix:
Index: editors/codelite/Makefile
==================================================================
--- editors/codelite/Makefile
+++ editors/codelite/Makefile
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.20 2019/07/02 13:18:03 ryoon Exp $
-DISTNAME= codelite-9.1
+DISTNAME= codelite-13.0
PKGREVISION= 17
CATEGORIES= editors x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=eranif/}
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -19,10 +19,11 @@
# For some reason CMAKE_ARGS.NetBSD+=-DIS_NETBSD:STRING=1 doesn't work for me
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
+CMAKE_ARGS+= -DIS_NETBSD:STRING=1
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'
Index: editors/codelite/PLIST
==================================================================
--- editors/codelite/PLIST
+++ editors/codelite/PLIST
@@ -1,40 +1,51 @@
@comment $NetBSD: PLIST,v 1.1 2016/06/15 21:57:04 kamil Exp $
bin/codelite
bin/codelite-cc
bin/codelite-echo
+bin/codelite-lsp-helper
bin/codelite-make
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
+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/Docker.so
+lib/codelite/EOSWiki.so
+lib/codelite/EditorConfigPlugin.so
lib/codelite/ExternalTools.so
lib/codelite/HelpPlugin.so
+lib/codelite/LanguageServer.so
lib/codelite/MemCheck.so
lib/codelite/Outline.so
+lib/codelite/PHPLint.so
+lib/codelite/PHPRefactoring.so
lib/codelite/QMakePlugin.so
lib/codelite/SFTP.so
+lib/codelite/SmartCompletion.so
lib/codelite/SnipWiz.so
lib/codelite/SpellCheck.so
lib/codelite/Subversion.so
-lib/codelite/Tweaks.so
lib/codelite/UnitTestsPP.so
+lib/codelite/Tail.so
lib/codelite/WebTools.so
lib/codelite/Wizards.so
lib/codelite/WordCompletion.so
lib/codelite/ZoomNavigator.so
lib/codelite/abbreviation.so
+lib/codelite/codelite_vim.so
lib/codelite/codelitephp.so
lib/codelite/cppchecker.so
lib/codelite/cscope.so
lib/codelite/debuggers/DebuggerGDB.so
lib/codelite/git.so
@@ -41,56 +52,65 @@
lib/codelite/libdatabaselayersqlite.so
lib/codelite/liblibcodelite.so
lib/codelite/libplugin.so
lib/codelite/libwxshapeframework.so
lib/codelite/libwxsqlite3.so
+lib/codelite/wxCrafter.so
lib/codelite/wxFormBuilder.so
-man/man1/codelite-make.1
-man/man1/codelite.1
-man/man1/codelite_fix_files.1
share/applications/codelite.desktop
share/codelite/LICENSE
share/codelite/PHP.zip
share/codelite/astyle.sample
-share/codelite/codelite-bitmaps.zip
-share/codelite/codelite-icons-dark.zip
-share/codelite/codelite-icons-fresh-farm.zip
+share/codelite/codelite-bitmaps-dark.zip
+share/codelite/codelite-bitmaps-light.zip
share/codelite/codelite-icons.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
+share/codelite/config/cfg/cppcheck-cfg.rng
+share/codelite/config/cfg/cppcheck-lib.cfg
+share/codelite/config/cfg/embedded_sql.cfg
+share/codelite/config/cfg/gnu.cfg
share/codelite/config/cfg/gtk.cfg
+share/codelite/config/cfg/microsoft_sal.cfg
+share/codelite/config/cfg/motif.cfg
share/codelite/config/cfg/posix.cfg
share/codelite/config/cfg/qt.cfg
share/codelite/config/cfg/sdl.cfg
+share/codelite/config/cfg/sfml.cfg
share/codelite/config/cfg/std.cfg
share/codelite/config/cfg/windows.cfg
+share/codelite/config/cfg/wxwidgets.cfg
share/codelite/config/codelite.xml.default
share/codelite/config/debuggers.xml.default
share/codelite/dics/en_GB.aff
share/codelite/dics/en_GB.dic
share/codelite/dics/en_US.aff
share/codelite/dics/en_US.dic
+share/codelite/eoswiki.zip
share/codelite/gdb_printers/boost/__init__.py
share/codelite/gdb_printers/boost/printers.py
share/codelite/gdb_printers/helper.py
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/wx.py
share/codelite/images/common_tasks.png
-share/codelite/images/cubes.png
share/codelite/images/help_earth.png
share/codelite/images/plugin_not_ok.png
share/codelite/images/plugin_ok.png
share/codelite/images/recent_files.png
share/codelite/images/recent_workspaces.png
share/codelite/images/splashscreen.png
share/codelite/images/splashscreen@2x.png
-share/codelite/javascript.zip
+share/codelite/jsctags.zip
share/codelite/lexers/lexers.json
+share/codelite/php.sample
+share/codelite/phprefactor.phar
share/codelite/rc/menu.xrc
share/codelite/resources/abbrev.png
share/codelite/resources/compfile.png
share/codelite/resources/connect_no.png
share/codelite/resources/cppcheck.png
@@ -273,10 +293,11 @@
share/codelite/templates/projects/wxWidgets_ConsoleApp/main_app.cpp
share/codelite/templates/projects/wxWidgets_ConsoleApp/main_app.h
share/codelite/templates/projects/wxWidgets_ConsoleApp/wxWidgets_ConsoleApp.project
share/codelite/templates/qmake/qmake.project
share/codelite/unittest++1.3.tar.gz
+share/codelite/wxgui.zip
share/icons/hicolor/128x128/apps/codelite.png
share/icons/hicolor/128x128@2x/apps/codelite.png
share/icons/hicolor/256x256/apps/codelite.png
share/icons/hicolor/256x256@2x/apps/codelite.png
share/icons/hicolor/32x32/apps/codelite.png
@@ -283,5 +304,9 @@
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/zh_CN/LC_MESSAGES/codelite.mo
+share/locale/ru_RU/LC_MESSAGES/codelite.mo
+share/man/man1/codelite-make.1
+share/man/man1/codelite.1
+share/man/man1/codelite_fix_files.1
Index: editors/codelite/distinfo
==================================================================
--- editors/codelite/distinfo
+++ editors/codelite/distinfo
@@ -1,17 +1,14 @@
$NetBSD: distinfo,v 1.3 2017/02/14 21:31:43 joerg Exp $
-SHA1 (codelite-9.1.tar.gz) = a177e3c04612d96918361fcaae226e23f68be90a
-RMD160 (codelite-9.1.tar.gz) = b0ccb31eeadc5a342eba3a562044131868f7ceca
-SHA512 (codelite-9.1.tar.gz) = e7caa895c5ba62def98a50a46132940f7135c77ebe3d2fce7f1d83755ed6ce7dfc6aeb013a665b28eb969afcc1004f49284a253297d2317e72bda5f3945ce978
-Size (codelite-9.1.tar.gz) = 90366396 bytes
-SHA1 (patch-CMakeLists.txt) = aa94edc0803e001f2f56598fa22eb942a250ad1c
-SHA1 (patch-CodeLite_CMakeLists.txt) = 8456740d0de117b8847d8d8745e23ab2c2203e1e
-SHA1 (patch-CodeLite_unixprocess__impl.cpp) = bdaf3b9ec65fc7b623ec875148b30c3d9897d17d
-SHA1 (patch-LiteEditor_CMakeLists.txt) = cc5f625b5ef79d21a0f2405d699757be20180f46
-SHA1 (patch-Plugin_CMakeLists.txt) = 0af7b1ea3f941ebb9ecf41d8b8e4ffa760370fee
-SHA1 (patch-Plugin_wxterminal.cpp) = 02e6c6e4c5813a33ff29e49d53750011d70d1534
-SHA1 (patch-codelite__terminal_MainFrame.cpp) = 5717e46fddde8f7fc1aaf6c794318582f4b6da96
-SHA1 (patch-codelite__terminal_unixprocess__impl.cpp) = 69dfb1cc102213595e97c4e7d690e369a66c4749
-SHA1 (patch-sdk_codelite__indexer_libctags_read.c) = 84dbb412d3879e3d5bb3cc0e18f6388d8b7d4ee5
-SHA1 (patch-sdk_codelite__indexer_network_np__connections__server.cpp) = cf579cc67603c70199992a11e14c458c189f3942
-SHA1 (patch-sdk_wxsqlite3_configure) = 2b10b03efe1ff07ac80a7d4616a63eeac8f18278
+SHA1 (codelite-13.0.tar.gz) = 011e1ce86f6c9bd88278e3935d7f7cc6d90ef2ce
+RMD160 (codelite-13.0.tar.gz) = af6b08ebca99fa7ac56f50ea415aff71d950af0c
+SHA512 (codelite-13.0.tar.gz) = 53b1e8610268ad368d40f31a7355b88a57bb77c29616e02c2eb8a98310ce362f1430a1112761ac81e5c287e84e0703102d18c753328fa7c57b22c66bc4162010
+Size (codelite-13.0.tar.gz) = 63051086 bytes
+SHA1 (patch-CodeLite_CMakeLists.txt) = d0e30ce409746d166c3f050834116623f42e2b31
+SHA1 (patch-CodeLite_unixprocess__impl.cpp) = ba497d2dd383f38c0405df45661ce2a29f38cdc3
+SHA1 (patch-LiteEditor_CMakeLists.txt) = 1b55945779f62bc9e4d0a1ee4ab9ea6e5b44f199
+SHA1 (patch-Plugin_CMakeLists.txt) = 29c4859a6092e6d025220df45199c90a93b6c862
+SHA1 (patch-Plugin_wxterminal.cpp) = 4a86640b6fc532eab93d2f97934b672d87140b06
+SHA1 (patch-codelite__terminal_TextView.cpp) = 4d93659144ecf4780a09a039165d172bc4bc87a7
+SHA1 (patch-sdk_codelite__indexer_libctags_read.c) = 9c9e166dbf895bb746194547e9b0bea99db14926
+SHA1 (patch-sdk_codelite__indexer_network_np__connections__server.cpp) = 98f8cba3597035c79ebfb60ba5d69a27c02c74e4
DELETED editors/codelite/patches/patch-CMakeLists.txt
Index: editors/codelite/patches/patch-CMakeLists.txt
==================================================================
--- editors/codelite/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2016/06/15 22:04:17 kamil Exp $
-
-Add NetBSD entry.
-
---- CMakeLists.txt.orig 2016-01-30 10:49:18.000000000 +0000
-+++ CMakeLists.txt
-@@ -59,6 +59,7 @@ endif()
-
- set( USE_CLANG 1 )
- set( IS_FREEBSD 0 )
-+set( IS_NETBSD 1 )
- set( BUILD_WXC 0 )
- set( CL_COPY_WX_LIBS 0 )
- set( WITH_SFTP 1 )
Index: editors/codelite/patches/patch-CodeLite_CMakeLists.txt
==================================================================
--- editors/codelite/patches/patch-CodeLite_CMakeLists.txt
+++ editors/codelite/patches/patch-CodeLite_CMakeLists.txt
@@ -1,15 +1,15 @@
$NetBSD: patch-CodeLite_CMakeLists.txt,v 1.2 2017/02/14 21:31:43 joerg Exp $
Add switch for NetBSD to not fall under "other OS".
---- CodeLite/CMakeLists.txt.orig 2016-01-30 10:49:18.000000000 +0000
+--- CodeLite/CMakeLists.txt.orig 2019-05-21 17:52:21.000000000 +0300
+++ CodeLite/CMakeLists.txt
-@@ -60,6 +60,8 @@ set( ADDITIONAL_LIBRARIES "" )
+@@ -69,6 +69,8 @@ set( ADDITIONAL_LIBRARIES "" )
if (UNIX)
if ( IS_FREEBSD )
set(ADDITIONAL_LIBRARIES "-lkvm")
+ elseif ( IS_NETBSD )
+ set(ADDITIONAL_LIBRARIES "-lutil")
elseif ( UNIX AND NOT APPLE )
set(ADDITIONAL_LIBRARIES "-ldl -lutil")
else ( )
Index: editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp
==================================================================
--- editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp
+++ editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp
@@ -1,17 +1,17 @@
$NetBSD: patch-CodeLite_unixprocess__impl.cpp,v 1.1 2016/06/15 22:04:17 kamil Exp $
Add switch for NetBSD to not fall under "other OS".
---- CodeLite/unixprocess_impl.cpp.orig 2016-01-30 10:49:18.000000000 +0000
+--- CodeLite/unixprocess_impl.cpp.orig 2019-05-21 17:52:21.000000000 +0300
+++ CodeLite/unixprocess_impl.cpp
-@@ -44,6 +44,10 @@
+@@ -50,6 +50,10 @@
+ #include <libutil.h>
#include <sys/ioctl.h>
#include <termios.h>
- #include <libutil.h>
+#elif defined(__NetBSD__)
+#include <sys/ioctl.h>
+#include <termios.h>
+#include <util.h>
#else
#include <pty.h>
#include <utmp.h>
Index: editors/codelite/patches/patch-LiteEditor_CMakeLists.txt
==================================================================
--- editors/codelite/patches/patch-LiteEditor_CMakeLists.txt
+++ editors/codelite/patches/patch-LiteEditor_CMakeLists.txt
@@ -2,35 +2,16 @@
Add switch for NetBSD to not fall under "other OS".
Fix path of installation of manpages.
---- LiteEditor/CMakeLists.txt.orig 2016-01-30 10:49:18.000000000 +0000
+--- LiteEditor/CMakeLists.txt.orig 2019-05-21 17:52:21.000000000 +0300
+++ LiteEditor/CMakeLists.txt
-@@ -14,6 +14,9 @@ include( "${wxWidgets_USE_FILE}" )
- # Include paths
- include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces")
-
-+# GNU dirs
-+include(GNUInstallDirs)
-+
- ## On UNIX we require GTK
- if (UNIX AND NOT APPLE)
- if (GTK_VERSION EQUAL 3)
-@@ -68,6 +71,8 @@ set( ADDITIONAL_LIBRARIES "" )
+@@ -46,6 +46,8 @@ set( ADDITIONAL_LIBRARIES "" )
if (UNIX)
if ( IS_FREEBSD )
set(ADDITIONAL_LIBRARIES "-lkvm")
+ elseif ( IS_NETBSD )
-+ set(ADDITIONAL_LIBRARIES "")
++ set(ADDTIONAL_LIBRARIES "-lutil")
elseif ( UNIX AND NOT APPLE )
set(ADDITIONAL_LIBRARIES "-ldl -lutil -lgobject-2.0")
else ( )
-@@ -112,7 +117,7 @@ if(NOT APPLE)
-
- ## Manual pages
- if(UNIX AND NOT APPLE)
-- install(DIRECTORY ${CL_SRC_ROOT}/Runtime/man1 DESTINATION ${CL_PREFIX}/share/man)
-+ install(DIRECTORY ${CL_SRC_ROOT}/Runtime/man1 DESTINATION ${CL_PREFIX}/${CMAKE_INSTALL_MANDIR})
- endif()
-
- ## Copy default configuration files
Index: editors/codelite/patches/patch-Plugin_CMakeLists.txt
==================================================================
--- editors/codelite/patches/patch-Plugin_CMakeLists.txt
+++ editors/codelite/patches/patch-Plugin_CMakeLists.txt
@@ -1,15 +1,15 @@
$NetBSD: patch-Plugin_CMakeLists.txt,v 1.1 2016/06/15 22:04:17 kamil Exp $
Add switch for NetBSD to not fall under "other OS".
---- Plugin/CMakeLists.txt.orig 2016-01-30 10:49:18.000000000 +0000
+--- Plugin/CMakeLists.txt.orig 2019-05-21 17:52:21.000000000 +0300
+++ Plugin/CMakeLists.txt
@@ -64,6 +64,8 @@ set( ADDITIONAL_LIBRARIES "" )
if (UNIX)
if ( IS_FREEBSD )
set(ADDITIONAL_LIBRARIES "-lkvm")
+ elseif ( IS_NETBSD )
-+ set(ADDITIONAL_LIBRARIES "")
++ set(ADDITIONAL_LIBRARIES "-lutil")
elseif ( UNIX AND NOT APPLE )
set(ADDITIONAL_LIBRARIES "-ldl -lutil")
else ( )
Index: editors/codelite/patches/patch-Plugin_wxterminal.cpp
==================================================================
--- editors/codelite/patches/patch-Plugin_wxterminal.cpp
+++ editors/codelite/patches/patch-Plugin_wxterminal.cpp
@@ -1,26 +1,26 @@
$NetBSD: patch-Plugin_wxterminal.cpp,v 1.1 2016/06/15 22:04:17 kamil Exp $
Add switch for NetBSD to not fall under "other OS".
---- Plugin/wxterminal.cpp.orig 2016-01-30 10:49:18.000000000 +0000
+--- Plugin/wxterminal.cpp.orig 2019-05-21 17:52:21.000000000 +0300
+++ Plugin/wxterminal.cpp
-@@ -39,7 +39,7 @@
+@@ -45,7 +45,7 @@
#define SHELL_WRAPPER wxT("")
#else
-#if defined(__WXMAC__) || defined(__FreeBSD__)
+#if defined(__WXMAC__) || defined(__FreeBSD__) || defined(__NetBSD__)
#include <sys/wait.h>
#else
#include <wait.h>
-@@ -55,6 +55,10 @@
+@@ -61,6 +61,10 @@
+ #include <libutil.h>
#include <sys/ioctl.h>
#include <termios.h>
- #include <libutil.h>
+#elif defined(__NetBSD__)
++#include <util.h>
+#include <sys/ioctl.h>
+#include <termios.h>
-+#include <util.h>
#else
#include <pty.h>
#endif
DELETED editors/codelite/patches/patch-codelite__terminal_MainFrame.cpp
Index: editors/codelite/patches/patch-codelite__terminal_MainFrame.cpp
==================================================================
--- editors/codelite/patches/patch-codelite__terminal_MainFrame.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-codelite__terminal_MainFrame.cpp,v 1.1 2016/06/15 22:04:17 kamil Exp $
-
-Add switch for NetBSD to not fall under "other OS".
-
---- codelite_terminal/MainFrame.cpp.orig 2016-01-30 10:49:18.000000000 +0000
-+++ codelite_terminal/MainFrame.cpp
-@@ -16,6 +16,11 @@
- #include <sys/ioctl.h>
- #include <termios.h>
- #include <libutil.h>
-+#elif defined(__NetBSD__)
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <util.h>
- #elif defined(__WXGTK__)
- #include <pty.h>
- #else
ADDED editors/codelite/patches/patch-codelite__terminal_TextView.cpp
Index: editors/codelite/patches/patch-codelite__terminal_TextView.cpp
==================================================================
--- editors/codelite/patches/patch-codelite__terminal_TextView.cpp
+++ editors/codelite/patches/patch-codelite__terminal_TextView.cpp
@@ -0,0 +1,41 @@
+
+--- codelite_terminal/TextView.cpp.orig 2019-05-21 17:52:21.000000000 +0300
++++ codelite_terminal/TextView.cpp
+@@ -12,7 +12,11 @@
+ 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 @@
+ {
+ #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 @@
+ #if USE_STC
+ m_ctrl->ClearAll();
+ m_ctrl->ClearDocumentStyle();
++#if wxCHECK_VERSION(3, 1, 1)
+ m_ctrl->StartStyling(0);
+-#endif
+-}
++#else
++ m_ctrl->StartStyling(0, 0x1f);
++#endif
++#endif
++}
+
DELETED editors/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp
Index: editors/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp
==================================================================
--- editors/codelite/patches/patch-codelite__terminal_unixprocess__impl.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-codelite__terminal_unixprocess__impl.cpp,v 1.1 2016/06/15 22:04:17 kamil Exp $
-
-Add switch for NetBSD to not fall under "other OS".
-
---- codelite_terminal/unixprocess_impl.cpp.orig 2016-01-30 10:49:18.000000000 +0000
-+++ codelite_terminal/unixprocess_impl.cpp
-@@ -18,6 +18,10 @@
- # include <sys/ioctl.h>
- # include <termios.h>
- # include <libutil.h>
-+#elif defined(__NetBSD__)
-+# include <sys/ioctl.h>
-+# include <termios.h>
-+# include <util.h>
- #else
- # include <pty.h>
- # include <utmp.h>
Index: editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c
==================================================================
--- editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c
+++ editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c
@@ -1,10 +1,10 @@
$NetBSD: patch-sdk_codelite__indexer_libctags_read.c,v 1.1 2016/06/15 22:04:17 kamil Exp $
Handle fpos_t on NetBSD.
---- sdk/codelite_indexer/libctags/read.c.orig 2016-01-30 10:49:18.000000000 +0000
+--- sdk/codelite_indexer/libctags/read.c.orig 2019-05-21 17:52:21.000000000 +0300
+++ sdk/codelite_indexer/libctags/read.c
@@ -605,6 +605,9 @@ extern int readChars (char *buffer, size
#if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__)
if(location < 0)
return 0;
Index: editors/codelite/patches/patch-sdk_codelite__indexer_network_np__connections__server.cpp
==================================================================
--- editors/codelite/patches/patch-sdk_codelite__indexer_network_np__connections__server.cpp
+++ editors/codelite/patches/patch-sdk_codelite__indexer_network_np__connections__server.cpp
@@ -1,12 +1,12 @@
$NetBSD: patch-sdk_codelite__indexer_network_np__connections__server.cpp,v 1.1 2016/06/19 23:01:33 joerg Exp $
---- sdk/codelite_indexer/network/np_connections_server.cpp.orig 2016-06-19 20:52:21.634007785 +0000
+--- sdk/codelite_indexer/network/np_connections_server.cpp.orig 2019-05-21 17:52:21.000000000 +0300
+++ sdk/codelite_indexer/network/np_connections_server.cpp
@@ -29,6 +29,7 @@
#ifndef __WXMSW__
# include <sys/types.h>
# include <sys/socket.h>
+# include <sys/time.h>
# include <sys/un.h>
# include <stdio.h>
#else
DELETED editors/codelite/patches/patch-sdk_wxsqlite3_configure
Index: editors/codelite/patches/patch-sdk_wxsqlite3_configure
==================================================================
--- editors/codelite/patches/patch-sdk_wxsqlite3_configure
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-sdk_wxsqlite3_configure,v 1.1 2016/06/15 22:04:17 kamil Exp $
-
-Fix shell portability issue.
-
---- sdk/wxsqlite3/configure.orig 2016-01-30 10:49:18.000000000 +0000
-+++ sdk/wxsqlite3/configure
-@@ -5717,7 +5717,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
- SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
- fi
-
-- if test "x$GCC" == "xyes"; then
-+ if test "x$GCC" = "xyes"; then
- PIC_FLAG="-dynamic -fPIC"
- fi
- if test "x$XLCC" = "xyes"; then
-@@ -8045,6 +8045,3 @@ echo "$as_me: error:
- echo " Now, just run make."
- echo " ----------------------------------------------------------------"
- echo
--
--
--
>Release-Note:
>Audit-Trail:
From: Andrius V <vezhlys@gmail.com>
To: gnats-bugs@netbsd.org, tech-pkg@netbsd.org, pkgsrc-bugs@netbsd.org,
pkg-manager@netbsd.org, gnats-admin@netbsd.org
Cc:
Subject: Re: pkg/54412: Patch for codelite 13.0
Date: Sun, 4 Aug 2019 00:05:41 +0300
Hello,
Since I got access to pkgsrc-wip and I pushed full codelite package
with my changes included:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commit;h=208c0f21545bbe6ac5a16059ad562e993b965953.
Please review and test. It should be ready and working. Thank you.
Regards,
Andrius V
On Sat, Jul 27, 2019 at 1:50 PM <gnats-admin@netbsd.org> wrote:
>
> Thank you very much for your problem report.
> It has the internal identification `pkg/54412'.
> The individual assigned to look at your
> report is: pkg-manager.
>
> >Category: pkg
> >Responsible: pkg-manager
> >Synopsis: Patch for codelite 13.0
> >Arrival-Date: Sat Jul 27 10:50:00 +0000 2019
>
From: maya@NetBSD.org
To: Andrius V <vezhlys@gmail.com>
Cc: gnats-bugs@netbsd.org, tech-pkg@netbsd.org
Subject: Re: pkg/54412: Patch for codelite 13.0
Date: Sat, 17 Aug 2019 12:44:20 +0000
Hi Andrius,
This package fails with PKG_DEVELOPER=yes. First for some use of == in a
configure script that might not be in use, then for:
ERROR: [check-interpreter.mk] The interpreter "/usr/bin/env" of "/cvs/pkgsrc/editors/codelite/work/.destdir/usr/pkg/bin/codelite-lsp-helper" is not allowed.
ERROR: [check-interpreter.mk] The interpreter "/usr/bin/python" of "/cvs/pkgsrc/editors/codelite/work/.destdir/usr/pkg/bin/codelite_open_helper.py" does not exist.
The fix is more REPLACE_PYTHON / whatever devel/yarn is doing to replace
nodejs.
I would do this, but it looks like codelite doesn't depend on python, so
I'm confused. Does it need python?
----------
p.s. codelite seems to open a web server at 127.0.0.1:random port, it
should really use CSRF protection!
https://en.wikipedia.org/wiki/Cross-site_request_forgery
From: maya@NetBSD.org
To: Andrius V <vezhlys@gmail.com>
Cc: gnats-bugs@netbsd.org, tech-pkg@netbsd.org
Subject: Re: pkg/54412: Patch for codelite 13.0
Date: Sat, 17 Aug 2019 13:14:14 +0000
On Sat, Aug 17, 2019 at 12:44:20PM +0000, maya@NetBSD.org wrote:
>
> p.s. codelite seems to open a web server at 127.0.0.1:random port, it
> should really use CSRF protection!
> https://en.wikipedia.org/wiki/Cross-site_request_forgery
NVM, it's not a web server, so that might be forge a request from a web
browser.
From: Andrius V <vezhlys@gmail.com>
To: gnats-bugs@netbsd.org
Cc: pkg-manager@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org
Subject: Re: pkg/54412: Patch for codelite 13.0
Date: Sat, 17 Aug 2019 22:31:13 +0300
Hi,
I don't the reason for the script, but I guess it didn't fail to me
since I usually have python installed by other dependencies. Need to
verify if it's a requirement for codelite now. This script is
relatively new in codelite code base (from 2018).
Regards,
Andrius V
On Sat, Aug 17, 2019 at 4:15 PM <maya@netbsd.org> wrote:
>
> The following reply was made to PR pkg/54412; it has been noted by GNATS.
>
> From: maya@NetBSD.org
> To: Andrius V <vezhlys@gmail.com>
> Cc: gnats-bugs@netbsd.org, tech-pkg@netbsd.org
> Subject: Re: pkg/54412: Patch for codelite 13.0
> Date: Sat, 17 Aug 2019 13:14:14 +0000
>
> On Sat, Aug 17, 2019 at 12:44:20PM +0000, maya@NetBSD.org wrote:
> >
> > p.s. codelite seems to open a web server at 127.0.0.1:random port, it
> > should really use CSRF protection!
> > https://en.wikipedia.org/wiki/Cross-site_request_forgery
>
> NVM, it's not a web server, so that might be forge a request from a web
> browser.
>
From: "Maya Rashish" <maya@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/54412 CVS commit: pkgsrc/editors/codelite
Date: Sun, 18 Aug 2019 03:48:44 +0000
Module Name: pkgsrc
Committed By: maya
Date: Sun Aug 18 03:48:44 UTC 2019
Modified Files:
pkgsrc/editors/codelite: Makefile PLIST distinfo
pkgsrc/editors/codelite/patches: patch-CodeLite_CMakeLists.txt
patch-CodeLite_unixprocess__impl.cpp
patch-LiteEditor_CMakeLists.txt patch-Plugin_CMakeLists.txt
patch-Plugin_wxterminal.cpp
patch-sdk_codelite__indexer_libctags_read.c
patch-sdk_codelite__indexer_network_np__connections__server.cpp
Added Files:
pkgsrc/editors/codelite/patches: patch-codelite__terminal_TextView.cpp
Log Message:
codelite: update to 13.0
Patch by Andrius V in PR pkg/54412.
Release notes for CodeLite 9.2, 10.0, 11.0 unavailable.
CodeLite 13.0:
Improvements
Make alphabetical sorting of the Notebook tabs' dropdown menu optional from settings->preferences->windows & tabs
Remove the Trace output tab. Instead of the Trace tab, all the log messages are now redirected to CodeLite log file ~/.codelite/codelite.log
Spell checker plugin "Continuous" mode is now persistent between runs
Make Ctrl-C over an empty line copying the entire line optional
spellcheck: a bit more false positive reduction in continuous mode
Navigation bar: allow the user to place it below or above the editor control
(feature request) Show number of chars and/or bytes in text selection in the footer
(feature request) Add possibility for renaming folders
lldb: added run-to-caret and jump-to-caret.
lldb: added option to dislay thread name to threads pane
lldb: added add watch context menu in editor and remove watch context menu in locals view
lldb: expanded locals recursively and don't re-expand previously collapsed items
lldb: added a thread context menu with suspend/resume.
lldb: quickly add inner class members into the watch view
lldb: support changing the display format (similar to gdb)
Make the Ctrl-TAB and Ctrl-Shift-TAB configurable
Feature Request: move editor tab left/right functionality
subversion plugin : cannot handle unversioned files
Feature request: Find In Files: all files relative from workspace (and down)
wxCrafter: added support for subclassing wxToolBar and wxAuiToolBar
New Notebook style was added
Detach Editor now allows to DnD editors from the main notebook to the detached frame
Database explorer UI revamped
Support customizing the captions colours
Added syntax highlight for Dockerfile
New plugin: Docker, now edit build and execute Docker containers from CodeLite
ToolBar: support customisation (choose which tools are displayed)
CodeLite is now more friendly with the dark themes
Use new controls for trees and table based views
Allow building a header file (by compiling its CXX counterpart)
Don't execute post build commands when compiling a single file
Adjust doxygen settings when using /*!
Make CodeLite compile and run against GTK3
CodeLite is now built for macOS mojave and is looking great under the dark theme
All bitmaps were replaced with a consistent clear bitmaps (two sets created: for dark and normal themes)
Terminal support in CodeLite simplified. There is a single location where you can choose which terminal (from a predefined list of terminals) to use, this selection now affects all terminals launched by CodeLite
macOS: support for iTerm2
wxCrafter: support wxMiniFrame
WebTools plugin: Node.js debugger re-written to support newer versions of Node.js (The Node.js project changed the debugger protocol)
The debugger toolbar is now a floating toolbar that shows when debug session starts
No more splash screen
Find in Files dialog feature req
It is now possible to perform find in files in the SFTP tree view
CppCheck updated to version 1.85
CodeLite now accepts folder path as a command line argument and opens it in the "Explorer" view. If a workspace file exists in the path given, the workspace is loaded instead of opening the folder
Opening the Find-in-Files dialog while the focus is set to the C++ workspace view will cause the Find-In-Files to search in the selected items only (files, projects, virtual folders and workspace)
Support document code completion (i.e. hitting Ctrl-Space in a block comment will suggest the various document keywords (e.g. @param @brief etc.)
NodeJS debugger: added the ability to copy the backtrace into the clipboard
Implement PHP comments fold
Added support to Language Servers
Find In Files: the Look In and File mask fields are now kept and loaded per workspace type. Sensible defaults are used per workspace
Find In Files: the Look In field is now a free text field
Language Server plugin: auto restart the LSP once new compile_commands.json is generated
New plugin: EOSWiki - support blockchain development using EOSIO
Find In Files: allow to exclude folder from the search by using wild card syntax. For example, to exclude all content from node_modules folder, you can add to the Look In field this line:
-*node_modules*
Better dark theme support for OS with no dark theme
CodeLite diff plugin: support folders diff Ctrl-Alt-F by default.
Added support for pinned projects view. A pinned projects gives a quick access to the project context menu without the need to search for the project item in the C++ workspace view
Bugs
Files opened via the SFTP no longer displays the "cloud" icon
Allow spell checker plugin to work with multiple CodeLite instances
Fixed: Ctrl-Shift-P -> Svn Commit does not work
Fixed: Checking "Use Codelite's built-in terminal emulator" requires uninstall/reinstall
Fixed: crash when editing keyboard shortcut
Fixed: Doxygen tweaks use wrong line ending
Fixed: OSX: at times, the nodejs debugger did not start
Copy & paste functions in SVN Commit dialog are not available
Right clicking on vdir with physical one does not default new template wizard to that directory
New Class and New Template Wizard do not enforce same filename case
wxCrafter: Fixed: when using in frame mode, make sure that all dialogs shown from wxC, are parented to this main frame and not CodeLite's one
wxCrafter: Fixed: Top level windows (Frame, Dialog and Top level Panel) did not honor the common properties (bg colour, fg coluor, hidden, focused and disabled state)
wxCrafter: Fixed: When in frame mode, use CodeLite' wxAUI docking art for UI persistency
wxCrafter: Fixed: All generated files are now formatted according to CodeLite's formatter settings
wxCrafter: Fixed: Honor the "Format Inherited Classes" setting property
Fixed: debugger arrays are displayed incorrectly in the Locals & Watches view
Fixed: code completion window is not positioned correctly on multiple screens with different resolutions
Fixed: unable to select virtual directory in various wxCrafter dialogs
When starting CodeLite from the command line with a file name as input, don't show the welcome page
Fixed: creating a C++ workspace by dragging a folder from the file manager does not work if the folder has special chars in it's name
Fixed: Memcheck generates malformed XML file path, cannot create file and fails to start
Fixed: codelite-make broken
Fixed: CMake plugin regression (missing double quotes in the generated link_directory entries)
CodeLite 12.0:
Improvements:
(11.0.2) Support C++11 template syntax, e.g. std::vector<std::pair<int, int>> myVec; (notice the missing space in the closing angle brackets)
(11.0.2) C++: New: added the ability to add an existing project to a workspace folder
(11.0.2) C++: better and improved locals and classes syntax highlight colouring
(11.0.2) Abbreviations plugin: the abbreviations are now part of the default code completion box and do not require a custom keyboard shortcut
(11.0.2) NEW: SmartCompletions plugin:
Collect code completion statistics from your coding
Alter the code completion box entries to show the most used methods/classes first, e.g. if you often use wxString::Contains then CodeLite will ensure that Contains will be displayed at the top of the code completion suggestions list:
wxString str;
str. // "Contains" method will be the first entry in the code completion box
(11.0.2) UnitTest++ plugin: usability improved
(11.0.3) C++ code completion parser: distinguish between strong enums and regular enums (enum class Foo : long {} vs enum Foo {})
(11.0.3) Colour embedded JavaScript within PHP/HTML document
(11.0.3) Support C++11 strong enums ( enum class Foo : int {} )
(11.0.3) Welcome Wizard: simplified the wizard pages
(11.0.3) Added new "Developer Profile" settings to CodeLite
(11.0.3) Added new "Dark One" colour theme
(11.0.3) Exporting colour settings now lets you choose which theme(s) to export
(11.0.4) Windows: import PuTTY sessions into CodeLite's SFTP view
(11.0.4) When switching to a non C++ workspace, auto-hide all C++ related tabs (e.g. wxCrafter, CMake etc). The tabs are restored when the workspace is closed
(11.0.5) Added support for debugger-step-into-instruction command (GDB)
(11.0.5) Implemented "Goto Anywhere", you can now access most of CodeLite actions with a single keyboard click Ctrl-Shift-P
(11.0.6) C++ open resource dialog: support fuzzy search for symbols as well as for file names
(11.0.6) PHP open resource dialog: support fuzzy search for symbols as well as for file names
(11.0.6) C++ workspace view: improved UI loading. The tree view is now built on demand and loaded on startup. Find in files should feel faster
(11.0.6) Navigation bar re-written
(11.0.7) Support ligature fonts on Windows
(11.0.7) Better Hi-DPI support on Linux
(11.0.7) wxCrafter: support wxDataViewColumn flags
(11.0.7) PHP: Allow moving files between folders using drag and drop
(11.0.8) (feature request) Add option to disable 'jumping' in explorer tree when selecting/closing another tab
(11.0.8) (feature request) Refresh subfolder or automatically detect new folders/files in explorer view
(11.0.8) SFTP: Clicking on the "Connect" or "Open Terminal" button will now launch the "Quick Connect" dialog which offers the user to either connect to an existing account, or to use the "quick connect" feature (connect without first creating an account)
(11.0.8) SFTP enhancement and fixes
(11.0.8) Tabgroups now come in two 'namespaces': Global and Workspace. Workspace ones are specific to the currently-loaded workspace. Global ones are always shown, even when no workspace is loaded.
(11.0.8) Svn plugin: added toolbar buttons for the 3 common actions: commit revert and update
(11.0.8) Git plugin: removed the tree view and use a standard table view instead
(11.0.8) Svn plugin: removed the tree view and use a standard table view instead
(11.0.8) codelite-make : when custom build is used enabled for the project, create the working directory before starting the build
Bugs
(11.0.2) C++: remove project from "workspace-folder" is broken (the XML file was not updated)
(11.0.3) Fixed regression in Outline view tab: the context menu does not work
(11.0.3) Problem with highlight html+php
(11.0.3) Code completion fails to recognize enum members on lines
(11.0.3) Export single lexer colour and font
(11.0.3) Fixed: "Tasks" panel crash when used in a non C++ workspace
(11.0.3) Fixed: Unable to debug with LLDB under OSX
(11.0.3) code completion doesn't show abbreviations without finding other kinds of key words
(11.0.4) Horizontal tabs don't get displayed
(11.0.4) Fixed: Ctrl-SPACE keybinding is broken in 11.0.3
(11.0.5) Code snippets appear in object's completion list
(11.0.5) main() can't be recognized in <global> region
(11.0.5) Adding new Workspace Build Configuration adds duplicate entries
(11.0.5) "Exclude from build" grey filename color not remembered across restarts
(11.0.7) File deletion and re-naming don't get mirrored via remote workspace
(11.0.7) PHP documentation popup is cut
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/editors/codelite/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/codelite/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/codelite/distinfo
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/editors/codelite/patches/patch-CodeLite_CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp \
pkgsrc/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt \
pkgsrc/editors/codelite/patches/patch-Plugin_CMakeLists.txt \
pkgsrc/editors/codelite/patches/patch-Plugin_wxterminal.cpp \
pkgsrc/editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c \
pkgsrc/editors/codelite/patches/patch-sdk_codelite__indexer_network_np__connections__server.cpp
cvs rdiff -u -r0 -r1.1 \
pkgsrc/editors/codelite/patches/patch-codelite__terminal_TextView.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->closed
State-Changed-By: maya@NetBSD.org
State-Changed-When: Sun, 18 Aug 2019 03:56:26 +0000
State-Changed-Why:
Applied, thanks for the patch!
This package sure has a confusing set of dependencies. I could see it running cmake when I tried to launch it?? !!
But it's not worse, so committed! :-)
From: Andrius V <vezhlys@gmail.com>
To: gnats-bugs@netbsd.org
Cc: pkg-manager@netbsd.org, pkgsrc-bugs@netbsd.org, gnats-admin@netbsd.org,
maya@netbsd.org
Subject: Re: pkg/54412 (Patch for codelite 13.0)
Date: Tue, 27 Aug 2019 15:00:53 +0300
Hi,
Thanks for commit, I just want to note that some patches became
obsolete after update, however, you left them in the code. It doesn't
affect the build except warning messages that those files are ignored
during patching process. These files can be deleted:
patch-CMakeLists.txt
patch-codelite__terminal_MainFrame.cpp
patch-codelite__terminal_unixprocess__impl.cpp
patch-sdk_wxsqlite3_configure
On Sun, Aug 18, 2019 at 6:56 AM <maya@netbsd.org> wrote:
>
> Synopsis: Patch for codelite 13.0
>
> State-Changed-From-To: open->closed
> State-Changed-By: maya@NetBSD.org
> State-Changed-When: Sun, 18 Aug 2019 03:56:26 +0000
> State-Changed-Why:
> Applied, thanks for the patch!
> This package sure has a confusing set of dependencies. I could see it running cmake when I tried to launch it?? !!
> But it's not worse, so committed! :-)
>
>
>
From: Thomas Klausner <wiz@NetBSD.org>
To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
Cc:
Subject: Re: pkg/54412 (Patch for codelite 13.0)
Date: Tue, 27 Aug 2019 14:08:34 +0200
Thanks! I've removed the files.
pkglint has some warnings/errors about the package:
WARN: PLIST:310: Man pages should be installed into man/, not share/man/.
WARN: PLIST:311: Man pages should be installed into man/, not share/man/.
WARN: PLIST:312: Man pages should be installed into man/, not share/man/.
ERROR: patches/patch-codelite__terminal_TextView.cpp:3: Each patch must be documented.
ERROR: patches/patch-sdk_codelite__indexer_network_np__connections__server.cpp:3: Each patch must be documented.
Can you please take a look at fixing them?
Thanks,
Thomas
On Tue, Aug 27, 2019 at 03:00:53PM +0300, Andrius V wrote:
> Hi,
>
> Thanks for commit, I just want to note that some patches became
> obsolete after update, however, you left them in the code. It doesn't
> affect the build except warning messages that those files are ignored
> during patching process. These files can be deleted:
>
> patch-CMakeLists.txt
> patch-codelite__terminal_MainFrame.cpp
> patch-codelite__terminal_unixprocess__impl.cpp
> patch-sdk_wxsqlite3_configure
>
> On Sun, Aug 18, 2019 at 6:56 AM <maya@netbsd.org> wrote:
> >
> > Synopsis: Patch for codelite 13.0
> >
> > State-Changed-From-To: open->closed
> > State-Changed-By: maya@NetBSD.org
> > State-Changed-When: Sun, 18 Aug 2019 03:56:26 +0000
> > State-Changed-Why:
> > Applied, thanks for the patch!
> > This package sure has a confusing set of dependencies. I could see it running cmake when I tried to launch it?? !!
> > But it's not worse, so committed! :-)
> >
> >
> >
>
From: Andrius V <vezhlys@gmail.com>
To: gnats-bugs@netbsd.org
Cc: pkg-manager@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org
Subject: Re: pkg/54412 (Patch for codelite 13.0)
Date: Tue, 27 Aug 2019 17:12:59 +0300
--0000000000005fd492059119df17
Content-Type: text/plain; charset="UTF-8"
Hi,
I added description to patches (attached the patch) but I am not sure
how to change share/man to man. Is there any example on how I can
change it?
Regards,
Andrius V
On Tue, Aug 27, 2019 at 3:10 PM Thomas Klausner <wiz@netbsd.org> wrote:
>
> The following reply was made to PR pkg/54412; it has been noted by GNATS.
>
> From: Thomas Klausner <wiz@NetBSD.org>
> To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
> Cc:
> Subject: Re: pkg/54412 (Patch for codelite 13.0)
> Date: Tue, 27 Aug 2019 14:08:34 +0200
>
> Thanks! I've removed the files.
>
> pkglint has some warnings/errors about the package:
>
> WARN: PLIST:310: Man pages should be installed into man/, not share/man/.
> WARN: PLIST:311: Man pages should be installed into man/, not share/man/.
> WARN: PLIST:312: Man pages should be installed into man/, not share/man/.
> ERROR: patches/patch-codelite__terminal_TextView.cpp:3: Each patch must be documented.
> ERROR: patches/patch-sdk_codelite__indexer_network_np__connections__server.cpp:3: Each patch must be documented.
>
> Can you please take a look at fixing them?
>
> Thanks,
> Thomas
>
> On Tue, Aug 27, 2019 at 03:00:53PM +0300, Andrius V wrote:
> > Hi,
> >
> > Thanks for commit, I just want to note that some patches became
> > obsolete after update, however, you left them in the code. It doesn't
> > affect the build except warning messages that those files are ignored
> > during patching process. These files can be deleted:
> >
> > patch-CMakeLists.txt
> > patch-codelite__terminal_MainFrame.cpp
> > patch-codelite__terminal_unixprocess__impl.cpp
> > patch-sdk_wxsqlite3_configure
> >
> > On Sun, Aug 18, 2019 at 6:56 AM <maya@netbsd.org> wrote:
> > >
> > > Synopsis: Patch for codelite 13.0
> > >
> > > State-Changed-From-To: open->closed
> > > State-Changed-By: maya@NetBSD.org
> > > State-Changed-When: Sun, 18 Aug 2019 03:56:26 +0000
> > > State-Changed-Why:
> > > Applied, thanks for the patch!
> > > This package sure has a confusing set of dependencies. I could see it running cmake when I tried to launch it?? !!
> > > But it's not worse, so committed! :-)
> > >
> > >
> > >
> >
>
--0000000000005fd492059119df17
Content-Type: text/x-patch; charset="US-ASCII"; name="patch_descriptions.patch"
Content-Disposition: attachment; filename="patch_descriptions.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_jztw7kze0>
X-Attachment-Id: f_jztw7kze0
SW5kZXg6IGVkaXRvcnMvY29kZWxpdGUvZGlzdGluZm8KPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBlZGl0b3JzL2Nv
ZGVsaXRlL2Rpc3RpbmZvCisrKyBlZGl0b3JzL2NvZGVsaXRlL2Rpc3RpbmZvCkBAIC03LDggKzcs
OCBAQAogU0hBMSAocGF0Y2gtQ29kZUxpdGVfQ01ha2VMaXN0cy50eHQpID0gZDBlMzBjZTQwOTc0
NmQxNjZjM2YwNTA4MzQxMTY2MjNmNDJlMmIzMQogU0hBMSAocGF0Y2gtQ29kZUxpdGVfdW5peHBy
b2Nlc3NfX2ltcGwuY3BwKSA9IGJhNDk3ZDJkZDM4M2YzOGMwNDA1ZGY0NTY2MWNlMmEyOWYzOGNk
YzMKIFNIQTEgKHBhdGNoLUxpdGVFZGl0b3JfQ01ha2VMaXN0cy50eHQpID0gMWI1NTk0NTc3OWY2
MmJjOWU0ZDBhMWVlNGFiOWVhNmU1YjQ0ZjE5OQogU0hBMSAocGF0Y2gtUGx1Z2luX0NNYWtlTGlz
dHMudHh0KSA9IDI5YzQ4NTlhNjA5MmU2ZDAyNTIyMGRmNDUxOTljOTBhOTNiNmM4NjIKIFNIQTEg
KHBhdGNoLVBsdWdpbl93eHRlcm1pbmFsLmNwcCkgPSA0YTg2NjQwYjZmYzUzMmVhYjkzZDJmOTc5
MzRiNjcyZDg3MTQwYjA2Ci1TSEExIChwYXRjaC1jb2RlbGl0ZV9fdGVybWluYWxfVGV4dFZpZXcu
Y3BwKSA9IDRkOTM2NTkxNDRlY2Y0NzgwYTA5YTAzOTE2NWQxNzJiYzRiYzg3YTcKK1NIQTEgKHBh
dGNoLWNvZGVsaXRlX190ZXJtaW5hbF9UZXh0Vmlldy5jcHApID0gNTdlMGViNTVlZjBmMmNiMjdm
NDRmMGRkNTRlNTBjZDE0ZjZiZTFjMwogU0hBMSAocGF0Y2gtc2RrX2NvZGVsaXRlX19pbmRleGVy
X2xpYmN0YWdzX3JlYWQuYykgPSA5YzllMTY2ZGJmODk1YmI3NDYxOTQ1NDdlOWIwYmVhOTlkYjE0
OTI2Ci1TSEExIChwYXRjaC1zZGtfY29kZWxpdGVfX2luZGV4ZXJfbmV0d29ya19ucF9fY29ubmVj
dGlvbnNfX3NlcnZlci5jcHApID0gOThmOGNiYTM1OTcwMzVjNzllYmZiNjBiYTVkNjlhMjdjMDJj
NzRlNAorU0hBMSAocGF0Y2gtc2RrX2NvZGVsaXRlX19pbmRleGVyX25ldHdvcmtfbnBfX2Nvbm5l
Y3Rpb25zX19zZXJ2ZXIuY3BwKSA9IDU5MDZlNGExYTI5NWIyNjA4MzNlYTlkNDk5YTNiNDJkNWU4
YjA0YzMKCkluZGV4OiBlZGl0b3JzL2NvZGVsaXRlL3BhdGNoZXMvcGF0Y2gtY29kZWxpdGVfX3Rl
cm1pbmFsX1RleHRWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGVkaXRvcnMvY29kZWxpdGUvcGF0Y2hl
cy9wYXRjaC1jb2RlbGl0ZV9fdGVybWluYWxfVGV4dFZpZXcuY3BwCisrKyBlZGl0b3JzL2NvZGVs
aXRlL3BhdGNoZXMvcGF0Y2gtY29kZWxpdGVfX3Rlcm1pbmFsX1RleHRWaWV3LmNwcApAQCAtMSw2
ICsxLDggQEAKICROZXRCU0Q6IHBhdGNoLWNvZGVsaXRlX190ZXJtaW5hbF9UZXh0Vmlldy5jcHAs
diAxLjEgMjAxOS8wOC8xOCAwMzo0ODo0NCBtYXlhIEV4cCAkCisKK0NvbXBpbGF0aW9uIGZpeCBm
b3Igd3gzLjAgZ3RrKzMgYnVpbGRzLgogCiAtLS0gY29kZWxpdGVfdGVybWluYWwvVGV4dFZpZXcu
Y3BwLm9yaWcgICAyMDE5LTA1LTIxIDE3OjUyOjIxLjAwMDAwMDAwMCArMDMwMAogKysrIGNvZGVs
aXRlX3Rlcm1pbmFsL1RleHRWaWV3LmNwcAogQEAgLTEyLDcgKzEyLDExIEBACiAgICAgIG1fY3Ry
bC0+U2V0Q2FyZXRTdHlsZSh3eFNUQ19DQVJFVFNUWUxFX0JMT0NLKTsKCkluZGV4OiBlZGl0b3Jz
L2NvZGVsaXRlL3BhdGNoZXMvcGF0Y2gtc2RrX2NvZGVsaXRlX19pbmRleGVyX25ldHdvcmtfbnBf
X2Nvbm5lY3Rpb25zX19zZXJ2ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZWRpdG9ycy9jb2RlbGl0ZS9w
YXRjaGVzL3BhdGNoLXNka19jb2RlbGl0ZV9faW5kZXhlcl9uZXR3b3JrX25wX19jb25uZWN0aW9u
c19fc2VydmVyLmNwcAorKysgZWRpdG9ycy9jb2RlbGl0ZS9wYXRjaGVzL3BhdGNoLXNka19jb2Rl
bGl0ZV9faW5kZXhlcl9uZXR3b3JrX25wX19jb25uZWN0aW9uc19fc2VydmVyLmNwcApAQCAtMSw2
ICsxLDggQEAKICROZXRCU0Q6IHBhdGNoLXNka19jb2RlbGl0ZV9faW5kZXhlcl9uZXR3b3JrX25w
X19jb25uZWN0aW9uc19fc2VydmVyLmNwcCx2IDEuMiAyMDE5LzA4LzE4IDAzOjQ4OjQ0IG1heWEg
RXhwICQKKworRW5zdXJlIHJpZ2h0IGhlYWRlciBmb3IgdGltZXZhbCBpcyBpbmNsdWRlZC4KIAog
LS0tIHNkay9jb2RlbGl0ZV9pbmRleGVyL25ldHdvcmsvbnBfY29ubmVjdGlvbnNfc2VydmVyLmNw
cC5vcmlnCTIwMTktMDUtMjEgMTc6NTI6MjEuMDAwMDAwMDAwICswMzAwCiArKysgc2RrL2NvZGVs
aXRlX2luZGV4ZXIvbmV0d29yay9ucF9jb25uZWN0aW9uc19zZXJ2ZXIuY3BwCiBAQCAtMjksNiAr
MjksNyBAQAogICNpZm5kZWYgX19XWE1TV19fDQoK
--0000000000005fd492059119df17--
From: Thomas Klausner <wiz@NetBSD.org>
To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
Cc:
Subject: Re: pkg/54412 (Patch for codelite 13.0)
Date: Tue, 27 Aug 2019 16:33:15 +0200
On Tue, Aug 27, 2019 at 05:12:59PM +0300, Andrius V wrote:
> I added description to patches (attached the patch) but I am not sure
> how to change share/man to man. Is there any example on how I can
> change it?
Thanks for the patch.
Look for share/man in the CMakefile and add a SUBST block replacing it
with ${PKGMANDIR}.
Cheers,
Thomas
From: Andrius V <vezhlys@gmail.com>
To: gnats-bugs@netbsd.org
Cc: pkg-manager@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org
Subject: Re: pkg/54412 (Patch for codelite 13.0)
Date: Wed, 28 Aug 2019 11:56:15 +0300
--000000000000d8097105912990ec
Content-Type: text/plain; charset="UTF-8"
Hi,
Please see patch below for man location. My only concern that PLIST
will have static man location but Makefile will use ${PKGMANDIR}.
Should PLIST also be modified somehow?
Regards,
Andrius V
On Tue, Aug 27, 2019 at 5:35 PM Thomas Klausner <wiz@netbsd.org> wrote:
>
> The following reply was made to PR pkg/54412; it has been noted by GNATS.
>
> From: Thomas Klausner <wiz@NetBSD.org>
> To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
> Cc:
> Subject: Re: pkg/54412 (Patch for codelite 13.0)
> Date: Tue, 27 Aug 2019 16:33:15 +0200
>
> On Tue, Aug 27, 2019 at 05:12:59PM +0300, Andrius V wrote:
> > I added description to patches (attached the patch) but I am not sure
> > how to change share/man to man. Is there any example on how I can
> > change it?
>
> Thanks for the patch.
>
> Look for share/man in the CMakefile and add a SUBST block replacing it
> with ${PKGMANDIR}.
>
> Cheers,
> Thomas
>
--000000000000d8097105912990ec
Content-Type: text/x-patch; charset="US-ASCII"; name="man-location2.patch"
Content-Disposition: attachment; filename="man-location2.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_jzv0iars0>
X-Attachment-Id: f_jzv0iars0
SW5kZXg6IGVkaXRvcnMvY29kZWxpdGUvTWFrZWZpbGUKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBlZGl0b3JzL2Nv
ZGVsaXRlL01ha2VmaWxlCisrKyBlZGl0b3JzL2NvZGVsaXRlL01ha2VmaWxlCkBAIC0zNywxMCAr
MzcsMTYgQEAKIFNVQlNUX0ZJTEVTLmZpeC1iYXNoKz0JCUNvZGVMaXRlL2ZpbGVleHRtYW5hZ2Vy
LmNwcAogU1VCU1RfRklMRVMuZml4LWJhc2grPQkJUnVudGltZS9jb2RlbGl0ZV94dGVybQogU1VC
U1RfRklMRVMuZml4LWJhc2grPQkJY21ha2UvTW9kdWxlcy9PU1hJbnN0YWxsLmNtYWtlCiBTVUJT
VF9TRUQuZml4LWJhc2grPQkJLWUgJ3MsL2Jpbi9iYXNoLCR7QkFTSH0sZycKIAorU1VCU1RfQ0xB
U1NFUys9CQkJZml4LW1hbi1wYXRoCitTVUJTVF9TVEFHRS5maXgtbWFuLXBhdGg9CXByZS1jb25m
aWd1cmUKK1NVQlNUX01FU1NBR0UuZml4LW1hbi1wYXRoPQlGaXggbWFuIHBhdGgKK1NVQlNUX0ZJ
TEVTLmZpeC1tYW4tcGF0aD0JTGl0ZUVkaXRvci9DTWFrZUxpc3RzLnR4dAorU1VCU1RfU0VELmZp
eC1tYW4tcGF0aCs9CS1lICdzLCR7Q0xfUFJFRklYfS9zaGFyZS9tYW4sJHtDTF9QUkVGSVh9LyR7
UEtHTUFORElSfSxnJworCiBSRVBMQUNFX0JBU0grPQkJUnVudGltZS9jbGcrKwogUkVQTEFDRV9C
QVNIKz0JCVJ1bnRpbWUvY2xnY2MKIFJFUExBQ0VfQkFTSCs9CQlSdW50aW1lL2NvZGVsaXRlX3h0
ZXJtCiBSRVBMQUNFX0JBU0grPQkJY29kZWxpdGUtaWNvbnMtZGFyay9wYWNrLWljb25zLnNoCiBS
RVBMQUNFX0JBU0grPQkJY29kZWxpdGUtaWNvbnMtZnJlc2gtZmFybS9wYWNrLWljb25zLnNoCgpJ
bmRleDogZWRpdG9ycy9jb2RlbGl0ZS9QTElTVAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGVkaXRvcnMvY29kZWxp
dGUvUExJU1QKKysrIGVkaXRvcnMvY29kZWxpdGUvUExJU1QKQEAgLTU0LDEwICs1NCwxMyBAQAog
bGliL2NvZGVsaXRlL2xpYnBsdWdpbi5zbwogbGliL2NvZGVsaXRlL2xpYnd4c2hhcGVmcmFtZXdv
cmsuc28KIGxpYi9jb2RlbGl0ZS9saWJ3eHNxbGl0ZTMuc28KIGxpYi9jb2RlbGl0ZS93eENyYWZ0
ZXIuc28KIGxpYi9jb2RlbGl0ZS93eEZvcm1CdWlsZGVyLnNvCittYW4vbWFuMS9jb2RlbGl0ZS1t
YWtlLjEKK21hbi9tYW4xL2NvZGVsaXRlLjEKK21hbi9tYW4xL2NvZGVsaXRlX2ZpeF9maWxlcy4x
CiBzaGFyZS9hcHBsaWNhdGlvbnMvY29kZWxpdGUuZGVza3RvcAogc2hhcmUvY29kZWxpdGUvTElD
RU5TRQogc2hhcmUvY29kZWxpdGUvUEhQLnppcAogc2hhcmUvY29kZWxpdGUvYXN0eWxlLnNhbXBs
ZQogc2hhcmUvY29kZWxpdGUvY29kZWxpdGUtYml0bWFwcy1kYXJrLnppcApAQCAtMzA1LDggKzMw
OCw1IEBACiBzaGFyZS9pY29ucy9oaWNvbG9yLzY0eDY0L2FwcHMvY29kZWxpdGUucG5nCiBzaGFy
ZS9pY29ucy9oaWNvbG9yLzY0eDY0QDJ4L2FwcHMvY29kZWxpdGUucG5nCiBzaGFyZS9sb2NhbGUv
Y3MvTENfTUVTU0FHRVMvY29kZWxpdGUubW8KIHNoYXJlL2xvY2FsZS9ydV9SVS9MQ19NRVNTQUdF
Uy9jb2RlbGl0ZS5tbwogc2hhcmUvbG9jYWxlL3poX0NOL0xDX01FU1NBR0VTL2NvZGVsaXRlLm1v
Ci1zaGFyZS9tYW4vbWFuMS9jb2RlbGl0ZS1tYWtlLjEKLXNoYXJlL21hbi9tYW4xL2NvZGVsaXRl
LjEKLXNoYXJlL21hbi9tYW4xL2NvZGVsaXRlX2ZpeF9maWxlcy4xCgo=
--000000000000d8097105912990ec--
From: Thomas Klausner <wiz@NetBSD.org>
To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
Cc:
Subject: Re: pkg/54412 (Patch for codelite 13.0)
Date: Wed, 28 Aug 2019 11:09:42 +0200
On Wed, Aug 28, 2019 at 11:56:15AM +0300, Andrius V wrote:
> Please see patch below for man location. My only concern that PLIST
> will have static man location but Makefile will use ${PKGMANDIR}.
> Should PLIST also be modified somehow?
No, that's fine, pkgsrc handles that automatically.
Thank you, I've committed the patch!
Thomas
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.