Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-tools for openSUSE:Factory checked in at 2026-04-18 21:34:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-tools (Old) and /work/SRC/openSUSE:Factory/.qt6-tools.new.11940 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-tools" Sat Apr 18 21:34:09 2026 rev:57 rq:1347332 version:6.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-tools/qt6-tools.changes 2026-03-28 20:13:25.449603891 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-tools.new.11940/qt6-tools.changes 2026-04-18 21:34:22.684680527 +0200 @@ -1,0 +2,7 @@ +Sun Apr 12 17:22:36 UTC 2026 - Aaron Puchert <[email protected]> + +- Add patches: + * 0003-QDoc-Swap-forever-for-while-true.patch + * 0004-QDoc-Disable-Qt-keyword-macros.patch + +------------------------------------------------------------------- New: ---- 0003-QDoc-Swap-forever-for-while-true.patch 0004-QDoc-Disable-Qt-keyword-macros.patch ----------(New B)---------- New:- Add patches: * 0003-QDoc-Swap-forever-for-while-true.patch * 0004-QDoc-Disable-Qt-keyword-macros.patch New: * 0003-QDoc-Swap-forever-for-while-true.patch * 0004-QDoc-Disable-Qt-keyword-macros.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-tools.spec ++++++ --- /var/tmp/diff_new_pack.xoKCIF/_old 2026-04-18 21:34:23.500713784 +0200 +++ /var/tmp/diff_new_pack.xoKCIF/_new 2026-04-18 21:34:23.500713784 +0200 @@ -51,6 +51,8 @@ # PATCH-FIX-UPSTREAM -- llvm 22 support Patch0: 0001-QDoc-Add-LLVM-22-implementation-to-QualTypeNames-for.patch Patch1: 0002-CMake-Add-LLVM-22-to-supported-QDoc-Clang-versions.patch +Patch2: 0003-QDoc-Swap-forever-for-while-true.patch +Patch3: 0004-QDoc-Disable-Qt-keyword-macros.patch # clang-devel in Leap 15 points to clang7... %if 0%{?suse_version} == 1500 # Leap 15.6 has llvm 19 since 2025-02-12, we need to use it to avoid doc build issues ++++++ 0003-QDoc-Swap-forever-for-while-true.patch ++++++ >From 867156141492636085c6820c49937c9bdff3be0e Mon Sep 17 00:00:00 2001 From: Paul Wicking <[email protected]> Date: Tue, 7 Apr 2026 14:18:30 +0200 Subject: QDoc: Swap forever for while(true) Replace the Qt keyword `forever` with `while (true)` to enable `QT_NO_KEYWORDS`. Change-Id: Id9928960503c26de6eb236bdff067474e52be813 Reviewed-by: Topi Reinio <[email protected]> --- src/qdoc/qdoc/src/qdoc/generator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qdoc/qdoc/src/qdoc/generator.cpp b/src/qdoc/qdoc/src/qdoc/generator.cpp index f1ced4cc6..2116f0668 100644 --- a/src/qdoc/qdoc/src/qdoc/generator.cpp +++ b/src/qdoc/qdoc/src/qdoc/generator.cpp @@ -302,7 +302,7 @@ QString Generator::fileBase(const Node *node) const } else { base.clear(); const Node *p = node; - forever { + while (true) { const Node *pp = p->parent(); base.prepend(p->name()); if (pp == nullptr || pp->name().isEmpty() || pp->isTextPageNode()) -- cgit v1.2.3 ++++++ 0004-QDoc-Disable-Qt-keyword-macros.patch ++++++ >From 34021aa79a7fb5d1429bc2e4a6e735eafc84e567 Mon Sep 17 00:00:00 2001 From: Paul Wicking <[email protected]> Date: Wed, 11 Mar 2026 08:17:47 +0100 Subject: QDoc: Disable Qt keyword macros Qt defines convenience macros for signal-slot keywords such as `emit`, `signals`, and `slots`. QDoc doesn't use signals and slots, yet these macros pollute the preprocessor namespace when compiling against third-party headers. Upstream LLVM changes introduce a transitive inclusion chain that pulls in a header containing a bare `emit` method. Qt's empty `emit` macro turns the method declaration into a syntax error. Distribution packagers such as Arch Linux have worked around this with QT_NO_EMIT. Disabling all Qt keyword macros goes one step further and future-proofs a tool that has no use for them against similar collisions. Task-number: QTBUG-144620 Change-Id: I6226e854159ec6d7a6d2a83a16dc850e93598045 Reviewed-by: Topi Reinio <[email protected]> (cherry picked from commit 29bcd0789efaa36f6efa9ca512fbea9781f7d683) --- src/qdoc/qdoc/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qdoc/qdoc/CMakeLists.txt b/src/qdoc/qdoc/CMakeLists.txt index 729f6bbd9..84b25bdca 100644 --- a/src/qdoc/qdoc/CMakeLists.txt +++ b/src/qdoc/qdoc/CMakeLists.txt @@ -103,6 +103,7 @@ qt_internal_add_tool(${target_name} ATTRIBUTION_FILE_DIR_PATHS src/qdoc/clang/AST DEFINES + QT_NO_KEYWORDS # To provide the ability to workaround version-specific Clang issues. # A re-export of (LLVM|CLANG)_VERSION_MAJOR done in WrapLibClang.cmake LIBCLANG_VERSION_MAJOR=${QT_LIB_CLANG_VERSION_MAJOR} -- cgit v1.2.3
