Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package ccls for openSUSE:Factory checked in 
at 2025-04-14 12:57:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ccls (Old)
 and      /work/SRC/openSUSE:Factory/.ccls.new.1907 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ccls"

Mon Apr 14 12:57:53 2025 rev:22 rq:1268906 version:0.20241108

Changes:
--------
--- /work/SRC/openSUSE:Factory/ccls/ccls.changes        2024-11-15 
15:43:43.499634734 +0100
+++ /work/SRC/openSUSE:Factory/.ccls.new.1907/ccls.changes      2025-04-14 
12:57:55.631102427 +0200
@@ -1,0 +2,5 @@
+Sat Apr 12 21:06:33 UTC 2025 - Aaron Puchert <aaronpuch...@alice-dsl.net>
+
+- Add fix-llvm20-build.patch to fix build with LLVM 20.
+
+-------------------------------------------------------------------

New:
----
  fix-llvm20-build.patch

BETA DEBUG BEGIN:
  New:
- Add fix-llvm20-build.patch to fix build with LLVM 20.
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ccls.spec ++++++
--- /var/tmp/diff_new_pack.psPGHl/_old  2025-04-14 12:57:56.471137704 +0200
+++ /var/tmp/diff_new_pack.psPGHl/_new  2025-04-14 12:57:56.471137704 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ccls
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@
 Group:          Development/Tools/IDE
 URL:            https://github.com/MaskRay/ccls
 Source0:        %{URL}/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0:         fix-llvm20-build.patch
 BuildRequires:  clang-devel >= 10
 BuildRequires:  cmake >= 3.8
 BuildRequires:  llvm-devel >= 10

++++++ fix-llvm20-build.patch ++++++
>From 4331c8958698d42933bf4e132f8a7d61f3cedb8c Mon Sep 17 00:00:00 2001
From: Fangrui Song <i...@maskray.me>
Date: Sat, 23 Nov 2024 18:25:48 -0800
Subject: [PATCH] Adapt llvmorg-20-init-12964-gdf9a14d7bbf1: createDiagnostics

---
 src/clang_tu.cc     |  8 +++++---
 src/indexer.cc      |  6 +++++-
 src/sema_manager.cc | 13 ++++++++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/clang_tu.cc b/src/clang_tu.cc
index 32be1733f..54e04ef0e 100644
--- a/src/clang_tu.cc
+++ b/src/clang_tu.cc
@@ -124,9 +124,11 @@ buildCompilerInvocation(const std::string &main, 
std::vector<const char *> args,
     args.insert(args.begin() + 1, std::begin(arr), std::end(arr));
   }
 
-  IntrusiveRefCntPtr<DiagnosticsEngine> diags(
-      CompilerInstance::createDiagnostics(new DiagnosticOptions,
-                                          new IgnoringDiagConsumer, true));
+  IntrusiveRefCntPtr<DiagnosticsEngine> 
diags(CompilerInstance::createDiagnostics(
+#if LLVM_VERSION_MAJOR >= 20
+      *vfs,
+#endif
+      new DiagnosticOptions, new IgnoringDiagConsumer, true));
 #if LLVM_VERSION_MAJOR < 12 // llvmorg-12-init-5498-g257b29715bb
   driver::Driver d(args[0], llvm::sys::getDefaultTargetTriple(), *diags, vfs);
 #else
diff --git a/src/indexer.cc b/src/indexer.cc
index b81f1d9f6..dff4ae2d8 100644
--- a/src/indexer.cc
+++ b/src/indexer.cc
@@ -1312,7 +1312,11 @@ index(SemaManager *manager, WorkingFiles *wfiles, VFS 
*vfs,
   IndexDiags dc;
   auto clang = std::make_unique<CompilerInstance>(pch);
   clang->setInvocation(std::move(ci));
-  clang->createDiagnostics(&dc, false);
+  clang->createDiagnostics(
+#if LLVM_VERSION_MAJOR >= 20
+      *fs,
+#endif
+      &dc, false);
   clang->getDiagnostics().setIgnoreAllWarnings(true);
   clang->setTarget(TargetInfo::CreateTargetInfo(
       clang->getDiagnostics(), clang->getInvocation().TargetOpts));
diff --git a/src/sema_manager.cc b/src/sema_manager.cc
index bf806e47d..59aaed021 100644
--- a/src/sema_manager.cc
+++ b/src/sema_manager.cc
@@ -288,7 +288,11 @@ buildCompilerInstance(Session &session, 
std::unique_ptr<CompilerInvocation> ci,
 
   auto clang = std::make_unique<CompilerInstance>(session.pch);
   clang->setInvocation(std::move(ci));
-  clang->createDiagnostics(&dc, false);
+  clang->createDiagnostics(
+#if LLVM_VERSION_MAJOR >= 20
+      *fs,
+#endif
+      &dc, false);
   clang->setTarget(TargetInfo::CreateTargetInfo(
       clang->getDiagnostics(), clang->getInvocation().TargetOpts));
   if (!clang->hasTarget())
@@ -368,8 +372,11 @@ void buildPreamble(Session &session, CompilerInvocation 
&ci,
 #endif
 
   StoreDiags dc(task.path);
-  IntrusiveRefCntPtr<DiagnosticsEngine> de =
-      CompilerInstance::createDiagnostics(&ci.getDiagnosticOpts(), &dc, false);
+  IntrusiveRefCntPtr<DiagnosticsEngine> de = 
CompilerInstance::createDiagnostics(
+#if LLVM_VERSION_MAJOR >= 20
+      *fs,
+#endif
+      &ci.getDiagnosticOpts(), &dc, false);
   if (oldP) {
     std::lock_guard lock(session.wfiles->mutex);
     for (auto &include : oldP->includes)

Reply via email to