From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- dev-util/ccls/Manifest | 7 +- dev-util/ccls/ccls-0.20210330-r1.ebuild | 51 ++++++++ dev-util/ccls/ccls-0.20210330.ebuild | 6 +- dev-util/ccls/ccls-9999.ebuild | 17 ++- .../ccls/files/ccls-0.20210330-llvm-cmake.patch | 18 +++ dev-util/ccls/files/ccls-0.20210330-llvm14.patch | 139 +++++++++++++++++++++ 6 files changed, 231 insertions(+), 7 deletions(-) create mode 100644 dev-util/ccls/ccls-0.20210330-r1.ebuild create mode 100644 dev-util/ccls/files/ccls-0.20210330-llvm-cmake.patch create mode 100644 dev-util/ccls/files/ccls-0.20210330-llvm14.patch (limited to 'dev-util/ccls') diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest index 4dfcba609a3e..5d191de82ddb 100644 --- a/dev-util/ccls/Manifest +++ b/dev-util/ccls/Manifest @@ -1,4 +1,7 @@ +AUX ccls-0.20210330-llvm-cmake.patch 528 BLAKE2B dc6846e48fb9c69947cba30ab5c5105656bc4519aebc13526f9af5bbee56046b1ccf980285e5e22a14ff4e4e2df8d533a264a9569eafe329d767795ce55b33b9 SHA512 27092844ac557d15d9ac822bdc7239a5206fcff43468b260b93448d30cde254dc8a3eb025975c6403671325ac1b90f6e0cb20a64abf01c6b73b907d6603cc980 +AUX ccls-0.20210330-llvm14.patch 5068 BLAKE2B 8477e86dcb22e976171636a39bb7e4f69c77dd6e47d4ddf0163dcffb618209b4435d7d92f1e383c14d07a749fd237e27590782907ba702ea39eca49ce2514678 SHA512 2b98b8ed38c6ab0ec1b5055437c913c59543656df1a708f25af270f90baa746e4b2d398400a8c9ec3b651fa6d1d57f4b7b6da9c5195a11117b12c9aad03ecdf5 DIST ccls-0.20210330.tar.gz 160487 BLAKE2B f87539a5e726a8742552d811d741c379d62c146bed835c7fa8d32ab5eb1f609513f80051faf07bbb8e346f176c02ab3e54b3446d5e28dae744468f2209a9d037 SHA512 dd78c040c2a51d6b47f8dd2d8bdc0661111f26b9233ffeb41216254b1b0ad0f634190784e6b8c2d7b36475c13020356342d83a9f80047d7da75ce21ca8885b16 -EBUILD ccls-0.20210330.ebuild 750 BLAKE2B b3389e27c7e55d4e29d71a363f1de355bde157d9e45d2c38cfc840ad9c5a3e5dfed6f463ffa52232957b2747297a8324b2440ec05fade52bd8e02f2438f925b7 SHA512 dfcfec985ed57785ae78c73828885e1077c3e2bf8c2033fee15b5ed94d1336970cf4be16799d5e2719cf7c7e02a70ebd85290c9fdd489852c57a947214740775 -EBUILD ccls-9999.ebuild 750 BLAKE2B b3389e27c7e55d4e29d71a363f1de355bde157d9e45d2c38cfc840ad9c5a3e5dfed6f463ffa52232957b2747297a8324b2440ec05fade52bd8e02f2438f925b7 SHA512 dfcfec985ed57785ae78c73828885e1077c3e2bf8c2033fee15b5ed94d1336970cf4be16799d5e2719cf7c7e02a70ebd85290c9fdd489852c57a947214740775 +EBUILD ccls-0.20210330-r1.ebuild 999 BLAKE2B f9211984a17679c14bb19ac8a79809c50339c83f3a35cce83e7c5a7e458922740236dbe8538e65cb57604488b63833d1051c7326296df5c12d2f9507beff3625 SHA512 d091c15ad3803a067e35e6d598916cbb33a3ec9877fe2356eadca7238b6872f3ee19db1896f4c82b5fe2ec7f83399a40f417a3eb65d11f451a1f5c8b9f04398e +EBUILD ccls-0.20210330.ebuild 805 BLAKE2B d34208298dbfc3e9b51599d22c733d062df7179c8b296ffb2ec964956eb112fa07ceabb7adb15775635f5e89b9f50f9b8719e6546956d6b9c785d35abfddfbf8 SHA512 c5059e01fc051f4890b095f838446d0c0e0573e6e6f58a7305b888ba610fd91ca1b437434e2e91a66fca91cbec9d4e5adce734ca51e5c86962ed4e254eaa64bd +EBUILD ccls-9999.ebuild 999 BLAKE2B f9211984a17679c14bb19ac8a79809c50339c83f3a35cce83e7c5a7e458922740236dbe8538e65cb57604488b63833d1051c7326296df5c12d2f9507beff3625 SHA512 d091c15ad3803a067e35e6d598916cbb33a3ec9877fe2356eadca7238b6872f3ee19db1896f4c82b5fe2ec7f83399a40f417a3eb65d11f451a1f5c8b9f04398e MISC metadata.xml 324 BLAKE2B 83e4ab413a926db1ddf998ec8e5566a9a58fc2b3472b9d137356ebf3c08d4ca888a5252baeb0e10f298e31eca4bb4ea1a9b67c752590807be3ce27f8b3742327 SHA512 00dfaff2972f7ea5df02c207b8211475acafcbba5bef4c5ce3ceb09924db2bb3f009e155aab43866903e7442008d058261f07464f43f9295a4d1be6ed0cfec02 diff --git a/dev-util/ccls/ccls-0.20210330-r1.ebuild b/dev-util/ccls/ccls-0.20210330-r1.ebuild new file mode 100644 index 000000000000..f2069853b3f4 --- /dev/null +++ b/dev-util/ccls/ccls-0.20210330-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://github.com/MaskRay/${PN}" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" + LLVM_MAX_SLOT=9999 +else + LLVM_MAX_SLOT=14 +fi + +inherit cmake llvm ${GIT_ECLASS} + +DESCRIPTION="C/C++/ObjC language server" +HOMEPAGE="https://github.com/MaskRay/ccls" + +if [[ ${PV} == *9999 ]] ; then + SRC_URI="" +else + SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +# We only depend on Clang because of a quirk in how dependencies work +# See comment in llvm.eclass docs +DEPEND=" + dev-libs/rapidjson + +Date: Wed, 15 Dec 2021 10:13:29 -0800 +Subject: [PATCH] cmake: Add LANGUAGE C to fix find_package(Clang REQUIRED) + error + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.8) +-project(ccls LANGUAGES CXX) ++project(ccls LANGUAGES CXX C) + + option(USE_SYSTEM_RAPIDJSON "Use system RapidJSON instead of the git submodule if exists" ON) + + diff --git a/dev-util/ccls/files/ccls-0.20210330-llvm14.patch b/dev-util/ccls/files/ccls-0.20210330-llvm14.patch new file mode 100644 index 000000000000..79bf0f124422 --- /dev/null +++ b/dev-util/ccls/files/ccls-0.20210330-llvm14.patch @@ -0,0 +1,139 @@ +https://github.com/MaskRay/ccls/commit/3ce756e39ae48204f016a58684652ad62b4dd9f9.patch +https://github.com/MaskRay/ccls/commit/8422f0a522b6fbcb4412a8ec73d80b4acbc7e00f.patch +https://github.com/MaskRay/ccls/commit/790daca4b2d9d5873623fee86283cd61212df674.patch + +From: Fangrui Song +Date: Thu, 23 Sep 2021 13:36:01 -0700 +Subject: [PATCH] Adaopt llvmorg-14-init-3863-g601102d282d5: refactor + clang::isIdentifierBody + +--- + src/clang_tu.hh | 4 ++++ + src/indexer.cc | 6 +++--- + src/working_files.cc | 9 ++++++--- + 3 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/src/clang_tu.hh b/src/clang_tu.hh +index b37950926..7dbfc4a88 100644 +--- a/src/clang_tu.hh ++++ b/src/clang_tu.hh +@@ -17,6 +17,10 @@ namespace vfs = clang::vfs; + } + #endif + ++#if LLVM_VERSION_MAJOR < 14 // llvmorg-14-init-3863-g601102d282d5 ++#define isAsciiIdentifierContinue isIdentifierBody ++#endif ++ + namespace ccls { + std::string pathFromFileEntry(const clang::FileEntry &file); + +diff --git a/src/indexer.cc b/src/indexer.cc +index 89d78959e..644c0ccbb 100644 +--- a/src/indexer.cc ++++ b/src/indexer.cc +@@ -527,8 +527,8 @@ class IndexDataConsumer : public index::IndexDataConsumer { + auto i = name.find(short_name); + if (short_name.size()) + while (i != std::string::npos && +- ((i && isIdentifierBody(name[i - 1])) || +- isIdentifierBody(name[i + short_name.size()]))) ++ ((i && isAsciiIdentifierContinue(name[i - 1])) || ++ isAsciiIdentifierContinue(name[i + short_name.size()]))) + i = name.find(short_name, i + short_name.size()); + if (i == std::string::npos) { + // e.g. operator type-parameter-1 +@@ -552,7 +552,7 @@ class IndexDataConsumer : public index::IndexDataConsumer { + paren++; + else if (name[i - 1] == '(') + paren--; +- else if (!(paren > 0 || isIdentifierBody(name[i - 1]) || ++ else if (!(paren > 0 || isAsciiIdentifierContinue(name[i - 1]) || + name[i - 1] == ':')) + break; + } +diff --git a/src/working_files.cc b/src/working_files.cc +index f80f21053..4904388be 100644 +--- a/src/working_files.cc ++++ b/src/working_files.cc +@@ -342,7 +342,10 @@ std::optional WorkingFile::getIndexPosFromBufferPos(int line, int *column, + Position WorkingFile::getCompletionPosition(Position pos, std::string *filter) const { + int start = getOffsetForPosition(pos, buffer_content); + int i = start; +- while (i > 0 && isIdentifierBody(buffer_content[i - 1])) ++#if LLVM_VERSION_MAJOR < 14 // llvmorg-14-init-3863-g601102d282d5 ++#define isAsciiIdentifierContinue isIdentifierBody ++#endif ++ while (i > 0 && isAsciiIdentifierContinue(buffer_content[i - 1])) + --i; + *filter = buffer_content.substr(i, start - i); + return getPositionForOffset(buffer_content, i); +@@ -455,10 +458,10 @@ std::string_view lexIdentifierAroundPos(Position position, + c = content[start - 1]; + if (c == ':' && start > 1 && content[start - 2] == ':') + start--; +- else if (!isIdentifierBody(c)) ++ else if (!isAsciiIdentifierContinue(c)) + break; + } +- for (; end < content.size() && isIdentifierBody(content[end]); end++) ++ for (; end < content.size() && isAsciiIdentifierContinue(content[end]); end++) + ; + + return content.substr(start, end - start); + + +From: Fangrui Song +Date: Sun, 9 Jan 2022 12:25:07 -0800 +Subject: [PATCH] Adapt llvmorg-14-init-13600-g92417eaf3329: braced constructor + call + +--- + src/messages/textDocument_signatureHelp.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/messages/textDocument_signatureHelp.cc b/src/messages/textDocument_signatureHelp.cc +index 8e8a7277..4192272a 100644 +--- a/src/messages/textDocument_signatureHelp.cc ++++ b/src/messages/textDocument_signatureHelp.cc +@@ -80,6 +80,10 @@ class SignatureHelpConsumer : public CodeCompleteConsumer { + #if LLVM_VERSION_MAJOR >= 8 + , + SourceLocation openParLoc ++#endif ++#if LLVM_VERSION_MAJOR >= 14 ++ , ++ bool braced + #endif + ) override { + ls_sighelp.activeParameter = (int)currentArg; +@@ -93,7 +97,11 @@ class SignatureHelpConsumer : public CodeCompleteConsumer { + cand = OverloadCandidate(pattern); + + const auto *ccs = ++#if LLVM_VERSION_MAJOR >= 14 ++ cand.CreateSignatureString(currentArg, s, *alloc, cCTUInfo, true, braced); ++#else + cand.CreateSignatureString(currentArg, s, *alloc, cCTUInfo, true); ++#endif + + const char *ret_type = nullptr; + SignatureInformation &ls_sig = ls_sighelp.signatures.emplace_back(); + + +From: Fangrui Song +Date: Sun, 30 Jan 2022 11:17:32 -0800 +Subject: [PATCH] query: include llvm/ADT/STLExtras.h + +The header is no longer transitively included in 2022-01. +--- a/src/query.cc ++++ b/src/query.cc +@@ -9,6 +9,8 @@ + + #include + ++#include ++ + #include + #include + #include -- cgit v1.2.3