Sync from SUSE:SLFO:1.1 qt6-tools revision 6a92db44dc8205fa16ba61dece9d8539

qt6-tools.changes

@@ -1,58 +1,3 @@
--------------------------------------------------------------------
-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

@@ -16,8 +16,8 @@
 #
 
 
-%define real_version 6.8.2
+%define real_version 6.7.2
-%define short_version 6.8
+%define short_version 6.7
 %define tar_name qttools-everywhere-src
 %define tar_suffix %{nil}
 #
@@ -27,15 +27,16 @@
 %endif
 #
 Name:           qt6-tools%{?pkg_suffix}
-Version:        6.8.2
+Version:        6.7.2
 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 
+# 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
-# src/shared contains BSD-3-Clause and LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-only) files. The
+# src/shared contains BSD-3-Clause and LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) 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-only) 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-or-later) 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,11 +47,14 @@ Source13:       org.qt.assistant6.desktop
 Source14:       linguist6.png
 Source99:       qt6-tools-rpmlintrc
 # clang-devel in Leap 15 points to clang7...
-%if 0%{?suse_version} == 1500
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150600
-# Leap 15.6 has llvm 19 since 2025-02-12, we need to use it to avoid doc build issues
+BuildRequires:  clang17-devel
-BuildRequires:  clang19-devel
 %else
-BuildRequires:  clang-devel >= 17
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150400
+BuildRequires:  clang15-devel
+%else
+BuildRequires:  clang-devel >= 8
+%endif
 %endif
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  pkgconfig
@@ -61,7 +65,6 @@ 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}
@@ -69,7 +72,6 @@ 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}
@@ -241,11 +243,9 @@ Command line client for communication over D-Bus.
 
 %package qdoc
 Summary:        Qt 6 Tool used by Qt to generate documentation
-License:        GPL-3.0-only WITH Qt-GPL-exception-1.0
+License:        GPL-3.0-only
 # qdoc hardcodes clang include paths: boo#1109367, QTBUG-70687
-%requires_eq    libclang%{_libclang_sonum}
+%requires_eq    libclang%{_llvm_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.
@@ -281,9 +281,7 @@ This library does not have any ABI or API guarantees.
 %autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix}
 
 %build
-%cmake_qt6 \
+%cmake_qt6 -DBUILD_TESTING:BOOL=OFF
-  -DQT_GENERATE_SBOM:BOOL=FALSE \
-  -DBUILD_TESTING:BOOL=FALSE
 
 %{qt6_build}
 
@@ -296,7 +294,6 @@ 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*
@@ -415,8 +412,6 @@ 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