Accepting request 1318061 from KDE:Qt6

Update to 3.1.1

OBS-URL: https://build.opensuse.org/request/show/1318061
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qbs?expand=0&rev=26

0001-Fix-build-with-Qt-6.10.patch

@@ -0,0 +1,30 @@
+From 17abbbfe1ffdc59491f9f84c22ed27b5b29ca76d Mon Sep 17 00:00:00 2001
+From: Christophe Marin <christophe@krop.fr>
+Date: Wed, 8 Oct 2025 20:49:54 +0200
+Subject: [PATCH] Fix build with Qt 6.10
+
+---
+ CMakeLists.txt | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a04a013..abdd7a8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,6 +40,13 @@ find_package(Qt${QT_VERSION_MAJOR}
+     REQUIRED
+     )
+ 
++if(Qt6Core_FOUND AND (Qt6Core_VERSION VERSION_GREATER_EQUAL 6.10))
++    find_package(Qt6
++        COMPONENTS CorePrivate
++        REQUIRED
++        )
++endif()
++
+ find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Script QUIET)
+ 
+ if (Qt6_FOUND)
+-- 
+2.51.0
+

qbs-src-2.2.2.tar.gz

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

qbs-src-3.1.1.tar.gz

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

qbs.changes

@@ -1,3 +1,73 @@
+-------------------------------------------------------------------
+Sun Nov 16 09:27:20 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 3.1.1
+  * Fix nodiscard warnings with Qt 6.10
+  * gcc: handle absolute module source paths in modules.json files
+  * Add missing space in output of rule example and a test
+
+-------------------------------------------------------------------
+Tue Oct 21 15:52:03 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 3.1.0. Check the installed changelog files for the full
+  list of changes.
+  * Qbs now prints information about files being installed
+  * New modules were added for fine-tuning builds: `config.build`,
+    `config.install` and `installpaths`
+  * The `install` property in convenience items such as
+    `CppApplication` now defaults to `true`
+  * The `texttemplate` module received support for an
+    alternative syntax
+  * The `Process` service now has an `errrorString` method
+  * The `vcs` module now supports the `Mercurial` tool and
+    there are new properties `repoLatestTag`,
+    `repoCommitsSinceTag`, and `repoCommitSha`
+  * Added a `Graphviz` generator to visualize project structures
+  * The bundled QuickJS was updated to version 0.10.1
+
+-------------------------------------------------------------------
+Wed Oct  8 18:37:03 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 3.0.3. Check the installed changelog files for the full
+  list of changes.
+- Add patch
+  * 0001-Fix-build-with-Qt-6.10.patch
+
+-------------------------------------------------------------------
+Wed Apr 16 12:44:46 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 2.6.1
+  * Command descriptions are now printed with the product name as
+    the prefix instead of the suffix.
+  * When building only specific products via the `-p` option,
+    dependent products are not necessarily built in their
+    entirety anymore. Instead, only the artifacts
+    required for the requested products are built.
+  * ConanfileProbe now supports Conan 2 and QbsDeps generator.
+  * Added new `Rule` property `auxiliaryInputsFromDependencies`.
+  * The `Rule` property `explicitlyDependsOnFromDependencies`
+    now matches all artifacts from the dependencies, not just
+    target artifacts.
+  * The version requirement in a `Depends` item is now checked
+    earlier, fixing
+    the problem that a non-matching version of a library could
+    break project resolving if it was found before the matching
+    version.
+  * Added a mode that loads a build graph followed by a forced
+    re-resolve.
+  * In IDE mode, messages of type "error" instead of "warning"
+    are now emitted
+    for errors that would stop the build in non-IDE mode
+  * Added `lupdate` support via the new `QtLupdateRunner` item
+
+-------------------------------------------------------------------
+Wed Mar 12 13:42:32 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 2.5.1. Changes since 2.5.0:
+  * Fixed use of wrong declaration when looking up properties
+    via the parent item
+  * Fixed crash when resolving Probes
+
 -------------------------------------------------------------------
 Sun Mar 17 19:02:59 UTC 2024 - Dirk Müller <dmueller@suse.com>
 

qbs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qbs
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 # Copyright (c) 2018 The Qt Company.
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,8 +17,12 @@
 #
 
 
+%if %{?suse_version} > 1500
+# No python-beautifulsou4 is 15.6
+%bcond_without qch_doc
+%endif
 Name:           qbs
-Version:        2.2.2
+Version:        3.1.1
 Release:        0
 Summary:        Build tool for software projects
 # Legal:
@@ -29,6 +33,8 @@ Summary:        Build tool for software projects
 License:        LGPL-3.0-only
 URL:            https://wiki.qt.io/Qbs
 Source:         https://download.qt.io/official_releases/qbs/%{version}/qbs-src-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM
+Patch0:         0001-Fix-build-with-Qt-6.10.patch
 BuildRequires:  fdupes
 BuildRequires:  qt6-core-private-devel
 BuildRequires:  cmake(Qt6Concurrent)
@@ -38,10 +44,14 @@ BuildRequires:  cmake(Qt6Gui)
 BuildRequires:  cmake(Qt6Network)
 BuildRequires:  cmake(Qt6Widgets)
 BuildRequires:  cmake(Qt6Xml)
+%if %{with qch_doc}
+BuildRequires:  python3
+BuildRequires:  python3-bs4
+BuildRequires:  python3-lxml
+BuildRequires:  cmake(Qt6Tools)
+%endif
 # Qt Creator used to package qbs too
 Conflicts:      libqt5-creator <= 4.5.0
-# Fails to build on 32bit archs
-ExcludeArch:    %ix86 armv7hl
 
 %description
 Qbs is a tool that helps simplify the build process for developing projects
@@ -76,26 +86,26 @@ This package contains examples to show different qbs usages.
 
 %build
 %cmake_qt6 \
-  -DQBS_ENABLE_RPATH:BOOL=OFF \
-  -DQBS_INSTALL_MAN_PAGE:BOOL=ON \
+  -DQBS_ENABLE_RPATH:BOOL=FALSE \
+  -DQBS_INSTALL_MAN_PAGE:BOOL=TRUE \
+%if %{with qch_doc}
+  -DQBS_INSTALL_QCH_DOCS:BOOL=TRUE \
+%endif
 %if 0%{?suse_version} == 1500
   -DQBS_LIBEXEC_INSTALL_DIR:STRING=lib/qbs \
 %endif
   -DQBS_LIB_INSTALL_DIR:STRING=%{_lib} \
   -DQBS_PLUGINS_INSTALL_BASE:STRING=%{_lib} \
-  -DWITH_TESTS:BOOL=OFF
+  -DWITH_TESTS:BOOL=FALSE
 
-%{qt6_build}
+%qt6_build
 
 %install
-%{qt6_install}
+%qt6_install
 
 # Cleanup
 rm -r %{buildroot}%{_qt6_sharedir}/qbs/python
 
-# E: version-control-internal-file
-rm %{buildroot}%{_qt6_sharedir}/qbs/modules/typescript/qbs-tsc-scan/.gitignore
-
 %fdupes %{buildroot}%{_qt6_sharedir}/qbs
 
 %ldconfig_scriptlets
@@ -103,10 +113,10 @@ rm %{buildroot}%{_qt6_sharedir}/qbs/modules/typescript/qbs-tsc-scan/.gitignore
 %files
 %license LGPL_EXCEPTION.txt LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPL3-EXCEPT
 %doc README.md changelogs/changes-%{version}.md
-%dir %{_libexecdir}/qbs/
-%dir %{_libdir}/qbs
-%dir %{_libdir}/qbs/plugins
-%dir %{_qt6_sharedir}/qbs
+%if %{with qch_doc}
+%dir %{_qt6_sharedir}/doc/qbs
+%doc %{_qt6_sharedir}/doc/qbs/qbs.qch
+%endif
 %{_bindir}/qbs
 %{_bindir}/qbs-config
 %{_bindir}/qbs-config-ui
@@ -114,16 +124,21 @@ rm %{buildroot}%{_qt6_sharedir}/qbs/modules/typescript/qbs-tsc-scan/.gitignore
 %{_bindir}/qbs-setup-android
 %{_bindir}/qbs-setup-qt
 %{_bindir}/qbs-setup-toolchains
-%{_libdir}/qbs/plugins/libclangcompilationdbgenerator.so
-%{_libdir}/qbs/plugins/libiarewgenerator.so
-%{_libdir}/qbs/plugins/libkeiluvgenerator.so
-%{_libdir}/qbs/plugins/libmakefilegenerator.so
-%{_libdir}/qbs/plugins/libqbs_cpp_scanner.so
-%{_libdir}/qbs/plugins/libqbs_qt_scanner.so
-%{_libdir}/qbs/plugins/libvisualstudiogenerator.so
+%dir %{_libexecdir}/qbs/
 %{_libexecdir}/qbs/qbs_processlauncher
 %{_mandir}/man1/qbs.1%{ext_man}
+%dir %{_qt6_libdir}/qbs
+%dir %{_qt6_libdir}/qbs/plugins
 %{_qt6_libdir}/libqbscore.so.*
+%{_qt6_libdir}/qbs/plugins/libclangcompilationdbgenerator.so
+%{_qt6_libdir}/qbs/plugins/libgraphvizgenerator.so
+%{_qt6_libdir}/qbs/plugins/libiarewgenerator.so
+%{_qt6_libdir}/qbs/plugins/libkeiluvgenerator.so
+%{_qt6_libdir}/qbs/plugins/libmakefilegenerator.so
+%{_qt6_libdir}/qbs/plugins/libqbs_cpp_scanner.so
+%{_qt6_libdir}/qbs/plugins/libqbs_qt_scanner.so
+%{_qt6_libdir}/qbs/plugins/libvisualstudiogenerator.so
+%dir %{_qt6_sharedir}/qbs
 %{_qt6_sharedir}/qbs/imports/
 %{_qt6_sharedir}/qbs/module-providers/
 %{_qt6_sharedir}/qbs/modules/