Peter Jung pushed to branch main at Arch Linux / Packaging / Packages /
qt6-tools
Commits:
f4ad2bab by Peter Jung at 2026-03-09T19:44:58+01:00
upgpkg: 6.10.2-3 LLVM 22 rebuild
Add workaround to compile with LLVM 22 till upstream fully supports it
- - - - -
4 changed files:
- .SRCINFO
- PKGBUILD
- REUSE.toml
- + llvm22.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = qt6-tools
pkgdesc = A cross-platform application and UI framework (Development
Tools, QtHelp)
pkgver = 6.10.2
- pkgrel = 2
+ pkgrel = 3
url = https://www.qt.io
arch = x86_64
groups = qt6
@@ -26,7 +26,9 @@ pkgbase = qt6-tools
optdepends = qt6-declarative: for qdistancefieldgenerator, qdoc and
lupdate
source = git+https://code.qt.io/qt/qttools#tag=v6.10.2
source = git+https://code.qt.io/playground/qlitehtml
+ source = llvm22.patch
sha256sums =
465dce6589e4944d51d282cafbf46c08e24bd60a4561c70ac36e13ef4dbe0202
sha256sums = SKIP
+ sha256sums =
5f5dcc9234a19a2d545698406ee5dd5c3655d8cf3310e446a57d6d0738dc8e2e
pkgname = qt6-tools
=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
pkgname=qt6-tools
_pkgver=6.10.2
pkgver=${_pkgver/-/}
-pkgrel=2
+pkgrel=3
arch=(x86_64)
url='https://www.qt.io'
license=(GPL-3.0-only
@@ -31,15 +31,18 @@ optdepends=('clang: for qdoc and lupdate'
groups=(qt6)
_pkgfn=${pkgname/6-/}
source=(git+https://code.qt.io/qt/$_pkgfn#tag=v$_pkgver
- git+https://code.qt.io/playground/qlitehtml)
+ git+https://code.qt.io/playground/qlitehtml
+ llvm22.patch)
sha256sums=('465dce6589e4944d51d282cafbf46c08e24bd60a4561c70ac36e13ef4dbe0202'
- 'SKIP')
+ 'SKIP'
+ '5f5dcc9234a19a2d545698406ee5dd5c3655d8cf3310e446a57d6d0738dc8e2e')
prepare() {
cd $_pkgfn
git submodule init
git submodule set-url src/assistant/qlitehtml "$srcdir"/qlitehtml
git -c protocol.file.allow=always submodule update
+ patch -Np1 < ../llvm22.patch
}
build() {
=====================================
REUSE.toml
=====================================
@@ -17,6 +17,7 @@ path = [
"*.timer",
"*.desktop",
"*.hook",
+ "llvm22.patch",
]
SPDX-FileCopyrightText = "Arch Linux contributors"
SPDX-License-Identifier = "0BSD"
=====================================
llvm22.patch
=====================================
@@ -0,0 +1,43 @@
+diff --git a/src/qdoc/cmake/QDocConfiguration.cmake
b/src/qdoc/cmake/QDocConfiguration.cmake
+index 72d27db9e..8a3cba463 100644
+--- a/src/qdoc/cmake/QDocConfiguration.cmake
++++ b/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" "22.0" "21.1" "20.1" "19.1" "18.1" "17.0.6"
+ )
+
+ # Check for QDoc coverage dependencies
+diff --git a/src/qdoc/qdoc/CMakeLists.txt b/src/qdoc/qdoc/CMakeLists.txt
+index 90f1d7c23..84ebc3a28 100644
+--- a/src/qdoc/qdoc/CMakeLists.txt
++++ b/src/qdoc/qdoc/CMakeLists.txt
+@@ -191,6 +191,7 @@ qt_internal_add_tool(${target_name}
+ DEFINES
+ # To provide the ability to workaround version-specific Clang issues.
+ # A re-export of (LLVM|CLANG)_VERSION_MAJOR done in WrapLibClang.cmake
++ QT_NO_EMIT
+ LIBCLANG_VERSION_MAJOR=${QT_LIB_CLANG_VERSION_MAJOR}
+ )
+
+diff --git a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
+index 66a750a3d..3f54ddff5 100644
+--- a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
++++ b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
+@@ -43,7 +43,12 @@
+ #include <clang/Lex/Lexer.h>
+ #include <llvm/Support/Casting.h>
+
+-#include "clang/AST/QualTypeNames.h"
++#if LIBCLANG_VERSION_MAJOR >= 22
++// LLVM 22 provides a compatible QualTypeNames implementation in libclang.
++# include <clang/AST/QualTypeNames.h>
++#else
++# include "clang/AST/QualTypeNames.h"
++#endif
+ #include "template_declaration.h"
+
+ #include <cstdio>
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-tools/-/commit/f4ad2bab76271433fb102f2862e1ac36d2ad4bc2
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-tools/-/commit/f4ad2bab76271433fb102f2862e1ac36d2ad4bc2
You're receiving this email because of your account on gitlab.archlinux.org.
