Accepting request 1282583 from KDE:Qt6

Qt 6.9.1 (forwarded request 1282452 from krop)

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

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

@@ -0,0 +1,34 @@
+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;
+ }
+ 

qt6-tools.changes

@@ -1,3 +1,82 @@
+-------------------------------------------------------------------
+Tue Jun  3 07:49:33 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.9.1:
+  * https://www.qt.io/blog/qt-6.9.1-released
+
+-------------------------------------------------------------------
+Thu May 22 16:12:43 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
+
+- Add patch from upstream to fix qdoc reproducibility issues
+  (bsc#1243434):
+  * 0001-QDoc-Sort-non-function-nodes-by-name-then-erase-duplicates.patch
+
+-------------------------------------------------------------------
+Mon Apr  7 16:13:26 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Fix desktop files
+
+-------------------------------------------------------------------
+Wed Apr  2 11:03:43 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.9.0:
+  * https://www.qt.io/blog/qt-6.9-released
+
+-------------------------------------------------------------------
+Mon Feb 24 09:34:44 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Use clang 19 on Leap 15.6.
+  The 15.6 update repo got a new llvm version which causes issues
+  if both llvm 17 and 19 are present
+
+-------------------------------------------------------------------
+Fri Jan 31 10:23:01 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.8.2
+  https://www.qt.io/blog/qt-6.8.2-released
+
+-------------------------------------------------------------------
+Wed Jan 22 18:08:40 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
+
+- Fix license.
+
+-------------------------------------------------------------------
+Mon Dec  2 13:02:14 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.8.1:
+  * https://www.qt.io/blog/qt-6.8.1-released
+
+-------------------------------------------------------------------
+Mon Nov 11 14:53:49 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Reintroduce proper %requires_eq on libclang, it's needed to ensure
+  that qdoc pulls in a libclang suitable for the used libclang-cpp.
+
+-------------------------------------------------------------------
+Mon Nov  4 11:58:21 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Fix qdoc runtime dependency
+
+-------------------------------------------------------------------
+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>
+
+- 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

@@ -1,7 +1,7 @@
 #
 # spec file for package qt6-tools
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
 #
 
 
-%define real_version 6.7.2
+%define real_version 6.9.1
-%define short_version 6.7
+%define short_version 6.9
 %define tar_name qttools-everywhere-src
 %define tar_suffix %{nil}
 #
@@ -27,16 +27,15 @@
 %endif
 #
 Name:           qt6-tools%{?pkg_suffix}
-Version:        6.7.2
+Version:        6.9.1
 Release:        0
 Summary:        Qt 6 Tools libraries and tools
-# TODO Check if it's still valid
 # Legal:
 # most src/ subfolders are GPL-3.0-only WITH Qt-GPL-exception-1.0, except:
-# qdoc is GPL-3.0-only WITH Qt-GPL-exception-1.0 + (LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)) == GPL-3.0-only
+# qdoc is GPL-3.0-only WITH Qt-GPL-exception-1.0
-# src/shared contains BSD-3-Clause and LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) files. The
+# src/shared contains BSD-3-Clause and LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-only) files. The
 # 'GPL-3.0-only WITH Qt-GPL-exception-1.0' files in this folder are only used on Windows.
-License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-3.0-only WITH Qt-GPL-exception-1.0
+License:        (LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only WITH Qt-GPL-exception-1.0
 URL:            https://www.qt.io
 Source0:        https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
 Source10:       org.qt.designer6.desktop
@@ -46,36 +45,36 @@ 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 && 0%{?sle_version} >= 150600
+%if 0%{?suse_version} == 1500
-BuildRequires:  clang17-devel
+# Leap 15.6 has llvm 19 since 2025-02-12, we need to use it to avoid doc build issues
+BuildRequires:  clang19-devel
 %else
-%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150400
+BuildRequires:  clang-devel >= 17
-BuildRequires:  clang15-devel
-%else
-BuildRequires:  clang-devel >= 8
-%endif
 %endif
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  pkgconfig
-BuildRequires:  qt6-core-private-devel
+BuildRequires:  cmake(Qt6Concurrent) = %{real_version}
-BuildRequires:  qt6-dbus-private-devel
-BuildRequires:  qt6-gui-private-devel
-BuildRequires:  qt6-qml-private-devel
-BuildRequires:  qt6-quick-private-devel
-BuildRequires:  qt6-widgets-private-devel
-BuildRequires:  update-desktop-files
 BuildRequires:  cmake(Qt6Core) = %{real_version}
+BuildRequires:  cmake(Qt6CorePrivate) = %{real_version}
 BuildRequires:  cmake(Qt6DBus) = %{real_version}
+BuildRequires:  cmake(Qt6DBusPrivate) = %{real_version}
 BuildRequires:  cmake(Qt6Gui) = %{real_version}
+BuildRequires:  cmake(Qt6GuiPrivate) = %{real_version}
 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(Qt6QmlPrivate) = %{real_version}
 BuildRequires:  cmake(Qt6Quick) = %{real_version}
+BuildRequires:  cmake(Qt6QuickPrivate) = %{real_version}
 BuildRequires:  cmake(Qt6QuickWidgets) = %{real_version}
 BuildRequires:  cmake(Qt6Sql) = %{real_version}
 BuildRequires:  cmake(Qt6Widgets) = %{real_version}
+BuildRequires:  cmake(Qt6WidgetsPrivate) = %{real_version}
 BuildRequires:  cmake(Qt6Xml) = %{real_version}
 BuildRequires:  pkgconfig(libzstd) >= 1.3
 # These packages are required to generate documentation for the Qt packages
@@ -135,10 +134,10 @@ Development files for the Qt6 Designer libraries.
 
 %package -n qt6-designer-private-devel
 Summary:        Non-ABI stable API for the Qt 6 Designer libraries
+Requires:       cmake(Qt6CorePrivate) = %{real_version}
 Requires:       cmake(Qt6Designer) = %{real_version}
-%requires_eq    qt6-core-private-devel
+Requires:       cmake(Qt6GuiPrivate) = %{real_version}
-%requires_eq    qt6-gui-private-devel
+Requires:       cmake(Qt6WidgetsPrivate) = %{real_version}
-%requires_eq    qt6-widgets-private-devel
 
 %description -n qt6-designer-private-devel
 This package provides private headers of libQt6Designer that do not have any
@@ -163,8 +162,8 @@ Development files for the Qt6 Help library.
 
 %package -n qt6-help-private-devel
 Summary:        Non-ABI stable API for the Qt 6 Help library
+Requires:       cmake(Qt6CorePrivate) = %{real_version}
 Requires:       cmake(Qt6Help) = %{real_version}
-%requires_eq    qt6-core-private-devel
 
 %description -n qt6-help-private-devel
 This package provides private headers of libQt6Help that do not have any
@@ -245,7 +244,9 @@ Command line client for communication over D-Bus.
 Summary:        Qt 6 Tool used by Qt to generate documentation
 License:        GPL-3.0-only
 # qdoc hardcodes clang include paths: boo#1109367, QTBUG-70687
-%requires_eq    libclang%{_llvm_sonum}
+%requires_eq    libclang%{_libclang_sonum}
+# Both qdoc and libclang link against libclang-cpp, so make sure it's compatible.
+%requires_eq    libclang-cpp%{_llvm_sonum}
 
 %description qdoc
 Qt 6 Tool used by Qt to generate documentation.
@@ -263,11 +264,11 @@ This library does not have any ABI or API guarantees.
 %package -n qt6-designercomponents-private-devel
 Summary:        Development files for the Qt 6 DesignerComponents library
 Requires:       libQt6DesignerComponents6 = %{version}
-Requires:       qt6-designer-private-devel = %{version}
 Requires:       cmake(Qt6Core) = %{real_version}
+Requires:       cmake(Qt6DesignerPrivate) = %{real_version}
+Requires:       cmake(Qt6GuiPrivate) = %{real_version}
+Requires:       cmake(Qt6WidgetsPrivate) = %{real_version}
 Requires:       cmake(Qt6Xml) = %{real_version}
-%requires_eq    qt6-gui-private-devel
-%requires_eq    qt6-widgets-private-devel
 
 %description -n qt6-designercomponents-private-devel
 Development files for the Qt 6 DesignerComponents library.
@@ -281,7 +282,9 @@ This library does not have any ABI or API guarantees.
 %autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix}
 
 %build
-%cmake_qt6 -DBUILD_TESTING:BOOL=OFF
+%cmake_qt6 \
+  -DQT_GENERATE_SBOM:BOOL=FALSE \
+  -DBUILD_TESTING:BOOL=FALSE
 
 %{qt6_build}
 
@@ -294,6 +297,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*
@@ -302,20 +306,20 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qdoccatch*.pri
 rm %{buildroot}%{_qt6_descriptionsdir}/QDocCatch*.json
 
 # Desktop files for applications
-%suse_update_desktop_file -i org.qt.assistant6
+mkdir -p %{buildroot}%{_qt6_sharedir}/applications
-%suse_update_desktop_file -i org.qt.designer6
+install -D -m644 %{SOURCE10} %{buildroot}%{_qt6_sharedir}/applications/org.qt.designer6.desktop
-%suse_update_desktop_file -i org.qt.linguist6
+install -D -m644 %{SOURCE11} %{buildroot}%{_qt6_sharedir}/applications/org.qt.linguist6.desktop
-rm %{buildroot}%{_datadir}/pixmaps/linguist6.png
+install -D -m644 %{SOURCE12} %{buildroot}%{_qt6_sharedir}/applications/org.qt.qdbusviewer6.desktop
-%suse_update_desktop_file -i org.qt.qdbusviewer6
+install -D -m644 %{SOURCE13} %{buildroot}%{_qt6_sharedir}/applications/org.qt.assistant6.desktop
 
-# Icons for the desktop files
+# Icons for desktop files
-install -D -m644 src/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/designer6.png
+install -D -m644 src/designer/src/designer/images/designer.png %{buildroot}%{_qt6_sharedir}/icons/hicolor/128x128/apps/designer6.png
-install -D -m644 %{SOURCE14} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/linguist6.png
+install -D -m644 %{SOURCE14} %{buildroot}%{_qt6_sharedir}/icons/hicolor/48x48/apps/linguist6.png
-install -D -m644 src/linguist/linguist/images/icons/linguist-128-32.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/linguist6.png
+install -D -m644 src/linguist/linguist/images/icons/linguist-128-32.png %{buildroot}%{_qt6_sharedir}/icons/hicolor/128x128/apps/linguist6.png
-install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qdbusviewer6.png
+install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png %{buildroot}%{_qt6_sharedir}/icons/hicolor/32x32/apps/qdbusviewer6.png
-install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qdbusviewer6.png
+install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{_qt6_sharedir}/icons/hicolor/128x128/apps/qdbusviewer6.png
-install -D -m644 src/assistant/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant6.png
+install -D -m644 src/assistant/assistant/images/assistant.png %{buildroot}%{_qt6_sharedir}/icons/hicolor/32x32/apps/assistant6.png
-install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant6.png
+install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{_qt6_sharedir}/icons/hicolor/128x128/apps/assistant6.png
 
 %ldconfig_scriptlets -n libQt6Designer6
 %ldconfig_scriptlets -n libQt6DesignerComponents6
@@ -367,6 +371,7 @@ install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{
 %exclude %{_qt6_includedir}/QtDesigner/%{real_version}
 
 %files -n qt6-designer-private-devel
+%{_qt6_cmakedir}/Qt6DesignerPrivate/
 %{_qt6_includedir}/QtDesigner/%{real_version}/
 %{_qt6_mkspecsdir}/modules/qt_lib_designer_private.pri
 
@@ -385,6 +390,7 @@ install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{
 %exclude %{_qt6_includedir}/QtHelp/%{real_version}
 
 %files -n qt6-help-private-devel
+%{_qt6_cmakedir}/Qt6HelpPrivate/
 %{_qt6_includedir}/QtHelp/%{real_version}/
 %{_qt6_mkspecsdir}/modules/qt_lib_help_private.pri
 
@@ -403,26 +409,29 @@ install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{
 %exclude %{_qt6_includedir}/QtUiTools/%{real_version}
 
 %files -n qt6-uitools-private-devel
+%{_qt6_cmakedir}/Qt6UiToolsPrivate/
 %{_qt6_includedir}/QtUiTools/%{real_version}/
 %{_qt6_mkspecsdir}/modules/qt_lib_uitools_private.pri
 
 %files assistant
 %{_bindir}/assistant6
-%{_datadir}/applications/org.qt.assistant6.desktop
-%{_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
+%{_qt6_sharedir}/applications/org.qt.assistant6.desktop
+%{_qt6_sharedir}/icons/hicolor/128x128/apps/assistant6.png
+%{_qt6_sharedir}/icons/hicolor/32x32/apps/assistant6.png
 
 %files designer
 %dir %{_qt6_pluginsdir}/designer
 %{_bindir}/designer6
-%{_datadir}/applications/org.qt.designer6.desktop
-%{_datadir}/icons/hicolor/128x128/apps/designer6.png
 %{_qt6_bindir}/designer
 %{_qt6_pluginsdir}/designer/libcontainerextension.so
 %{_qt6_pluginsdir}/designer/libcustomwidgetplugin.so
 %{_qt6_pluginsdir}/designer/libqquickwidget.so
 %{_qt6_pluginsdir}/designer/libtaskmenuextension.so
+%{_qt6_sharedir}/applications/org.qt.designer6.desktop
+%{_qt6_sharedir}/icons/hicolor/128x128/apps/designer6.png
 
 %files helpgenerators
 %{_qt6_libexecdir}/qhelpgenerator
@@ -433,9 +442,6 @@ install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{
 %{_bindir}/linguist6
 %{_bindir}/lrelease6
 %{_bindir}/lupdate6
-%{_datadir}/applications/org.qt.linguist6.desktop
-%{_datadir}/icons/hicolor/48x48/apps/linguist6.png
-%{_datadir}/icons/hicolor/128x128/apps/linguist6.png
 %{_qt6_bindir}/lconvert
 %{_qt6_bindir}/linguist
 %{_qt6_bindir}/lrelease
@@ -444,6 +450,9 @@ install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{
 %{_qt6_libexecdir}/lprodump
 %{_qt6_libexecdir}/lrelease-pro
 %{_qt6_libexecdir}/lupdate-pro
+%{_qt6_sharedir}/applications/org.qt.linguist6.desktop
+%{_qt6_sharedir}/icons/hicolor/48x48/apps/linguist6.png
+%{_qt6_sharedir}/icons/hicolor/128x128/apps/linguist6.png
 
 %files -n qt6-linguist-devel
 %{_qt6_descriptionsdir}/Linguist.json
@@ -455,11 +464,11 @@ install -D -m644 src/assistant/assistant/images/assistant-128.png %{buildroot}%{
 %files qdbus
 %{_bindir}/qdbus6
 %{_bindir}/qdbusviewer6
-%{_datadir}/applications/org.qt.qdbusviewer6.desktop
-%{_datadir}/icons/hicolor/128x128/apps/qdbusviewer6.png
-%{_datadir}/icons/hicolor/32x32/apps/qdbusviewer6.png
 %{_qt6_bindir}/qdbus
 %{_qt6_bindir}/qdbusviewer
+%{_qt6_sharedir}/applications/org.qt.qdbusviewer6.desktop
+%{_qt6_sharedir}/icons/hicolor/128x128/apps/qdbusviewer6.png
+%{_qt6_sharedir}/icons/hicolor/32x32/apps/qdbusviewer6.png
 
 %files qdoc
 %{_bindir}/qdoc6