From d68e7dd10e21ef61c53cda10d737ba62c78b5602 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Dec 05 2022 14:01:09 +0000
Subject: Fix broken clangFormat plugin


---

diff --git a/qt-creator-clangformat.patch b/qt-creator-clangformat.patch
index 4c94bfd..cd32f1d 100644
--- a/qt-creator-clangformat.patch
+++ b/qt-creator-clangformat.patch
@@ -1,7 +1,7 @@
 diff -rupN --no-dereference qt-creator-opensource-src-9.0.0/cmake/FindClang.cmake qt-creator-opensource-src-9.0.0-new/cmake/FindClang.cmake
 --- qt-creator-opensource-src-9.0.0/cmake/FindClang.cmake	2022-11-22 04:16:21.000000000 +0100
 +++ qt-creator-opensource-src-9.0.0-new/cmake/FindClang.cmake	2022-11-24 13:43:03.635769115 +0100
-@@ -2,9 +2,14 @@ find_package(Clang CONFIG)
+@@ -2,9 +2,15 @@ find_package(Clang CONFIG)
  
  option(CLANGTOOLING_LINK_CLANG_DYLIB "Force linking of Clang tooling against clang-cpp" NO)
  
@@ -9,11 +9,24 @@ diff -rupN --no-dereference qt-creator-opensource-src-9.0.0/cmake/FindClang.cmak
  if (TARGET clang-cpp AND CLANGTOOLING_LINK_CLANG_DYLIB)
    set(CLANG_FORMAT_LIB clang-cpp)
 +else()
-+  set(CLANG_FORMAT_LIB_PATH "clangFormat" CACHE STRING "clangFormat library")
-+  add_library(clangFormat STATIC IMPORTED)
-+  set_property(TARGET clangFormat PROPERTY IMPORTED_LOCATION ${CLANG_FORMAT_LIB_PATH})
-+  set(CLANG_FORMAT_LIB clangFormat)
++  set(CLANG_LIB_PATH "." CACHE STRING "Base path to clang libs")
++  foreach(lib in LIST clangFormat clangToolingCore clangRewrite clangLex clangBasic clangToolingInclusions clangAST)
++    add_library(${lib} STATIC IMPORTED)
++    set_property(TARGET ${lib} PROPERTY IMPORTED_LOCATION ${CLANG_LIB_PATH}/lib${lib}.a)
++  endforeach()
 +  set(QTC_CLANG_BUILDMODE_MATCH ON)
  endif()
  
  if (WIN32 AND TARGET clangTooling)
+diff -rupN qt-creator-opensource-src-9.0.0/src/plugins/clangformat/CMakeLists.txt qt-creator-opensource-src-9.0.0-new/src/plugins/clangformat/CMakeLists.txt
+--- qt-creator-opensource-src-9.0.0/src/plugins/clangformat/CMakeLists.txt	2022-11-22 04:16:25.000000000 +0100
++++ qt-creator-opensource-src-9.0.0-new/src/plugins/clangformat/CMakeLists.txt	2022-12-03 13:36:13.573898038 +0100
+@@ -1,6 +1,6 @@
+ add_qtc_plugin(ClangFormat
+-  CONDITION TARGET ${CLANG_FORMAT_LIB} AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB)
+-  DEPENDS Utils Qt5::Widgets ${CLANG_FORMAT_LIB}
++  CONDITION TARGET clangFormat AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB)
++  DEPENDS Utils Qt5::Widgets clangFormat clangToolingCore clangRewrite clangLex clangBasic clangToolingInclusions clangAST
+   PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer
+   SOURCES
+     clangformatbaseindenter.cpp clangformatbaseindenter.h
diff --git a/qt-creator.spec b/qt-creator.spec
index a511831..621ffb7 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -8,7 +8,7 @@
 
 Name:           qt-creator
 Version:        9.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform IDE for Qt
 
 License:        GPLv3 with exceptions
@@ -148,7 +148,7 @@ popd
 %cmake -G Ninja \
     -DBUILD_PLUGIN_CLANGREFACTORING=ON \
     -DBUILD_PLUGIN_CLANGPCHMANAGER=ON \
-    -DCLANG_FORMAT_LIB_PATH=$PWD/clang-%{clangver}.src/%{_vpath_builddir}/%{_lib}/libclangFormat.a \
+    -DCLANG_LIB_PATH=$PWD/clang-%{clangver}.src/%{_vpath_builddir}/%{_lib}/ \
     -DWITH_DOCS=ON \
     -Djournald=ON \
     -DBUILD_DEVELOPER_DOCS=ON \
@@ -211,6 +211,9 @@ diff -u %{SOURCE1} $outfile
 
 
 %changelog
+* Fri Dec 02 2022 Sandro Mani <manisandro@gmail.com> - 9.0.0-2
+- Fix broken clangFormat plugin
+
 * Thu Nov 24 2022 Sandro Mani <manisandro@gmail.com> - 9.0.0-1
 - Update to 9.0.0