diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2025-01-28 20:21:29 +0100 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2025-02-16 17:47:35 +0100 |
| commit | 9025f32b1592396d53026ee4a4c00879499f860e (patch) | |
| tree | d86d819caf58e11d5cb02f844b2a97db8cbed5e4 | |
| parent | editors/emacs-devel: Update to 2025-02-15 snapshot (diff) | |
devel/ccls: fix build with LLVM_DEFAULT=19
When building against llvm 19, several errors appear:
/wrkdirs/usr/ports/devel/ccls/work/ccls-0.20240202/src/include_complete.cc:117:37: error: no member named 'endswith' in 'llvm::StringRef'; did you mean 'ends_
117 | if (StringRef(path).endswith(suffix)) | ^~~~~~~~
| ends_with
/wrkdirs/usr/ports/devel/ccls/work/ccls-0.20240202/src/clang_tu.cc:32:22: error: no member named 'startswith' in 'llvm::StringRef'; did you mean 'starts_with'
32 | if (file.getName().startswith("/../")) {
| ^~~~~~~~~~ | starts_with
/wrkdirs/usr/ports/devel/ccls/work/ccls-0.20240202/src/clang_tu.cc:340:21: error: no member named 'OMPArraySection' in 'clang::BuiltinType'; did you mean 'Arr
340 | case BuiltinType::OMPArraySection:
| ~~~~~~~~~~~~~^~~~~~~~~~~~~~~
| ArraySection /wrkdirs/usr/ports/devel/ccls/work/ccls-0.20240202/src/indexer.cc:1130:64: error: non-virtual member function marked 'override' hides virtual member function
1130 | SrcMgr::CharacteristicKind fileType) override {
| ^
Pull in a number of upstream patches to fix these.
PR: 284422
Appproved by: maintainer timeout (2 weeks)
MFH: 2025Q1
| -rw-r--r-- | devel/ccls/Makefile | 6 | ||||
| -rw-r--r-- | devel/ccls/distinfo | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/devel/ccls/Makefile b/devel/ccls/Makefile index 4928a69c54cd..1cf95b819e76 100644 --- a/devel/ccls/Makefile +++ b/devel/ccls/Makefile @@ -2,6 +2,12 @@ PORTNAME= ccls DISTVERSION= 0.20240202 CATEGORIES= devel +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 88e382f8a3d107383764310624ac61f237fdfa06.patch:-p1 # Adapt llvmorg-19-init-1720-gda95d926f6fc: InclusionDirective +PATCHFILES+= 559b4164096d026a73604055e5014361faf70a10.patch:-p1 # Adapt llvmorg-19-init-9119-g4ec9a662d388: startswith/endswith removal +PATCHFILES+= e5e101253a07e9f40f6ea54024a9a454978f6a58.patch:-p1 # Adapt llvmorg-19-init-9465-g39adc8f42329: BuiltinType::ArraySection +PATCHFILES+= 4331c8958698d42933bf4e132f8a7d61f3cedb8c.patch:-p1 # Adapt llvmorg-20-init-12964-gdf9a14d7bbf1: createDiagnostics + MAINTAINER= khng@FreeBSD.org COMMENT= C/C++/ObjC language server WWW= https://github.com/MaskRay/ccls diff --git a/devel/ccls/distinfo b/devel/ccls/distinfo index 876357184b18..4a3d0ce30023 100644 --- a/devel/ccls/distinfo +++ b/devel/ccls/distinfo @@ -1,5 +1,13 @@ -TIMESTAMP = 1717985595 +TIMESTAMP = 1738091222 SHA256 (ccls.wiki-0.20240202.tar.gz) = 9f41435f4de4885ed3838140b2f57250745bc6cf049c934cf17fd9d8f19d5ffe SIZE (ccls.wiki-0.20240202.tar.gz) = 38768 SHA256 (MaskRay-ccls-0.20240202_GH0.tar.gz) = 355ff7f5eb5f24d278dda05cccd9157e89583272d0559d6b382630171f142d86 SIZE (MaskRay-ccls-0.20240202_GH0.tar.gz) = 162283 +SHA256 (88e382f8a3d107383764310624ac61f237fdfa06.patch) = 7b30fa4cc17d1502e34e6c722b1d032b98c3fa1ff63adf7fe78808ec3ce1a519 +SIZE (88e382f8a3d107383764310624ac61f237fdfa06.patch) = 1857 +SHA256 (559b4164096d026a73604055e5014361faf70a10.patch) = 685a64afa630ae71551f109ba85f929e891279e2c7aa5fc420cde23a57eda9a7 +SIZE (559b4164096d026a73604055e5014361faf70a10.patch) = 1196 +SHA256 (e5e101253a07e9f40f6ea54024a9a454978f6a58.patch) = 836e145fe1a7ec97c874a8d762572d9c64caa42643d46c12a54994d3711aa592 +SIZE (e5e101253a07e9f40f6ea54024a9a454978f6a58.patch) = 855 +SHA256 (4331c8958698d42933bf4e132f8a7d61f3cedb8c.patch) = 2f6b720eab9739fb6b51ee4b428573cfc77a894d4896c25bb5f9c0321ce594b1 +SIZE (4331c8958698d42933bf4e132f8a7d61f3cedb8c.patch) = 3033 |