Re: [Buildroot] [PATCH v9 12/14] package/qt6/qt6tools: new package

[Thomas Petazzoni via buildroot <buildroot@buildroot.org>]

Hello Roy,

On Tue, 25 Jun 2024 23:18:36 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:

> The Network module is explicitly required by qt6tools:
> 
>   Failed to find required Qt component "Network".
> 
> We need host-qt6base with Sql support for host-qt6tools to build the
> qhelpgenerator host tool. qt6tools will fail to build if qhelpgenerator
> is not available:
> 
>   Failed to find the host tool "Qt6::qhelpgenerator".  It is part of the
>   Qt6ToolsTools package, but the package did not contain the tool.  Make sure
>   that the host module Tools was built with all features enabled (no
>   explicitly disabled tools).
> 
> Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>

Thanks, I've applied, with a number of changes. See below.


> diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in
> new file mode 100644
> index 0000000000..2e0484af2e
> --- /dev/null
> +++ b/package/qt6/qt6tools/Config.in
> @@ -0,0 +1,13 @@
> +config BR2_PACKAGE_QT6TOOLS
> +	bool "qt6tools"
> +	select BR2_PACKAGE_QT6BASE_NETWORK
> +	select BR2_PACKAGE_HOST_QT6BASE_NETWORK
> +	select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL

I've added comments above those two selects:

+       # qt6tools needs host-qt6tools, and host-qt6tools needs
+       # network support in qt6base. In addition, we also need
+       # host-qt6base with Sql support to build the qhelpgenerator
+       # tool, if target support for Sql is present

> +	help
> +	  Qt is a cross-platform application and UI framework for
> +	  developers using C++.
> +
> +	  Qt Tools provides tools facilitate the development
> +	  and design of applications.
> +
> +	  https://doc.qt.io/qt-6/qtmodules.html#qt-tools

This link anchor doesn't exist, so I've instead used:

	https://github.com/qt/qttools



> diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash
> new file mode 100644
> index 0000000000..9437e57d25
> --- /dev/null
> +++ b/package/qt6/qt6tools/qt6tools.hash
> @@ -0,0 +1,11 @@
> +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qttools-everywhere-src-6.7.2.tar.xz.sha256
> +sha256  58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a  qttools-everywhere-src-6.7.2.tar.xz
> +
> +# Hashes for license files:
> +sha256  9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce  LICENSES/BSD-3-Clause.txt

LICENSES/BSL-1.0.txt was missing here.

> +sha256  110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4  LICENSES/GFDL-1.3-no-invariants-only.txt
> +sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSES/GPL-2.0-only.txt
> +sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSES/GPL-3.0-only.txt
> +sha256  da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768  LICENSES/LGPL-3.0-only.txt
> +sha256  9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700  LICENSES/LicenseRef-Qt-Commercial.txt
> +sha256  40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2  LICENSES/Qt-GPL-exception-1.0.txt
> diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk
> new file mode 100644
> index 0000000000..2dd6670dff
> --- /dev/null
> +++ b/package/qt6/qt6tools/qt6tools.mk
> @@ -0,0 +1,40 @@
> +################################################################################
> +#
> +# qt6tools
> +#
> +################################################################################
> +
> +QT6TOOLS_VERSION = $(QT6_VERSION)
> +QT6TOOLS_SITE = $(QT6_SITE)
> +QT6TOOLS_SOURCE = qttools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6TOOLS_VERSION).tar.xz
> +QT6TOOLS_INSTALL_STAGING = YES
> +QT6TOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
> +
> +QT6TOOLS_CMAKE_BACKEND = ninja
> +
> +QT6TOOLS_LICENSE = \
> +	GPL-2.0+ or LGPL-3.0, \
> +	GPL-3.0, GFDL-1.3 no invariants (docs)
> +
> +QT6TOOLS_LICENSE_FILES = \
> +	LICENSES/GPL-2.0-only.txt \
> +	LICENSES/GPL-3.0-only.txt \
> +	LICENSES/LGPL-3.0-only.txt \
> +	LICENSES/GFDL-1.3-no-invariants-only.txt

Changed to:

QT6TOOLS_LICENSE = \
	BSD-3-Clause (examples), \
	BSD-3-Clause (corecon), \
	BSL-1.0 (catch), \
	LGPL-3.0 or GPL-3.0 or GPL-2.0, \
	GPL-3.0 WITH Qt-GPL-exception-1.0

QT6TOOLS_LICENSE_FILES = \
	LICENSES/BSD-3-Clause.txt \
	LICENSES/BSL-1.0.txt \
	LICENSES/GPL-2.0-only.txt \
	LICENSES/GPL-3.0-only.txt \
	LICENSES/LGPL-3.0-only.txt \
	LICENSES/Qt-GPL-exception-1.0.txt

which I believe is more accurate.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot