>Number: 56020
>Category: pkg
>Synopsis: Patch for codelite 15.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu Feb 25 23:00:00 +0000 2021
>Originator: Andrius V
>Release:
>Organization:
>Environment:
>Description:
I updated codelite package to 15.0 version. Patch provided below. Also code is pushed to wip: https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=tree;f=codelite;h=7d3568781149166db9f39a4c43583a9c8d5b0d27;hb=HEAD
The changes I performed:
* Updated Makefile, distfiles and PLIST.
* Removed sdk/codelite_indexer/network/np_connections_server.cpp patch, I believe it's not needed. timeval is used with certain ifdef which includes sys/time.h.
All other patches remained intact.
Regards,
Andrius V
>How-To-Repeat:
>Fix:
diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index 9b5cc8a721c..5c1994e23e4 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.36 2020/12/04 20:45:14 nia Exp $
-DISTNAME= codelite-14.0
-PKGREVISION= 7
+DISTNAME= codelite-15.0
+PKGREVISION=
CATEGORIES= editors x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=eranif/}
@@ -71,6 +71,7 @@ BUILDLINK_TRANSFORM+= opt:-std=c++11:-std=gnu++11 # alloca
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/hunspell/buildlink3.mk"
+.include "../../textproc//uchardet/buildlink3.mk"
.include "../../security/libssh/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/codelite/PLIST b/editors/codelite/PLIST
index 6896ae3bec2..6d035765c70 100644
--- a/editors/codelite/PLIST
+++ b/editors/codelite/PLIST
@@ -14,10 +14,8 @@ 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
@@ -63,6 +61,7 @@ share/applications/codelite.desktop
share/codelite/LICENSE
share/codelite/PHP.zip
share/codelite/astyle.sample
+share/codelite/clang-tools.tgz
share/codelite/codelite-bitmaps-dark.zip
share/codelite/codelite-bitmaps-light.zip
share/codelite/config/accelerators.conf.default
diff --git a/editors/codelite/distinfo b/editors/codelite/distinfo
index 27e39915b7d..a41e8d2bfe6 100644
--- a/editors/codelite/distinfo
+++ b/editors/codelite/distinfo
@@ -1,11 +1,10 @@
$NetBSD: distinfo,v 1.8 2020/03/26 21:53:07 joerg Exp $
-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 (codelite-15.0.tar.gz) = 459d03880a2011bbd37e85bc2ade31aea24c2872
+RMD160 (codelite-15.0.tar.gz) = 0ba366f639ac8b951a8aead891ffe2255a4c21bc
+SHA512 (codelite-15.0.tar.gz) = fd5777cdb57d184407cff4503d255b4bcdf14041420ff9daf7043f710c159d6bdb47d467e92948f96ce4eb15eef40b782feec7195f5f66845f3c82d911b3f0b8
+Size (codelite-15.0.tar.gz) = 104970727 bytes
SHA1 (patch-CodeLite_fileextmanager.cpp) = 1eaf696d3bde907a635d767b3d022e1d92692087
SHA1 (patch-sdk_asio-1.12.1_asio_detail_impl_kqueue__reactor.ipp) = bdbcf78c6198da9ceb123373fd6b99419ae94896
-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 --git a/editors/codelite/patches/patch-sdk_codelite__indexer_network_np__connections__server.cpp b/editors/codelite/patches/patch-sdk_codelite__indexer_network_np__connections__server.cpp
deleted file mode 100644
index 100b12e3c4e..00000000000
--- a/editors/codelite/patches/patch-sdk_codelite__indexer_network_np__connections__server.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-sdk_codelite__indexer_network_np__connections__server.cpp,v 1.3 2019/08/27 14:45:04 wiz Exp $
-
-Ensure right header for timeval is included.
-
---- 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