Accepting request 1207635 from KDE:Qt6

Qt 6.8.0 (forwarded request 1206590 from krop)

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

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,11 @@
+-------------------------------------------------------------------
+Tue Oct  8 09:29:54 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.8.0:
+  * https://www.qt.io/blog/qt-6.8-released
+- Drop patch, no longer needed:
+  * fix-llvm19-build.patch
+
 -------------------------------------------------------------------
 Sat Sep 28 08:23:10 UTC 2024 - Christophe Marin <christophe@krop.fr>
 

qt6-tools.spec

@@ -16,8 +16,8 @@
 #
 
 
-%define real_version 6.7.3
+%define real_version 6.8.0
-%define short_version 6.7
+%define short_version 6.8
 %define tar_name qttools-everywhere-src
 %define tar_suffix %{nil}
 #
@@ -27,7 +27,7 @@
 %endif
 #
 Name:           qt6-tools%{?pkg_suffix}
-Version:        6.7.3
+Version:        6.8.0
 Release:        0
 Summary:        Qt 6 Tools libraries and tools
 # TODO Check if it's still valid
@@ -46,16 +46,11 @@ 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
+%if 0%{?suse_version} == 1500
 BuildRequires:  clang17-devel
 %else
-%if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150500
+BuildRequires:  clang-devel >= 17
-BuildRequires:  clang15-devel
-%else
-BuildRequires:  clang-devel >= 8
-%endif
 %endif
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  pkgconfig
@@ -66,6 +61,7 @@ BuildRequires:  qt6-qml-private-devel
 BuildRequires:  qt6-quick-private-devel
 BuildRequires:  qt6-widgets-private-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  cmake(Qt6Concurrent) = %{real_version}
 BuildRequires:  cmake(Qt6Core) = %{real_version}
 BuildRequires:  cmake(Qt6DBus) = %{real_version}
 BuildRequires:  cmake(Qt6Gui) = %{real_version}
@@ -73,6 +69,7 @@ BuildRequires:  cmake(Qt6Network) = %{real_version}
 BuildRequires:  cmake(Qt6OpenGL) = %{real_version}
 BuildRequires:  cmake(Qt6OpenGLWidgets) = %{real_version}
 BuildRequires:  cmake(Qt6PrintSupport) = %{real_version}
+BuildRequires:  cmake(Qt6QmlLSPrivate) = %{real_version}
 BuildRequires:  cmake(Qt6Quick) = %{real_version}
 BuildRequires:  cmake(Qt6QuickWidgets) = %{real_version}
 BuildRequires:  cmake(Qt6Sql) = %{real_version}
@@ -295,6 +292,7 @@ This library does not have any ABI or API guarantees.
 
 # CMake files are not needed for plugins (except for Qt6UiPlugin)
 rm %{buildroot}%{_qt6_cmakedir}/Qt6Designer/*Plugin{Config,Targets}*.cmake
+rm %{buildroot}%{_qt6_cmakedir}/Qt6Help/*Plugin{Config,Targets}*.cmake
 
 # This doesn't look useful
 rm -r %{buildroot}%{_qt6_includedir}/QtQDocCatch*
@@ -413,6 +411,8 @@ install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{
 %{_datadir}/icons/hicolor/128x128/apps/assistant6.png
 %{_datadir}/icons/hicolor/32x32/apps/assistant6.png
 %{_qt6_bindir}/assistant
+%dir %{_qt6_pluginsdir}/help
+%{_qt6_pluginsdir}/help/libhelpplugin.so
 
 %files designer
 %dir %{_qt6_pluginsdir}/designer

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

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