Accepting request 1301730 from KDE:Qt6

Update to 6.9.2 (forwarded request 1301562 from krop)

OBS-URL: https://build.opensuse.org/request/show/1301730
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-tools?expand=0&rev=51

0001-QDoc-Sort-non-function-nodes-by-name-then-erase-duplicates.patch

@@ -1,34 +0,0 @@
-From cc7a2141ff50d9826f13bb794d26479af0ab4492 Mon Sep 17 00:00:00 2001
-From: David Boddie <david.boddie@qt.io>
-Date: Wed, 14 May 2025 14:39:54 +0200
-Subject: [PATCH] QDoc: Sort non-function nodes by name then erase duplicates
-
-The order of node information in index files could change between runs
-of QDoc. This appears to be due to the sorting method used before
-erasing duplicate non-function nodes.
-
-Task-number: QTBUG-136483
-Change-Id: Ia58585c19e1c22172ee4c58c3ba054ec5d14a0d5
----
-
-diff --git a/src/qdoc/qdoc/src/qdoc/aggregate.cpp b/src/qdoc/qdoc/src/qdoc/aggregate.cpp
-index df4600d..4cdafc2 100644
---- a/src/qdoc/qdoc/src/qdoc/aggregate.cpp
-+++ b/src/qdoc/qdoc/src/qdoc/aggregate.cpp
-@@ -303,13 +303,11 @@
- const NodeList &Aggregate::nonfunctionList()
- {
-     m_nonfunctionList = m_nonfunctionMap.values();
--    // Erase duplicates
--    std::sort(m_nonfunctionList.begin(), m_nonfunctionList.end());
--    m_nonfunctionList.erase(std::unique(m_nonfunctionList.begin(), m_nonfunctionList.end()),
--                            m_nonfunctionList.end());
--
-     // Sort based on node name
-     std::sort(m_nonfunctionList.begin(), m_nonfunctionList.end(), Node::nodeNameLessThan);
-+    // Erase duplicates
-+    m_nonfunctionList.erase(std::unique(m_nonfunctionList.begin(), m_nonfunctionList.end()),
-+                            m_nonfunctionList.end());
-     return m_nonfunctionList;
- }
- 

fix-llvm19-build.patch

@@ -1,52 +0,0 @@
-Should eventually be replaced by upstream fix, see https://bugreports.qt.io/browse/QTBUG-129146.
-
-diff --git a/src/linguist/lupdate/clangtoolastreader.cpp b/src/linguist/lupdate/clangtoolastreader.cpp
-index 6b85c6c..63ddf3d 100644
---- a/src/linguist/lupdate/clangtoolastreader.cpp
-+++ b/src/linguist/lupdate/clangtoolastreader.cpp
-@@ -782,7 +782,7 @@ bool LupdateVisitor::VisitNamedDecl(clang::NamedDecl *namedDeclaration)
-     if (!fullLocation.isValid() || !fullLocation.getFileEntry())
-         return true;
- 
--    if (!LupdatePrivate::isFileSignificant(fullLocation.getFileEntry()->getName().str()))
-+    if (!LupdatePrivate::isFileSignificant(fullLocation.getFileEntry()->tryGetRealPathName().str()))
-         return true;
- 
-     qCDebug(lcClang) << "NamedDecl Name:   " << QString::fromStdString(namedDeclaration->getQualifiedNameAsString());
-diff --git a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
-index bd3cc63..c5ec3d4 100644
---- a/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
-+++ b/src/qdoc/qdoc/src/qdoc/clangcodeparser.cpp
-@@ -168,7 +168,11 @@ static std::string get_expression_as_string(const clang::Expr* expression, const
-  */
- static std::string get_default_value_initializer_as_string(const clang::TemplateTypeParmDecl* parameter) {
-     return (parameter && parameter->hasDefaultArgument()) ?
-+#if LIBCLANG_VERSION_MAJOR >= 19
-+                get_fully_qualified_type_name(parameter->getDefaultArgument().getTypeSourceInfo()->getType(), parameter->getASTContext()) :
-+#else
-                 get_fully_qualified_type_name(parameter->getDefaultArgument(), parameter->getASTContext()) :
-+#endif
-                 "";
- 
- }
-@@ -184,7 +188,11 @@ static std::string get_default_value_initializer_as_string(const clang::Template
-  */
- static std::string get_default_value_initializer_as_string(const clang::NonTypeTemplateParmDecl* parameter) {
-     return (parameter && parameter->hasDefaultArgument()) ?
-+#if LIBCLANG_VERSION_MAJOR >= 19
-+        get_expression_as_string(parameter->getDefaultArgument().getLocInfo().getAsExpr(), parameter->getASTContext()) : "";
-+#else
-         get_expression_as_string(parameter->getDefaultArgument(), parameter->getASTContext()) : "";
-+#endif
- 
- }
- 
-@@ -204,7 +212,7 @@ static std::string get_default_value_initializer_as_string(const clang::Template
-         const clang::TemplateName template_name = parameter->getDefaultArgument().getArgument().getAsTemplate();
- 
-         llvm::raw_string_ostream ss{default_value};
--        template_name.print(ss, parameter->getASTContext().getPrintingPolicy(), clang::TemplateName::Qualified::Fully);
-+        template_name.print(ss, parameter->getASTContext().getPrintingPolicy(), clang::TemplateName::Qualified::AsWritten);
-     }
- 
-     return default_value;

qt6-tools.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Aug 27 07:15:46 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.9.2:
+  * https://www.qt.io/blog/qt-6.9.2-released
+- Drp patch, merged upstream:
+  * 0001-QDoc-Sort-non-function-nodes-by-name-then-erase-duplicates.patch
+- Recommend installing qt6-translation for the -assistant,
+  -designer and -linguist subpackages.
+
 -------------------------------------------------------------------
 Tue Jun  3 07:49:33 UTC 2025 - Christophe Marin <christophe@krop.fr>
 

qt6-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qt6-tools
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 
-%define real_version 6.9.1
+%define real_version 6.9.2
 %define short_version 6.9
 %define tar_name qttools-everywhere-src
 %define tar_suffix %{nil}
@@ -27,7 +27,7 @@
 %endif
 #
 Name:           qt6-tools%{?pkg_suffix}
-Version:        6.9.1
+Version:        6.9.2
 Release:        0
 Summary:        Qt 6 Tools libraries and tools
 # Legal:
@@ -45,8 +45,6 @@ Source13:       org.qt.assistant6.desktop
 # The 48x48 icon was removed from qttools
 Source14:       linguist6.png
 Source99:       qt6-tools-rpmlintrc
-# PATCH-FIX-UPSTREAM 0001-QDoc-Sort-non-function-nodes-by-name-then-erase-duplicates.patch alarrosa@suse.com -- Fix reproducibility bsc#1243434
-Patch0:         0001-QDoc-Sort-non-function-nodes-by-name-then-erase-duplicates.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
@@ -199,12 +197,14 @@ ABI or API guarantees.
 
 %package assistant
 Summary:        Documentation browser
+Recommends:     qt6-translations
 
 %description assistant
 Qt Assistant is a tool for viewing documentation in Qt help file format.
 
 %package designer
 Summary:        Qt graphical interface creation tool
+Recommends:     qt6-translations
 
 %description designer
 Qt Designer is a tool for designing and building graphical user interface
@@ -221,6 +221,7 @@ Qt 6 tool for generating .qch help catalogs.
 
 %package linguist
 Summary:        Translation tool for Qt applications
+Recommends:     qt6-translations
 
 %description linguist
 Qt Linguist can be used by translator to translate text in Qt applications.

qttools-everywhere-src-6.7.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f
-size 9022820

qttools-everywhere-src-6.8.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:403115d8268503c6cc6e43310c8ae28eb9e605072a5d04e4a2de8b6af39981f7
-size 9059032

qttools-everywhere-src-6.9.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d8b7f7e8e970cc0b975205fd6d5832ea917ef3e751df69b97439c1cddd67a489
+size 10330412