Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package ccls for openSUSE:Factory checked in 
at 2023-10-02 20:06:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ccls (Old)
 and      /work/SRC/openSUSE:Factory/.ccls.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ccls"

Mon Oct  2 20:06:09 2023 rev:18 rq:1114535 version:0.20220729

Changes:
--------
--- /work/SRC/openSUSE:Factory/ccls/ccls.changes        2023-03-31 
21:15:37.854414655 +0200
+++ /work/SRC/openSUSE:Factory/.ccls.new.28202/ccls.changes     2023-10-02 
20:08:36.783436412 +0200
@@ -1,0 +2,8 @@
+Sat Sep 30 12:37:09 UTC 2023 - Aaron Puchert <[email protected]>
+
+- Backport upstream patch llvm17-precompiled-preamble-build.patch
+  to fix build with LLVM 17.
+- Remove explicit runtime dependency libclang-cpp* when we don't
+  need an exact version, because it will be derived automatically.
+
+-------------------------------------------------------------------

New:
----
  llvm17-precompiled-preamble-build.patch

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

Other differences:
------------------
++++++ ccls.spec ++++++
--- /var/tmp/diff_new_pack.WFsltr/_old  2023-10-02 20:08:37.895476405 +0200
+++ /var/tmp/diff_new_pack.WFsltr/_new  2023-10-02 20:08:37.895476405 +0200
@@ -27,6 +27,7 @@
 URL:            https://github.com/MaskRay/ccls
 Source0:        %{URL}/archive/%{version}/%{name}-%{version}.tar.gz
 Patch0:         
%{URL}/commit/6dc564f2a8608fff778a7d7e8ed0d5acd8d61e6b.patch#/llvm16-optional-deprecation.patch
+Patch1:         
%{URL}/commit/ba38e13b93de1e8787b7e8a22b9a00d35b2b40f2.patch#/llvm17-precompiled-preamble-build.patch
 BuildRequires:  clang-devel >= 7.0
 BuildRequires:  cmake >= 3.8
 BuildRequires:  llvm-devel >= 7.0
@@ -38,12 +39,9 @@
 Provides:       bundled(siphash)
 # ccls hardcodes the paths to clang's resource dir and we thus must ensure that
 # it is always shipped with the same clang version that was used to build it
-%if %{pkg_vcmp clang-devel >= 16.0.0}
 # With Clang 16, the resource directory depends on the major version only and
 # doesn't change with patch-level updates.
-Requires:       libclang-cpp%{_llvm_sonum}
-%else
-# Previously the full version was used, so we need to require that same 
version.
+%if %{pkg_vcmp clang-devel < 16.0.0}
 %{requires_eq libclang-cpp%{_llvm_sonum}}
 %endif
 # gcc > 7.0 is called gcc7- in Leap 15.2 and 15.3

++++++ llvm17-precompiled-preamble-build.patch ++++++
>From ba38e13b93de1e8787b7e8a22b9a00d35b2b40f2 Mon Sep 17 00:00:00 2001
From: Fangrui Song <[email protected]>
Date: Tue, 11 Apr 2023 11:03:41 -0700
Subject: [PATCH] Adapt llvmorg-17-init-4072-gcc929590ad30:
 PrecompiledPreamble::Build

---
 src/sema_manager.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/sema_manager.cc b/src/sema_manager.cc
index 14f303b5..c6f803c3 100644
--- a/src/sema_manager.cc
+++ b/src/sema_manager.cc
@@ -404,7 +404,11 @@ void buildPreamble(Session &session, CompilerInvocation 
&ci,
 
   CclsPreambleCallbacks pc;
   if (auto newPreamble = PrecompiledPreamble::Build(
-          ci, buf.get(), bounds, *de, fs, session.pch, true, pc)) {
+          ci, buf.get(), bounds, *de, fs, session.pch, true,
+#if LLVM_VERSION_MAJOR >= 17 // llvmorg-17-init-4072-gcc929590ad30
+          "",
+#endif
+          pc)) {
     assert(!ci.getPreprocessorOpts().RetainRemappedFileBuffers);
     if (oldP) {
       auto &old_includes = oldP->includes;

Reply via email to