From nobody Sun Feb 16 16:49:49 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YwsG52BJ2z5ng28; Sun, 16 Feb 2025 16:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwsG51jB6z3lr4; Sun, 16 Feb 2025 16:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739724589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1LNYsA15QChVwJ8xb5LtFmh58J8hMDKNoipEufjW1DA=; b=i/xsrPEua/x0L+Q79+n6kh9+JlLTR3gVULjP7YTCyO8h8RQk5tLplZ3pVhfIm2U1K67hL0 QJjGLEkR7F8wM0tw3qFlX18qorPf9S5+zOQBXXUkFTJaWLBcesFTTcNGFAujCJudmBnhJs QsheYHtKq5QrXoOK7KahotzZqYyDr/Lu/iXF86QOiJsc4/9ROnEZ0kRvrZSP30k0Iuj9AU aXSvwhf+RlE37ZSC9ejtY7zZ8QYuZiHlJnHuVjf6JwsJtS6/mcZOr4LOFMqz7UhvRHJjEU RtP5UM6WHlPNcwC4ctrZvcs7WH4+RiY3o+uQh1hCu7gfueB5VweuktxyCFfDFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739724589; a=rsa-sha256; cv=none; b=twt/LKVGiEQITnCjDsyRsmXaZSxAY6j5Kr5tBbRZt9aWkOtCXM6u7ajUS9rFzKuampUAA2 JJ/gnec+2zg72qoEsB7KCLh/y9fzQZdmQn/hpll+OsvtR4sd2bNV1SORUWMhpMkM2dKXXO kqmO/N5zeuMpEo1dCIW740tJNnoyPRbrSrWIYH8TwiC6W2u70+x49NhwswMxBU7bTCKlpm GhshL2UgbGv66Ze/4gX+aBMCIuYumEPhUxHRuMEyqPEgoReFTi15tg0j58wZ0d7zJZKK7g slp42mRtpn9IRGWpoZZI4koTNNQLqBe9Ht8NLJDft/B2B5g088NTV6iV4uXFhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739724589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1LNYsA15QChVwJ8xb5LtFmh58J8hMDKNoipEufjW1DA=; b=PsW1RpMtiV8WsVGV5wKTwhUmxWBtjloY/goP1vyi3vil9Tfq2CEdBSI2s0VRzN5Y5izCvS yCZxsA8PEyVd4wWlmkPbFo2c+yNFqjupgNBNMZU3BwRunjSi8rBMRYnIVi9pyN3BruVdvm H1PBgrlGaiMcRwq8BpT8hYdrbzTC/+MYRXWM3zlkkMCyYRVaqJfWoOV3mDBmuj7tzXryHS 6WRELQXaZ+ofiwJjBsYnogyYBEat+h+qQitzUT824x63yZBaTIsStWy7NqkgMGcJYEGO6c Uuw3o8yTBbWqU+4MD3zFyidoSHbG00ISRLikPfdKgI6x4PcuPXfQMwtfYBV7fA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YwsG51B7gzvxs; Sun, 16 Feb 2025 16:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51GGnnRe065680; Sun, 16 Feb 2025 16:49:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51GGnnAM065677; Sun, 16 Feb 2025 16:49:49 GMT (envelope-from git) Date: Sun, 16 Feb 2025 16:49:49 GMT Message-Id: <202502161649.51GGnnAM065677@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 9025f32b1592 - main - devel/ccls: fix build with LLVM_DEFAULT=19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9025f32b1592396d53026ee4a4c00879499f860e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=9025f32b1592396d53026ee4a4c00879499f860e commit 9025f32b1592396d53026ee4a4c00879499f860e Author: Dimitry Andric AuthorDate: 2025-01-28 19:21:29 +0000 Commit: Dimitry Andric CommitDate: 2025-02-16 16:47:35 +0000 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 --- devel/ccls/Makefile | 6 ++++++ devel/ccls/distinfo | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) 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