CVS commit: pkgsrc/devel/qt6-qttools

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu May 28 07:01:21 UTC 2026

Modified Files:
        pkgsrc/devel/qt6-qttools: distinfo
Added Files:
        pkgsrc/devel/qt6-qttools/patches:
            patch-src_qdoc_cmake_QDocConfiguration.cmake
            patch-src_qdoc_qdoc_src_qdoc_clangcodeparser.cpp

Log Message:
qt6-qttools: support LLVM 22


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/qt6-qttools/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/qt6-qttools/patches/patch-src_qdoc_cmake_QDocConfiguration.cmake \
    pkgsrc/devel/qt6-qttools/patches/patch-src_qdoc_qdoc_src_qdoc_clangcodeparser.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/qt6-qttools/distinfo
diff -u pkgsrc/devel/qt6-qttools/distinfo:1.25 pkgsrc/devel/qt6-qttools/distinfo:1.26
--- pkgsrc/devel/qt6-qttools/distinfo:1.25      Wed May 13 05:31:24 2026
+++ pkgsrc/devel/qt6-qttools/distinfo   Thu May 28 07:01:21 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2026/05/13 05:31:24 adam Exp $
+$NetBSD: distinfo,v 1.26 2026/05/28 07:01:21 adam Exp $
 
 BLAKE2s (qttools-everywhere-src-6.11.1.tar.xz) = 642525c404be46ff2a7a33d1198ffdab2dd253eb88c4ee139b2ff4aa4a7143fd
 SHA512 (qttools-everywhere-src-6.11.1.tar.xz) = 826d21ed3e45feebe8c083b9fc9fc8e2a64aaec972d58388c94eabeaa3c2d8e4c86f1620a7caa6a1784f2f84641aec3df4b20006fe369eeaeb1968b838497b56
@@ -8,3 +8,5 @@ SHA1 (patch-src_designer_src_designer_CM
 SHA1 (patch-src_linguist_linguist_CMakeLists.txt) = 3e426895de3164a3fc1e579cfac8f56a4294fa8f
 SHA1 (patch-src_pixeltool_CMakeLists.txt) = a530c8ac7a9c9b2fd0d259d42d766e44916640d8
 SHA1 (patch-src_qdbus_qdbusviewer_CMakeLists.txt) = 38d5681bed22c47564b6b3659463967769497184
+SHA1 (patch-src_qdoc_cmake_QDocConfiguration.cmake) = 4590d8098435c3fceae932e035bb592fd8549f08
+SHA1 (patch-src_qdoc_qdoc_src_qdoc_clangcodeparser.cpp) = 2d701a0dd82614f574cc9645cfffdeb3a24b5f33

Added files:

Index: pkgsrc/devel/qt6-qttools/patches/patch-src_qdoc_cmake_QDocConfiguration.cmake
diff -u /dev/null pkgsrc/devel/qt6-qttools/patches/patch-src_qdoc_cmake_QDocConfiguration.cmake:1.1
--- /dev/null   Thu May 28 07:01:21 2026
+++ pkgsrc/devel/qt6-qttools/patches/patch-src_qdoc_cmake_QDocConfiguration.cmake       Thu May 28 07:01:21 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_qdoc_cmake_QDocConfiguration.cmake,v 1.1 2026/05/28 07:01:21 adam Exp $
+
+Support LLVM 22.
+
+--- src/qdoc/cmake/QDocConfiguration.cmake.orig        2026-05-12 13:04:33.432233380 +0000
++++ src/qdoc/cmake/QDocConfiguration.cmake
+@@ -8,7 +8,7 @@ set(QDOC_MINIMUM_CLANG_VERSION "17")
+ 
+ # List of explicitly supported Clang versions for QDoc
+ set(QDOC_SUPPORTED_CLANG_VERSIONS
+-    "21.1" "20.1" "19.1" "18.1" "17.0.6"
++    "22.1" "21.1" "20.1" "19.1" "18.1" "17.0.6"
+ )
+ 
+ # Check for QDoc coverage dependencies
Index: pkgsrc/devel/qt6-qttools/patches/patch-src_qdoc_qdoc_src_qdoc_clangcodeparser.cpp
diff -u /dev/null pkgsrc/devel/qt6-qttools/patches/patch-src_qdoc_qdoc_src_qdoc_clangcodeparser.cpp:1.1
--- /dev/null   Thu May 28 07:01:21 2026
+++ pkgsrc/devel/qt6-qttools/patches/patch-src_qdoc_qdoc_src_qdoc_clangcodeparser.cpp   Thu May 28 07:01:21 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_qdoc_qdoc_src_qdoc_clangcodeparser.cpp,v 1.1 2026/05/28 07:01:21 adam Exp $
+
+Support LLVM 22.
+
+--- src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp.orig    2026-05-28 06:56:48.576759717 +0000
++++ src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
+@@ -42,7 +42,11 @@
+ #include <clang/Lex/Lexer.h>
+ #include <llvm/Support/Casting.h>
+ 
++#if LIBCLANG_VERSION_MAJOR >= 22
++#include <clang/AST/QualTypeNames.h>
++#else
+ #include "clang/AST/QualTypeNames.h"
++#endif
+ #include "template_declaration.h"
+ 
+ #include <cstdio>