From d6eaff2cb52a9c2beb30256b6e0329914b9f3411 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 17 Jun 2025 17:32:43 +0200
Subject: [PATCH] clazy, bump to 1.15 (#12505)

---
 .../{clazy-1.14.recipe => clazy-1.15.recipe}  | 14 ++++-
 ...lazy-1.14.patchset => clazy-1.15.patchset} | 56 +++++++++----------
 2 files changed, 37 insertions(+), 33 deletions(-)
 rename dev-util/clazy/{clazy-1.14.recipe => clazy-1.15.recipe} (79%)
 rename dev-util/clazy/patches/{clazy-1.14.patchset => clazy-1.15.patchset} (56%)

diff --git a/dev-util/clazy/clazy-1.14.recipe b/dev-util/clazy/clazy-1.15.recipe
similarity index 79%
rename from dev-util/clazy/clazy-1.14.recipe
rename to dev-util/clazy/clazy-1.15.recipe
index 7c3bf7bbd..38b2ee2a0 100644
--- a/dev-util/clazy/clazy-1.14.recipe
+++ b/dev-util/clazy/clazy-1.15.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="2016-2025 Sérgio Martins"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/clazy/$portVersion/src/clazy-$portVersion.tar.xz"
-CHECKSUM_SHA256="993f786dac668c29c4f357cb95c8a6ddca555ebbb94854efb9b570f683ad4d43"
+CHECKSUM_SHA256="43189460b366ea3126242878c36ee8a403e37ec4baef7e61ccfa124b1414e7a9"
 PATCHES="clazy-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -22,6 +22,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 fi
 
 clangVer="20"
+pythonVersion="3.10"
 
 PROVIDES="
 	clazy$secondaryArchSuffix = $portVersion
@@ -50,13 +51,18 @@ BUILD_PREREQUIRES="
 	"
 
 TEST_REQUIRES="
-	cmd:python3
+	cmd:diff
+	cmd:python$pythonVersion
+#	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Qml$secondaryArchSuffix
 	"
 
 BUILD()
 {
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
+		-DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON \
 		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
 		-DCMAKE_SKIP_RPATH=YES \
 		-DCMAKE_AUTOGEN_PARALLEL=1 \
@@ -74,5 +80,7 @@ INSTALL()
 
 TEST()
 {
-	make -Cbuild test
+	# 8% tests passed, 94 tests failed out of 102
+	# previous version failed on all tests
+	ctest --test-dir build --output-on-failure
 }
diff --git a/dev-util/clazy/patches/clazy-1.14.patchset b/dev-util/clazy/patches/clazy-1.15.patchset
similarity index 56%
rename from dev-util/clazy/patches/clazy-1.14.patchset
rename to dev-util/clazy/patches/clazy-1.15.patchset
index 566fe4b0b..7bd17d3ea 100644
--- a/dev-util/clazy/patches/clazy-1.14.patchset
+++ b/dev-util/clazy/patches/clazy-1.15.patchset
@@ -1,41 +1,14 @@
-From dfb5cdd6deb37d32783c8f5fb044159c4821ce49 Mon Sep 17 00:00:00 2001
-From: Schrijvers Luc <begasus@gmail.com>
-Date: Thu, 13 Jun 2024 13:50:31 +0200
-Subject: Disable PCH for 32bit
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3aab903..1ba8361 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -148,10 +148,12 @@ macro(add_clang_plugin name)
- 
-   add_library(${name} SHARED ${srcs})
- 
-+if(NOT HAIKU)
-   if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
-       # 30% speedup
-       target_precompile_headers(${name} PRIVATE src/checkbase.h)
-   endif()
-+endif()
- 
-   if(SYMBOL_FILE)
-     set_target_properties(${name} PROPERTIES LINK_FlAGS "-exported_symbols_list ${SYMBOL_FILE}")
--- 
-2.48.1
-
-
-From 0cf354eff6c3023d53d3691bfc2083f6cab1814b Mon Sep 17 00:00:00 2001
+From d17ea14fe8503ef53cd8a965128a0f831fe09237 Mon Sep 17 00:00:00 2001
 From: Schrijvers Luc <begasus@gmail.com>
 Date: Sat, 6 Jul 2024 11:45:30 +0200
 Subject: Silense deprecated warnings
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ba8361..c0eb275 100644
+index d3bf9ad..6453a69 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -60,7 +60,7 @@ if(MSVC)
+@@ -65,7 +65,7 @@ if(MSVC)
    # disable trigger-happy warnings from Clang/LLVM headers
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4244 /wd4291 /wd4800 /wd4141 /wd4146 /wd4251")
  elseif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -47,3 +20,26 @@ index 1ba8361..c0eb275 100644
 -- 
 2.48.1
 
+
+From 98215646d8e2c6b2326a8543da4ba4c954bf6775 Mon Sep 17 00:00:00 2001
+From: Luc Schrijvers <begasus@gmail.com>
+Date: Mon, 16 Jun 2025 10:34:25 +0200
+Subject: Add missing header
+
+Fixes: error: 'Lexer' is not a member of 'clang'
+
+diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
+index 112025e..b94f1aa 100644
+--- a/src/SuppressionManager.cpp
++++ b/src/SuppressionManager.cpp
+@@ -11,6 +11,7 @@
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/SourceManager.h>
+ #include <clang/Basic/TokenKinds.h>
++#include <clang/Lex/Lexer.h>
+ #include <clang/Lex/Token.h>
+ #include <llvm/Support/MemoryBuffer.h>
+ #include <llvm/Support/raw_ostream.h>
+-- 
+2.48.1
+