Accepting request 1205150 from KDE:Qt6

Qt 6.7.3

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

fix-llvm19-build.patch

@@ -0,0 +1,52 @@
+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,15 @@
+-------------------------------------------------------------------
+Sat Sep 28 08:23:10 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.7.3
+  * https://www.qt.io/blog/qt-6.7.3-released
+
+-------------------------------------------------------------------
+Tue Sep 24 21:22:32 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Add fix-llvm19-build.patch to fix build with LLVM 19. Upstream
+  report is at https://bugreports.qt.io/browse/QTBUG-129146.
+
 -------------------------------------------------------------------
 Wed Jun 19 07:26:03 UTC 2024 - Christophe Marin <christophe@krop.fr>
 

qt6-tools.spec

@@ -16,7 +16,7 @@
 #
 
 
-%define real_version 6.7.2
+%define real_version 6.7.3
 %define short_version 6.7
 %define tar_name qttools-everywhere-src
 %define tar_suffix %{nil}
@@ -27,7 +27,7 @@
 %endif
 #
 Name:           qt6-tools%{?pkg_suffix}
-Version:        6.7.2
+Version:        6.7.3
 Release:        0
 Summary:        Qt 6 Tools libraries and tools
 # TODO Check if it's still valid
@@ -46,11 +46,12 @@ Source13:       org.qt.assistant6.desktop
 # The 48x48 icon was removed from qttools
 Source14:       linguist6.png
 Source99:       qt6-tools-rpmlintrc
+Patch1:         fix-llvm19-build.patch
 # clang-devel in Leap 15 points to clang7...
 %if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150600
 BuildRequires:  clang17-devel
 %else
-%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150400
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150500
 BuildRequires:  clang15-devel
 %else
 BuildRequires:  clang-devel >= 8

qttools-everywhere-src-6.7.3.tar.xz

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