pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors/codelite codelite: Update to 14.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/6a3d97a92a37
branches: trunk
changeset: 425693:6a3d97a92a37
user: nia <nia%pkgsrc.org@localhost>
date: Mon Mar 23 11:57:13 2020 +0000
description:
codelite: Update to 14.0
Based on PR pkg/55084
diffstat:
editors/codelite/Makefile | 40 +++-----
editors/codelite/PLIST | 3 +-
editors/codelite/distinfo | 20 +--
editors/codelite/patches/patch-CodeLite_CMakeLists.txt | 15 ---
editors/codelite/patches/patch-CodeLite_fileextmanager.cpp | 23 +++++
editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp | 17 ---
editors/codelite/patches/patch-LiteEditor_CMakeLists.txt | 17 ---
editors/codelite/patches/patch-Plugin_CMakeLists.txt | 15 ---
editors/codelite/patches/patch-Plugin_wxterminal.cpp | 26 ------
editors/codelite/patches/patch-codelite__terminal_TextView.cpp | 43 ----------
editors/codelite/patches/patch-sdk_codelite__indexer_libctags_read.c | 25 -----
editors/codelite/patches/patch-svgs_svgs-dark_create-logo.sh | 15 +++
editors/codelite/patches/patch-svgs_svgs-light_create-logo.sh | 15 +++
13 files changed, 79 insertions(+), 195 deletions(-)
diffs (truncated from 378 to 300 lines):
diff -r ae710f2924e4 -r 6a3d97a92a37 editors/codelite/Makefile
--- a/editors/codelite/Makefile Mon Mar 23 11:50:22 2020 +0000
+++ b/editors/codelite/Makefile Mon Mar 23 11:57:13 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2020/03/10 22:09:40 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2020/03/23 11:57:13 nia Exp $
-DISTNAME= codelite-13.0
-PKGREVISION= 4
+DISTNAME= codelite-14.0
CATEGORIES= editors x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=eranif/}
@@ -17,16 +16,16 @@
CMAKE_ARGS+= -DPREFIX:STRING=${PREFIX}
-# For some reason CMAKE_ARGS.NetBSD+=-DIS_NETBSD:STRING=1 doesn't work for me
.include "../../mk/bsd.prefs.mk"
# Likely needed because pango's pkgconfig CFLAGS aren't being applied.
CXXFLAGS+= -I${BUILDLINK_DIR}/include/harfbuzz
CHECK_PORTABILITY_SKIP+= sdk/wxsqlite3/configure
+CHECK_PORTABILITY_SKIP+= InnoSetup/output/finalize-upload.sh
+CHECK_PORTABILITY_SKIP+= wxcrafter/pack-osx.sh
.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
@@ -37,10 +36,17 @@
SUBST_CLASSES+= fix-bash
SUBST_STAGE.fix-bash= pre-configure
SUBST_MESSAGE.fix-bash= Fix bash path
-SUBST_FILES.fix-bash= CodeLite/TerminalEmulator.cpp
-SUBST_FILES.fix-bash+= CodeLite/fileextmanager.cpp
-SUBST_FILES.fix-bash+= Runtime/codelite_xterm
-SUBST_FILES.fix-bash+= cmake/Modules/OSXInstall.cmake
+SUBST_FILES.fix-bash+= codelite_terminal/wxTerminalCtrl.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_SED.fix-bash+= -e 's,/bin/bash,${BASH},g'
SUBST_CLASSES+= fix-man-path
@@ -49,27 +55,15 @@
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+= Runtime/clg++
-REPLACE_BASH+= Runtime/clgcc
-REPLACE_BASH+= Runtime/codelite_xterm
-REPLACE_BASH+= codelite-icons-dark/pack-icons.sh
-REPLACE_BASH+= codelite-icons-fresh-farm/pack-icons.sh
-REPLACE_BASH+= codelite-icons/pack-icons.sh
-REPLACE_BASH+= codelitephp/resources/pack-resources.sh
REPLACE_BASH+= make-weekly
-REPLACE_BASH+= svgs/code-completion/convert-svg-to-png.sh
-REPLACE_BASH+= svgs/convert-single-file.sh
-REPLACE_BASH+= svgs/convert-svg-to-png.sh
-REPLACE_BASH+= svgs/create-logo-root.sh
-REPLACE_BASH+= svgs/create-logo.sh
-REPLACE_BASH+= svgs/find-bar/convert-svg-to-png.sh
REPLACE_NODEJS+= LanguageServer/codelite-lsp/codelite-lsp-helper
REPLACE_PYTHON+= codelite_open_helper.py
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/codelite
+BUILDLINK_TRANSFORM+= opt:-std=c++11:-std=gnu++11 # alloca
+
.include "../../lang/nodejs/application.mk"
-.include "../../lang/nodejs/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff -r ae710f2924e4 -r 6a3d97a92a37 editors/codelite/PLIST
--- a/editors/codelite/PLIST Mon Mar 23 11:50:22 2020 +0000
+++ b/editors/codelite/PLIST Mon Mar 23 11:57:13 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2019/08/28 09:09:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/03/23 11:57:13 nia Exp $
bin/codelite
bin/codelite-cc
bin/codelite-echo
@@ -65,7 +65,6 @@
share/codelite/astyle.sample
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
diff -r ae710f2924e4 -r 6a3d97a92a37 editors/codelite/distinfo
--- a/editors/codelite/distinfo Mon Mar 23 11:50:22 2020 +0000
+++ b/editors/codelite/distinfo Mon Mar 23 11:57:13 2020 +0000
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.6 2019/08/27 14:45:04 wiz Exp $
+$NetBSD: distinfo,v 1.7 2020/03/23 11:57:13 nia Exp $
-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) = 13b5cafa6975c95c74d61f5a355e0c88d0f056cd
-SHA1 (patch-sdk_codelite__indexer_libctags_read.c) = 9c9e166dbf895bb746194547e9b0bea99db14926
+SHA1 (codelite-14.0.tar.gz) = 790b903016c628ad18e368aa3ec03a2240aa34ab
+RMD160 (codelite-14.0.tar.gz) = 34532c534d68c084aab0b4cdc326c0bf39ee9463
+SHA512 (codelite-14.0.tar.gz) = 6f8598deb206685ec1feb2923bfd00bf08a3f9a7e195049670b0b93c8405720dba58c02af7ab6de391d83f074bcac3f9b452b042956299e15ad21a9a0a98d967
+Size (codelite-14.0.tar.gz) = 63051086 bytes
+SHA1 (patch-CodeLite_fileextmanager.cpp) = 1eaf696d3bde907a635d767b3d022e1d92692087
SHA1 (patch-sdk_codelite__indexer_network_np__connections__server.cpp) = 5906e4a1a295b260833ea9d499a3b42d5e8b04c3
+SHA1 (patch-svgs_svgs-dark_create-logo.sh) = d794ca7bb16a248a7aead3ca30e6c9f16073e1a3
+SHA1 (patch-svgs_svgs-light_create-logo.sh) = 4b0d06911baf89636311cc10e7042f3a2b4f22b3
diff -r ae710f2924e4 -r 6a3d97a92a37 editors/codelite/patches/patch-CodeLite_CMakeLists.txt
--- a/editors/codelite/patches/patch-CodeLite_CMakeLists.txt Mon Mar 23 11:50:22 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-CodeLite_CMakeLists.txt,v 1.3 2019/08/18 03:48:44 maya Exp $
-
-Add switch for NetBSD to not fall under "other OS".
-
---- CodeLite/CMakeLists.txt.orig 2019-05-21 17:52:21.000000000 +0300
-+++ CodeLite/CMakeLists.txt
-@@ -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 ( )
diff -r ae710f2924e4 -r 6a3d97a92a37 editors/codelite/patches/patch-CodeLite_fileextmanager.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/codelite/patches/patch-CodeLite_fileextmanager.cpp Mon Mar 23 11:57:13 2020 +0000
@@ -0,0 +1,23 @@
+$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 -r ae710f2924e4 -r 6a3d97a92a37 editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp
--- a/editors/codelite/patches/patch-CodeLite_unixprocess__impl.cpp Mon Mar 23 11:50:22 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-CodeLite_unixprocess__impl.cpp,v 1.2 2019/08/18 03:48:44 maya Exp $
-
-Add switch for NetBSD to not fall under "other OS".
-
---- CodeLite/unixprocess_impl.cpp.orig 2019-05-21 17:52:21.000000000 +0300
-+++ CodeLite/unixprocess_impl.cpp
-@@ -50,6 +50,10 @@
- #include <libutil.h>
- #include <sys/ioctl.h>
- #include <termios.h>
-+#elif defined(__NetBSD__)
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <util.h>
- #else
- #include <pty.h>
- #include <utmp.h>
diff -r ae710f2924e4 -r 6a3d97a92a37 editors/codelite/patches/patch-LiteEditor_CMakeLists.txt
--- a/editors/codelite/patches/patch-LiteEditor_CMakeLists.txt Mon Mar 23 11:50:22 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-LiteEditor_CMakeLists.txt,v 1.2 2019/08/18 03:48:44 maya Exp $
-
-Add switch for NetBSD to not fall under "other OS".
-
-Fix path of installation of manpages.
-
---- LiteEditor/CMakeLists.txt.orig 2019-05-21 17:52:21.000000000 +0300
-+++ LiteEditor/CMakeLists.txt
-@@ -46,6 +46,8 @@ set( ADDITIONAL_LIBRARIES "" )
- if (UNIX)
- if ( IS_FREEBSD )
- set(ADDITIONAL_LIBRARIES "-lkvm")
-+ elseif ( IS_NETBSD )
-+ set(ADDTIONAL_LIBRARIES "-lutil")
- elseif ( UNIX AND NOT APPLE )
- set(ADDITIONAL_LIBRARIES "-ldl -lutil -lgobject-2.0")
- else ( )
diff -r ae710f2924e4 -r 6a3d97a92a37 editors/codelite/patches/patch-Plugin_CMakeLists.txt
--- a/editors/codelite/patches/patch-Plugin_CMakeLists.txt Mon Mar 23 11:50:22 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-Plugin_CMakeLists.txt,v 1.2 2019/08/18 03:48:44 maya Exp $
-
-Add switch for NetBSD to not fall under "other OS".
-
---- 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 "-lutil")
- elseif ( UNIX AND NOT APPLE )
- set(ADDITIONAL_LIBRARIES "-ldl -lutil")
- else ( )
diff -r ae710f2924e4 -r 6a3d97a92a37 editors/codelite/patches/patch-Plugin_wxterminal.cpp
--- a/editors/codelite/patches/patch-Plugin_wxterminal.cpp Mon Mar 23 11:50:22 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-Plugin_wxterminal.cpp,v 1.2 2019/08/18 03:48:44 maya Exp $
-
-Add switch for NetBSD to not fall under "other OS".
-
---- Plugin/wxterminal.cpp.orig 2019-05-21 17:52:21.000000000 +0300
-+++ Plugin/wxterminal.cpp
-@@ -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>
-@@ -61,6 +61,10 @@
- #include <libutil.h>
- #include <sys/ioctl.h>
- #include <termios.h>
-+#elif defined(__NetBSD__)
-+#include <util.h>
-+#include <sys/ioctl.h>
-+#include <termios.h>
- #else
- #include <pty.h>
- #endif
diff -r ae710f2924e4 -r 6a3d97a92a37 editors/codelite/patches/patch-codelite__terminal_TextView.cpp
--- a/editors/codelite/patches/patch-codelite__terminal_TextView.cpp Mon Mar 23 11:50:22 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-$NetBSD: patch-codelite__terminal_TextView.cpp,v 1.3 2019/08/27 14:45:04 wiz Exp $
-
-Compilation fix for wx3.0 gtk+3 builds.
-
---- 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
Home |
Main Index |
Thread Index |
Old Index