Received: by mail.netbsd.org (Postfix, from userid 605) id 45BD084DBB; Mon, 23 Mar 2020 11:57:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C095D84DB5 for ; Mon, 23 Mar 2020 11:57:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 648av6mE9t51 for ; Mon, 23 Mar 2020 11:57:13 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C30C384D40 for ; Mon, 23 Mar 2020 11:57:13 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AC97AFB27; Mon, 23 Mar 2020 11:57:13 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1584964633170550" MIME-Version: 1.0 Date: Mon, 23 Mar 2020 11:57:13 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/editors/codelite To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200323115713.AC97AFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1584964633170550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Mon Mar 23 11:57:13 UTC 2020 Modified Files: pkgsrc/editors/codelite: Makefile PLIST distinfo Added Files: pkgsrc/editors/codelite/patches: patch-CodeLite_fileextmanager.cpp patch-svgs_svgs-dark_create-logo.sh patch-svgs_svgs-light_create-logo.sh Removed Files: 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-codelite__terminal_TextView.cpp patch-sdk_codelite__indexer_libctags_read.c Log Message: codelite: Update to 14.0 Based on PR pkg/55084 To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 pkgsrc/editors/codelite/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/codelite/PLIST cvs rdiff -u -r1.6 -r1.7 pkgsrc/editors/codelite/distinfo cvs rdiff -u -r1.3 -r0 \ pkgsrc/editors/codelite/patches/patch-CodeLite_CMakeLists.txt \ pkgsrc/editors/codelite/patches/patch-codelite__terminal_TextView.cpp cvs rdiff -u -r0 -r1.1 \ pkgsrc/editors/codelite/patches/patch-CodeLite_fileextmanager.cpp \ pkgsrc/editors/codelite/patches/patch-svgs_svgs-dark_create-logo.sh \ pkgsrc/editors/codelite/patches/patch-svgs_svgs-light_create-logo.sh cvs rdiff -u -r1.2 -r0 \ 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 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1584964633170550 Content-Disposition: inline Content-Length: 9828 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/codelite/Makefile diff -u pkgsrc/editors/codelite/Makefile:1.28 pkgsrc/editors/codelite/Makefile:1.29 --- pkgsrc/editors/codelite/Makefile:1.28 Tue Mar 10 22:09:40 2020 +++ pkgsrc/editors/codelite/Makefile Mon Mar 23 11:57:13 2020 @@ -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 @@ USE_TOOLS+= pkg-config bash 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_SED.ena-netbsd+= -e 's,IS_NETBSD 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_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+= 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" Index: pkgsrc/editors/codelite/PLIST diff -u pkgsrc/editors/codelite/PLIST:1.4 pkgsrc/editors/codelite/PLIST:1.5 --- pkgsrc/editors/codelite/PLIST:1.4 Wed Aug 28 09:09:19 2019 +++ pkgsrc/editors/codelite/PLIST Mon Mar 23 11:57:13 2020 @@ -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/PHP.zip 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 Index: pkgsrc/editors/codelite/distinfo diff -u pkgsrc/editors/codelite/distinfo:1.6 pkgsrc/editors/codelite/distinfo:1.7 --- pkgsrc/editors/codelite/distinfo:1.6 Tue Aug 27 14:45:04 2019 +++ pkgsrc/editors/codelite/distinfo Mon Mar 23 11:57:13 2020 @@ -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 Added files: Index: pkgsrc/editors/codelite/patches/patch-CodeLite_fileextmanager.cpp diff -u /dev/null pkgsrc/editors/codelite/patches/patch-CodeLite_fileextmanager.cpp:1.1 --- /dev/null Mon Mar 23 11:57:13 2020 +++ pkgsrc/editors/codelite/patches/patch-CodeLite_fileextmanager.cpp Mon Mar 23 11:57:13 2020 @@ -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("