From f767cc77976780565bfa14a514f13f026d90c2b38a8f2603937b4273430ae5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 7 Feb 2025 11:21:17 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main qt6-tools revision d7d1c8926f6440917b2e33440b9b6de7 --- qt6-tools.changes | 42 +++++++++++++++++++++++++++++ qt6-tools.spec | 36 ++++++++++++++----------- qttools-everywhere-src-6.7.2.tar.xz | 3 --- qttools-everywhere-src-6.8.1.tar.xz | 3 +++ 4 files changed, 65 insertions(+), 19 deletions(-) delete mode 100644 qttools-everywhere-src-6.7.2.tar.xz create mode 100644 qttools-everywhere-src-6.8.1.tar.xz diff --git a/qt6-tools.changes b/qt6-tools.changes index af5efb2..9c7e4fb 100644 --- a/qt6-tools.changes +++ b/qt6-tools.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Wed Jan 22 18:08:40 UTC 2025 - Antonio Larrosa + +- Fix license. + +------------------------------------------------------------------- +Mon Dec 2 13:02:14 UTC 2024 - Christophe Marin + +- 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 + +- 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 + +- Fix qdoc runtime dependency + +------------------------------------------------------------------- +Tue Oct 8 09:29:54 UTC 2024 - Christophe Marin + +- 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 + +- 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 + +- 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 diff --git a/qt6-tools.spec b/qt6-tools.spec index 706cea7..2a1e611 100644 --- a/qt6-tools.spec +++ b/qt6-tools.spec @@ -16,8 +16,8 @@ # -%define real_version 6.7.2 -%define short_version 6.7 +%define real_version 6.8.1 +%define short_version 6.8 %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.8.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 -# src/shared contains BSD-3-Clause and LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) files. The +# 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-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 @@ -47,14 +46,10 @@ 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 && 0%{?sle_version} >= 150600 +%if 0%{?suse_version} == 1500 BuildRequires: clang17-devel %else -%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150400 -BuildRequires: clang15-devel -%else -BuildRequires: clang-devel >= 8 -%endif +BuildRequires: clang-devel >= 17 %endif BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig @@ -65,6 +60,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} @@ -72,6 +68,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} @@ -243,9 +240,11 @@ 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 +License: GPL-3.0-only WITH Qt-GPL-exception-1.0 # 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. @@ -281,7 +280,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 +295,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* @@ -412,6 +414,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 diff --git a/qttools-everywhere-src-6.7.2.tar.xz b/qttools-everywhere-src-6.7.2.tar.xz deleted file mode 100644 index a05c73b..0000000 --- a/qttools-everywhere-src-6.7.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a -size 9019636 diff --git a/qttools-everywhere-src-6.8.1.tar.xz b/qttools-everywhere-src-6.8.1.tar.xz new file mode 100644 index 0000000..8574754 --- /dev/null +++ b/qttools-everywhere-src-6.8.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d43d409be08b8681a0155a9c65114b69c9a3fc11aef6487bb7fdc5b283c432d +size 10293192