* [Buildroot] [PATCH v3 02/14] package/qt6/qt6base: patch CVE-2024-33861
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
@ 2024-05-12 11:45 ` Roy Kollen Svendsen
2024-05-13 6:40 ` Thomas Petazzoni via buildroot
2024-05-12 11:45 ` [Buildroot] [PATCH v3 03/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
` (11 subsequent siblings)
12 siblings, 1 reply; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:45 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Got patch from:
https://download.qt.io/archive/qt/6.7/
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v2 -> v3:
- Add this new patch to the series since a new CVE fix was recently uploaded
to the Qt 6.7 downloads site.
.../0001-Fix-CVE-2024-33861-for-Qt6.7.patch | 36 +++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 package/qt6/qt6base/0001-Fix-CVE-2024-33861-for-Qt6.7.patch
diff --git a/package/qt6/qt6base/0001-Fix-CVE-2024-33861-for-Qt6.7.patch b/package/qt6/qt6base/0001-Fix-CVE-2024-33861-for-Qt6.7.patch
new file mode 100644
index 0000000000..f016788017
--- /dev/null
+++ b/package/qt6/qt6base/0001-Fix-CVE-2024-33861-for-Qt6.7.patch
@@ -0,0 +1,36 @@
+From 7f88945625f560796c86a267086f163e74c1407b Mon Sep 17 00:00:00 2001
+From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
+Date: Sun, 12 May 2024 07:15:32 +0200
+Subject: [PATCH] Fix CVE-2024-33861 for Qt6.7
+
+Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
+Upstream: https://download.qt.io/archive/qt/6.7/CVE-2024-33861-qtbase-6.7.diff
+---
+ src/corelib/text/qstringconverter.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp
+index b5749843..fd45ccf2 100644
+--- a/src/corelib/text/qstringconverter.cpp
++++ b/src/corelib/text/qstringconverter.cpp
+@@ -1954,7 +1954,7 @@ struct QStringConverterICU : QStringConverter
+ const void *context;
+ ucnv_getToUCallBack(icu_conv, &action, &context);
+ if (context != state)
+- ucnv_setToUCallBack(icu_conv, action, &state, nullptr, nullptr, &err);
++ ucnv_setToUCallBack(icu_conv, action, state, nullptr, nullptr, &err);
+
+ ucnv_toUnicode(icu_conv, &target, targetLimit, &source, sourceLimit, nullptr, flush, &err);
+ // We did reserve enough space:
+@@ -1987,7 +1987,7 @@ struct QStringConverterICU : QStringConverter
+ const void *context;
+ ucnv_getFromUCallBack(icu_conv, &action, &context);
+ if (context != state)
+- ucnv_setFromUCallBack(icu_conv, action, &state, nullptr, nullptr, &err);
++ ucnv_setFromUCallBack(icu_conv, action, state, nullptr, nullptr, &err);
+
+ ucnv_fromUnicode(icu_conv, &target, targetLimit, &source, sourceLimit, nullptr, flush, &err);
+ // We did reserve enough space:
+--
+2.45.0
+
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [Buildroot] [PATCH v3 02/14] package/qt6/qt6base: patch CVE-2024-33861
2024-05-12 11:45 ` [Buildroot] [PATCH v3 02/14] package/qt6/qt6base: patch CVE-2024-33861 Roy Kollen Svendsen
@ 2024-05-13 6:40 ` Thomas Petazzoni via buildroot
2024-05-13 7:57 ` Jesse Van Gavere
0 siblings, 1 reply; 19+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-05-13 6:40 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Jesse Van Gavere,
Samuel Martin, buildroot
Hello Roy,
On Sun, 12 May 2024 13:45:49 +0200
Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
>
> Got patch from:
>
> https://download.qt.io/archive/qt/6.7/
> Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
Thanks for this v3. However, you're again putting a fix as PATCH 02/14
of the series, after a bump. Is it because this CVE is only applicable
to Qt 6.7 (and not the 6.4.3 we already have in Buildroot) ? Could you
clarify this point, which is very important?
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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Buildroot] [PATCH v3 02/14] package/qt6/qt6base: patch CVE-2024-33861
2024-05-13 6:40 ` Thomas Petazzoni via buildroot
@ 2024-05-13 7:57 ` Jesse Van Gavere
2024-05-13 10:29 ` Roy Kollen Svendsen
0 siblings, 1 reply; 19+ messages in thread
From: Jesse Van Gavere @ 2024-05-13 7:57 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Samuel Martin,
Roy Kollen Svendsen, buildroot
Hello Thomas,
Op ma 13 mei 2024 om 08:40 schreef Thomas Petazzoni
<thomas.petazzoni@bootlin.com>:
>
> Hello Roy,
>
> On Sun, 12 May 2024 13:45:49 +0200
> Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
>
> > From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
> >
> > Got patch from:
> >
> > https://download.qt.io/archive/qt/6.7/
> > Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
>
> Thanks for this v3. However, you're again putting a fix as PATCH 02/14
> of the series, after a bump. Is it because this CVE is only applicable
> to Qt 6.7 (and not the 6.4.3 we already have in Buildroot) ? Could you
> clarify this point, which is very important?
This is not applicable to 6.4.3, the affected versions are detailed in
the bugzilla report below and it's only 6.5.0+
So this seems perfectly valid to go along with the version bump.
OpenSUSE report:
https://www.suse.com/security/cve/CVE-2024-33861.html
Bugzilla report clarifying affected versions
https://bugzilla.suse.com/show_bug.cgi?id=1223917
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com
Best regards,
Jesse
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Buildroot] [PATCH v3 02/14] package/qt6/qt6base: patch CVE-2024-33861
2024-05-13 7:57 ` Jesse Van Gavere
@ 2024-05-13 10:29 ` Roy Kollen Svendsen
2024-05-13 11:05 ` Jesse Van Gavere
0 siblings, 1 reply; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-13 10:29 UTC (permalink / raw)
To: Jesse Van Gavere
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Samuel Martin,
Thomas Petazzoni, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 1495 bytes --]
Hi Thomas and Jesse,
I assume I should add this information to the commit message and make a v4
patch-set?
Best regards,
Roy
man. 13. mai 2024 kl. 09:57 skrev Jesse Van Gavere <jesseevg@gmail.com>:
> Hello Thomas,
>
> Op ma 13 mei 2024 om 08:40 schreef Thomas Petazzoni
> <thomas.petazzoni@bootlin.com>:
>
> >
> > Hello Roy,
> >
> > On Sun, 12 May 2024 13:45:49 +0200
> > Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
> >
> > > From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
> > >
> > > Got patch from:
> > >
> > > https://download.qt.io/archive/qt/6.7/
> > > Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
> >
> > Thanks for this v3. However, you're again putting a fix as PATCH 02/14
> > of the series, after a bump. Is it because this CVE is only applicable
> > to Qt 6.7 (and not the 6.4.3 we already have in Buildroot) ? Could you
> > clarify this point, which is very important?
>
> This is not applicable to 6.4.3, the affected versions are detailed in
> the bugzilla report below and it's only 6.5.0+
> So this seems perfectly valid to go along with the version bump.
>
> OpenSUSE report:
> https://www.suse.com/security/cve/CVE-2024-33861.html
> Bugzilla report clarifying affected versions
> https://bugzilla.suse.com/show_bug.cgi?id=1223917
>
> > Thanks!
> >
> > Thomas
> > --
> > Thomas Petazzoni, co-owner and CEO, Bootlin
> > Embedded Linux and Kernel engineering and training
> > https://bootlin.com
>
> Best regards,
> Jesse
>
[-- Attachment #1.2: Type: text/html, Size: 2732 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Buildroot] [PATCH v3 02/14] package/qt6/qt6base: patch CVE-2024-33861
2024-05-13 10:29 ` Roy Kollen Svendsen
@ 2024-05-13 11:05 ` Jesse Van Gavere
2024-05-13 11:59 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 19+ messages in thread
From: Jesse Van Gavere @ 2024-05-13 11:05 UTC (permalink / raw)
To: Roy Kollen Svendsen
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Samuel Martin,
Thomas Petazzoni, Buildroot Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 1942 bytes --]
Hello Roy,
On Mon, 13 May 2024, 12:29 Roy Kollen Svendsen, <roykollensvendsen@gmail.com>
wrote:
> Hi Thomas and Jesse,
>
> I assume I should add this information to the commit message and make a v4
> patch-set?
>
Personally I don't see why that would be necessary, it's applicable to your
version bump only and it's a valid CVE identifier (even if reserved for the
moment) that can be looked up, putting the exact same CVE info in the
commit for the patch seems a bit redundant
Best regards,
Jesse
> Best regards,
> Roy
>
> man. 13. mai 2024 kl. 09:57 skrev Jesse Van Gavere <jesseevg@gmail.com>:
>
>> Hello Thomas,
>>
>> Op ma 13 mei 2024 om 08:40 schreef Thomas Petazzoni
>> <thomas.petazzoni@bootlin.com>:
>>
>> >
>> > Hello Roy,
>> >
>> > On Sun, 12 May 2024 13:45:49 +0200
>> > Roy Kollen Svendsen <roykollensvendsen@gmail.com> wrote:
>> >
>> > > From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
>> > >
>> > > Got patch from:
>> > >
>> > > https://download.qt.io/archive/qt/6.7/
>> > > Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
>> >
>> > Thanks for this v3. However, you're again putting a fix as PATCH 02/14
>> > of the series, after a bump. Is it because this CVE is only applicable
>> > to Qt 6.7 (and not the 6.4.3 we already have in Buildroot) ? Could you
>> > clarify this point, which is very important?
>>
>> This is not applicable to 6.4.3, the affected versions are detailed in
>> the bugzilla report below and it's only 6.5.0+
>> So this seems perfectly valid to go along with the version bump.
>>
>> OpenSUSE report:
>> https://www.suse.com/security/cve/CVE-2024-33861.html
>> Bugzilla report clarifying affected versions
>> https://bugzilla.suse.com/show_bug.cgi?id=1223917
>>
>> > Thanks!
>> >
>> > Thomas
>> > --
>> > Thomas Petazzoni, co-owner and CEO, Bootlin
>> > Embedded Linux and Kernel engineering and training
>> > https://bootlin.com
>>
>> Best regards,
>> Jesse
>
>
[-- Attachment #1.2: Type: text/html, Size: 4226 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Buildroot] [PATCH v3 02/14] package/qt6/qt6base: patch CVE-2024-33861
2024-05-13 11:05 ` Jesse Van Gavere
@ 2024-05-13 11:59 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 19+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-05-13 11:59 UTC (permalink / raw)
To: Jesse Van Gavere
Cc: Roy Kollen Svendsen, Zoltan Gyarmati, Samuel Martin,
Roy Kollen Svendsen, Buildroot Mailing List
Hell Jesse, Hello Roy,
On Mon, 13 May 2024 13:05:05 +0200
Jesse Van Gavere <jesseevg@gmail.com> wrote:
> > I assume I should add this information to the commit message and make a v4
> > patch-set?
>
> Personally I don't see why that would be necessary, it's applicable to your
> version bump only and it's a valid CVE identifier (even if reserved for the
> moment) that can be looked up, putting the exact same CVE info in the
> commit for the patch seems a bit redundant
Well, in fact in this particular case, the CVE fix should be directly
with the version bump, and indeed clarify in the commit log why it is
together with the version bump. Also, QT6BASE_IGNORE_CVES variable will
be needed in qt6base.mk.
I'd say no need to resend the full series for this at this point. I'll
try to apply some parts of it, and see if I have other review comments
for the rest.
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
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v3 03/14] package/qt6/qt6base: add blind option to enable GUI support on host
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
2024-05-12 11:45 ` [Buildroot] [PATCH v3 02/14] package/qt6/qt6base: patch CVE-2024-33861 Roy Kollen Svendsen
@ 2024-05-12 11:45 ` Roy Kollen Svendsen
2024-05-12 11:45 ` [Buildroot] [PATCH v3 04/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
` (10 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:45 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
The Qt6::Gui module is needed when building the 'Qt Shader Baker'
(qsb) host tool.
Qsb is needed for converting the Qt6 Vulkan GLSL source code to
platform specific shader languages which is then later copied to
target.
For more details take a look at:
https://doc.qt.io/qt-6/qtshadertools-overview.html
and
https://doc.qt.io/qt-6/qshaderbaker.html
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v2 -> v3:
- Add explanation for why this option is necessary. (suggested by Thomas)
- Move blind host option into Config.in.host (suggested by maintainers)
- Move this change to separate patch. (suggested by Yann)
package/Config.in.host | 1 +
package/qt6/Config.in.host | 5 +++++
package/qt6/qt6base/Config.in.host | 4 ++++
package/qt6/qt6base/qt6base.mk | 7 ++++++-
4 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 package/qt6/Config.in.host
create mode 100644 package/qt6/qt6base/Config.in.host
diff --git a/package/Config.in.host b/package/Config.in.host
index 986b2854d0..cbf54f5752 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -95,6 +95,7 @@ menu "Host utilities"
source "package/python3/Config.in.host"
source "package/qemu/Config.in.host"
source "package/qoriq-rcw/Config.in.host"
+ source "package/qt6/Config.in.host"
source "package/raspberrypi-usbboot/Config.in.host"
source "package/rauc/Config.in.host"
source "package/riscv-isa-sim/Config.in.host"
diff --git a/package/qt6/Config.in.host b/package/qt6/Config.in.host
new file mode 100644
index 0000000000..dfe7865c57
--- /dev/null
+++ b/package/qt6/Config.in.host
@@ -0,0 +1,5 @@
+if BR2_PACKAGE_QT6
+
+source "package/qt6/qt6base/Config.in.host"
+
+endif
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
new file mode 100644
index 0000000000..326c06278e
--- /dev/null
+++ b/package/qt6/qt6base/Config.in.host
@@ -0,0 +1,4 @@
+# Select this if you need host qt6 tools that require the Qt::Gui module (e.g.
+# Qt Shader Baker(qsb)).
+config BR2_PACKAGE_HOST_QT6BASE_GUI
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 6857725ef5..47f47b6f8c 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -84,7 +84,6 @@ HOST_QT6BASE_DEPENDENCIES = \
host-pcre2 \
host-zlib
HOST_QT6BASE_CONF_OPTS = \
- -DFEATURE_gui=OFF \
-DFEATURE_concurrent=OFF \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
@@ -98,6 +97,12 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_system_pcre2=ON \
-DFEATURE_system_zlib=ON
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v3 04/14] package/qt6/qt6shadertools: new package
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
2024-05-12 11:45 ` [Buildroot] [PATCH v3 02/14] package/qt6/qt6base: patch CVE-2024-33861 Roy Kollen Svendsen
2024-05-12 11:45 ` [Buildroot] [PATCH v3 03/14] package/qt6/qt6base: add blind option to enable GUI support on host Roy Kollen Svendsen
@ 2024-05-12 11:45 ` Roy Kollen Svendsen
2024-05-12 11:45 ` [Buildroot] [PATCH v3 05/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
` (9 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:45 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v2 -> v3:
- Move part of this change to a separte commit (3/14). (suggested by Yann)
package/qt6/Config.in | 1 +
package/qt6/qt6shadertools/Config.in | 13 +++++++
.../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++
package/qt6/qt6shadertools/qt6shadertools.mk | 39 +++++++++++++++++++
4 files changed, 63 insertions(+)
create mode 100644 package/qt6/qt6shadertools/Config.in
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash
create mode 100644 package/qt6/qt6shadertools/qt6shadertools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 276a0217ab..b7e95a6885 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
+source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
endif
diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in
new file mode 100644
index 0000000000..1b47dc6132
--- /dev/null
+++ b/package/qt6/qt6shadertools/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_QT6SHADERTOOLS
+ bool "qt6shadertools"
+ select BR2_PACKAGE_HOST_QT6BASE_GUI
+ select BR2_PACKAGE_QT6BASE_GUI
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ The Qt Shader Tools module builds on the SPIR-V Open
+ Source Ecosystem as described at the Khronos SPIR-V web
+ site.
+
+ https://doc.qt.io/qt-6/qtshadertools-index.html
diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash
new file mode 100644
index 0000000000..90313163fa
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.hash
@@ -0,0 +1,10 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtshadertools-everywhere-src-6.7.0.tar.xz.sha256
+sha256 3e13f967c62f0815c901e754cbc472a2e19170da0c7a505230d559615f7998af qtshadertools-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+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 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
diff --git a/package/qt6/qt6shadertools/qt6shadertools.mk b/package/qt6/qt6shadertools/qt6shadertools.mk
new file mode 100644
index 0000000000..108f409380
--- /dev/null
+++ b/package/qt6/qt6shadertools/qt6shadertools.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# qt6shadertools
+#
+################################################################################
+
+QT6SHADERTOOLS_VERSION = $(QT6_VERSION)
+QT6SHADERTOOLS_SITE = $(QT6_SITE)
+QT6SHADERTOOLS_SOURCE = qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SHADERTOOLS_VERSION).tar.xz
+QT6SHADERTOOLS_INSTALL_STAGING = YES
+QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6SHADERTOOLS_CMAKE_BACKEND = ninja
+
+QT6SHADERTOOLS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6SHADERTOOLS_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
+
+QT6SHADERTOOLS_CONF_OPTS = \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6SHADERTOOLS_DEPENDENCIES = \
+ host-pkgconf \
+ qt6base \
+ host-qt6shadertools
+
+HOST_QT6SHADERTOOLS_DEPENDENCIES = \
+ host-qt6base
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v3 05/14] package/qt6/qt6svg: allow building for host
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (2 preceding siblings ...)
2024-05-12 11:45 ` [Buildroot] [PATCH v3 04/14] package/qt6/qt6shadertools: new package Roy Kollen Svendsen
@ 2024-05-12 11:45 ` Roy Kollen Svendsen
2024-05-12 11:45 ` [Buildroot] [PATCH v3 06/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
` (8 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:45 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/qt6svg/qt6svg.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/qt6/qt6svg/qt6svg.mk b/package/qt6/qt6svg/qt6svg.mk
index 25e87dd208..a9d7eaef51 100644
--- a/package/qt6/qt6svg/qt6svg.mk
+++ b/package/qt6/qt6svg/qt6svg.mk
@@ -37,3 +37,4 @@ QT6SVG_DEPENDENCIES = \
qt6base
$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v3 06/14] package/qt6/qt6languageserver: new package
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (3 preceding siblings ...)
2024-05-12 11:45 ` [Buildroot] [PATCH v3 05/14] package/qt6/qt6svg: allow building for host Roy Kollen Svendsen
@ 2024-05-12 11:45 ` Roy Kollen Svendsen
2024-05-12 11:45 ` [Buildroot] [PATCH v3 07/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
` (7 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:45 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6languageserver/Config.in | 9 +++++
.../qt6languageserver/qt6languageserver.hash | 11 ++++++
.../qt6languageserver/qt6languageserver.mk | 34 +++++++++++++++++++
4 files changed, 55 insertions(+)
create mode 100644 package/qt6/qt6languageserver/Config.in
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.hash
create mode 100644 package/qt6/qt6languageserver/qt6languageserver.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index b7e95a6885..81682af476 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6languageserver/Config.in b/package/qt6/qt6languageserver/Config.in
new file mode 100644
index 0000000000..8a54ae1911
--- /dev/null
+++ b/package/qt6/qt6languageserver/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6LANGUAGESERVER
+ bool "qt6languageserver"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6languageserver module.
+
+ https://doc.qt.io/qt-6/qtlanguageserver-index.html
diff --git a/package/qt6/qt6languageserver/qt6languageserver.hash b/package/qt6/qt6languageserver/qt6languageserver.hash
new file mode 100644
index 0000000000..2d40426c6f
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtlanguageserver-everywhere-src-6.7.0.tar.xz.sha256
+sha256 a99ecb342abdf7b7ac24804c89830a7991de95f9402f45a1e337ae851f76c9fc qtlanguageserver-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+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/qt6languageserver/qt6languageserver.mk b/package/qt6/qt6languageserver/qt6languageserver.mk
new file mode 100644
index 0000000000..6f96feb275
--- /dev/null
+++ b/package/qt6/qt6languageserver/qt6languageserver.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# qt6languageserver
+#
+################################################################################
+
+QT6LANGUAGESERVER_VERSION = $(QT6_VERSION)
+QT6LANGUAGESERVER_SITE = $(QT6_SITE)
+QT6LANGUAGESERVER_SOURCE = qtlanguageserver-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6LANGUAGESERVER_VERSION).tar.xz
+QT6LANGUAGESERVER_INSTALL_STAGING = YES
+QT6LANGUAGESERVER_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6LANGUAGESERVER_CMAKE_BACKEND = ninja
+
+QT6LANGUAGESERVER_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6LANGUAGESERVER_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
+
+QT6LANGUAGESERVER_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6LANGUAGESERVER_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v3 07/14] package/qt6/qt6declarative: new package
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (4 preceding siblings ...)
2024-05-12 11:45 ` [Buildroot] [PATCH v3 06/14] package/qt6/qt6languageserver: new package Roy Kollen Svendsen
@ 2024-05-12 11:45 ` Roy Kollen Svendsen
2024-05-12 11:45 ` [Buildroot] [PATCH v3 08/14] package/qt6/qt6declarative: fix build when Qt Network not available Roy Kollen Svendsen
` (6 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:45 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6declarative/Config.in | 22 ++++++++
.../qt6/qt6declarative/qt6declarative.hash | 11 ++++
package/qt6/qt6declarative/qt6declarative.mk | 56 +++++++++++++++++++
4 files changed, 90 insertions(+)
create mode 100644 package/qt6/qt6declarative/Config.in
create mode 100644 package/qt6/qt6declarative/qt6declarative.hash
create mode 100644 package/qt6/qt6declarative/qt6declarative.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 81682af476..625134d281 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6
source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
+source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
diff --git a/package/qt6/qt6declarative/Config.in b/package/qt6/qt6declarative/Config.in
new file mode 100644
index 0000000000..5c089668e4
--- /dev/null
+++ b/package/qt6/qt6declarative/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_QT6DECLARATIVE
+ bool "qt6declarative"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6declarative module.
+
+ https://doc.qt.io/qt-6/qtdeclarative-index.html
+
+if BR2_PACKAGE_QT6DECLARATIVE
+
+config BR2_PACKAGE_QT6DECLARATIVE_QUICK
+ bool "quick module"
+ select BR2_PACKAGE_QT6BASE_GUI
+ select BR2_PACKAGE_QT6LANGUAGESERVER
+ select BR2_PACKAGE_QT6SHADERTOOLS
+ select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_HOST_QT6SVG
+ select BR2_PACKAGE_HOST_QT6DECLARATIVE
+
+endif
diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash
new file mode 100644
index 0000000000..ae9925509b
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtdeclarative-everywhere-src-6.7.0.tar.xz.sha256
+sha256 5a0c39579a74d7cca581162c866ed0887287d4f8d5abff7ab9492d4a58fa9e2c qtdeclarative-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+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/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk
new file mode 100644
index 0000000000..2348ff2dae
--- /dev/null
+++ b/package/qt6/qt6declarative/qt6declarative.mk
@@ -0,0 +1,56 @@
+################################################################################
+#
+# qt6declaratve
+#
+################################################################################
+
+QT6DECLARATIVE_VERSION = $(QT6_VERSION)
+QT6DECLARATIVE_SITE = $(QT6_SITE)
+QT6DECLARATIVE_SOURCE = qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz
+QT6DECLARATIVE_INSTALL_STAGING = YES
+
+QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6DECLARATIVE_CMAKE_BACKEND = ninja
+
+QT6DECLARATIVE_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6DECLARATIVE_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
+
+QT6DECLARATIVE_CONF_OPTS = \
+ -DQT_FEATURE_qml_profiler=OFF \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+HOST_QT6DECLARATIVE_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF \
+ -DQT_FEATURE_ssl=OFF
+
+QT6DECLARATIVE_DEPENDENCIES = \
+ host-qt6base \
+ host-qt6svg \
+ host-qt6shadertools \
+ host-qt6declarative \
+ qt6base \
+ qt6shadertools \
+ qt6languageserver \
+ qt6svg
+
+HOST_QT6DECLARATIVE_DEPENDENCIES = \
+ host-qt6base \
+ host-qt6svg \
+ host-qt6shadertools
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v3 08/14] package/qt6/qt6declarative: fix build when Qt Network not available
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (5 preceding siblings ...)
2024-05-12 11:45 ` [Buildroot] [PATCH v3 07/14] package/qt6/qt6declarative: " Roy Kollen Svendsen
@ 2024-05-12 11:45 ` Roy Kollen Svendsen
2024-05-12 11:45 ` [Buildroot] [PATCH v3 09/14] package/qt6/qt6websockets: new package Roy Kollen Svendsen
` (5 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:45 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Avoid checking for FEATURE_ssl when FEATURE_network is not available.
The failure occurs because FEATURE_ssl is defined by the Qt Network
module. So we check for FEATURE_network before we check for
FEATURE_ssl.
Fixes the following build failure:
CMake Error at qt6base-6.7.0/cmake/QtFeature.cmake:376 (message):
Attempting to evaluate feature ssl but its definition is missing. Either
the feature does not exist or a dependency to the module that defines it is
missing
Call Stack (most recent call first):
qt6base-6.7.0/cmake/QtFeature.cmake:141 (qt_evaluate_feature)
qt6base-6.7.0/cmake/QtFeature.cmake:180 (qt_internal_evaluate_config_expression)
qt6base-6.7.0/cmake/QtFeature.cmake:396 (qt_evaluate_config_expression)
qt6base-6.7.0/cmake/QtFeature.cmake:711 (qt_evaluate_feature)
qt6base-6.7.0/cmake/QtFeature.cmake:680 (qt_feature_module_end)
src/qml/CMakeLists.txt:13 (qt_feature_evaluate_features)
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v2 -> v3:
- This fix was added in this version of the patch set.
...1-Fix-build-with--no-feature-network.patch | 28 +++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
diff --git a/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
new file mode 100644
index 0000000000..bef5794229
--- /dev/null
+++ b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch
@@ -0,0 +1,28 @@
+From 8377691a0998fd84e6fc8349a5db450bf2d79164 Mon Sep 17 00:00:00 2001
+From: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
+Date: Tue, 21 Nov 2023 23:58:43 +0900
+Subject: Fix build with -no-feature-network
+
+Change-Id: Ib21012301da6afb5458f707b39a9a8079d93eb93
+Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
+Upstream: https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=8377691a0998fd84e6fc8349a5db450bf2d79164
+Signed-off-by: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
+---
+ src/qml/configure.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qml/configure.cmake b/src/qml/configure.cmake
+index 2d0434643a..d1ff90bd54 100644
+--- a/src/qml/configure.cmake
++++ b/src/qml/configure.cmake
+@@ -82,7 +82,7 @@ qt_feature("qml-ssl" PUBLIC
+ SECTION "QML"
+ LABEL "QML SSL support"
+ PURPOSE "Provides ssl support in QML."
+- CONDITION QT_FEATURE_ssl
++ CONDITION QT_FEATURE_qml_network AND QT_FEATURE_ssl
+ )
+
+ # On arm and arm64 we need a specialization of cacheFlush() for each OS to be
+--
+cgit v1.2.3
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v3 09/14] package/qt6/qt6websockets: new package
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (6 preceding siblings ...)
2024-05-12 11:45 ` [Buildroot] [PATCH v3 08/14] package/qt6/qt6declarative: fix build when Qt Network not available Roy Kollen Svendsen
@ 2024-05-12 11:45 ` Roy Kollen Svendsen
2024-05-12 11:45 ` [Buildroot] [PATCH v3 10/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
` (4 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:45 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6websockets/Config.in | 9 ++++
package/qt6/qt6websockets/qt6websockets.hash | 11 +++++
package/qt6/qt6websockets/qt6websockets.mk | 46 ++++++++++++++++++++
4 files changed, 67 insertions(+)
create mode 100644 package/qt6/qt6websockets/Config.in
create mode 100644 package/qt6/qt6websockets/qt6websockets.hash
create mode 100644 package/qt6/qt6websockets/qt6websockets.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 625134d281..16f792cff3 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,5 +51,6 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6websockets/Config.in b/package/qt6/qt6websockets/Config.in
new file mode 100644
index 0000000000..a201483922
--- /dev/null
+++ b/package/qt6/qt6websockets/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6WEBSOCKETS
+ bool "qt6websockets"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6websockets module.
+
+ https://doc.qt.io/qt-6/qtwebsockets-index.html
diff --git a/package/qt6/qt6websockets/qt6websockets.hash b/package/qt6/qt6websockets/qt6websockets.hash
new file mode 100644
index 0000000000..4e36eb4257
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtwebsockets-everywhere-src-6.7.0.tar.xz.sha256
+sha256 5ffc77da6b36cdf18e04c975a0fbf243968806a93a6291bcd2e9cd0b26139736 qtwebsockets-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+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/qt6websockets/qt6websockets.mk b/package/qt6/qt6websockets/qt6websockets.mk
new file mode 100644
index 0000000000..cc17085d10
--- /dev/null
+++ b/package/qt6/qt6websockets/qt6websockets.mk
@@ -0,0 +1,46 @@
+################################################################################
+#
+# qt6websockets
+#
+################################################################################
+
+QT6WEBSOCKETS_VERSION = $(QT6_VERSION)
+QT6WEBSOCKETS_SITE = $(QT6_SITE)
+QT6WEBSOCKETS_SOURCE = qtwebsockets-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WEBSOCKETS_VERSION).tar.xz
+QT6WEBSOCKETS_INSTALL_STAGING = YES
+
+QT6WEBSOCKETS_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WEBSOCKETS_CMAKE_BACKEND = ninja
+
+QT6WEBSOCKETS_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WEBSOCKETS_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
+
+QT6WEBSOCKETS_CONF_OPTS = \
+ -DQT_FEATURE_thread=ON \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+HOST_QT6WEBSOCKETS_CONF_OPTS = \
+ -DQT_FEATURE_thread=ON \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6WEBSOCKETS_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ host-qt6declarative
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v3 10/14] package/qt6/qt6wayland: new package
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (7 preceding siblings ...)
2024-05-12 11:45 ` [Buildroot] [PATCH v3 09/14] package/qt6/qt6websockets: new package Roy Kollen Svendsen
@ 2024-05-12 11:45 ` Roy Kollen Svendsen
2024-05-12 11:45 ` [Buildroot] [PATCH v3 11/14] package/qt6/qt6base: add blind option to enable Network support on host Roy Kollen Svendsen
` (3 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:45 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6wayland/Config.in | 24 ++++++++++++
package/qt6/qt6wayland/qt6wayland.hash | 11 ++++++
package/qt6/qt6wayland/qt6wayland.mk | 53 ++++++++++++++++++++++++++
4 files changed, 89 insertions(+)
create mode 100644 package/qt6/qt6wayland/Config.in
create mode 100644 package/qt6/qt6wayland/qt6wayland.hash
create mode 100644 package/qt6/qt6wayland/qt6wayland.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 16f792cff3..69ce0b3f6a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
endif
diff --git a/package/qt6/qt6wayland/Config.in b/package/qt6/qt6wayland/Config.in
new file mode 100644
index 0000000000..814f9e1722
--- /dev/null
+++ b/package/qt6/qt6wayland/Config.in
@@ -0,0 +1,24 @@
+comment "qt6wayland needs an OpenGL-capable backend"
+ depends on !BR2_PACKAGE_QT6_GL_SUPPORTS
+
+config BR2_PACKAGE_QT6WAYLAND
+ bool "qt6wayland"
+ depends on BR2_PACKAGE_QT6_GL_SUPPORTS
+ select BR2_PACKAGE_WAYLAND
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6wayland module.
+
+ https://doc.qt.io/qt-6/qtwayland-index.html
+
+if BR2_PACKAGE_QT6WAYLAND
+
+config BR2_PACKAGE_QT6WAYLAND_COMPOSITOR
+ bool "Enable compositor (experimental)"
+ help
+ The compositor API is still experimental, and not built by
+ default.
+
+endif
diff --git a/package/qt6/qt6wayland/qt6wayland.hash b/package/qt6/qt6wayland/qt6wayland.hash
new file mode 100644
index 0000000000..13a6ba15eb
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.hash
@@ -0,0 +1,11 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtwayland-everywhere-src-6.7.0.tar.xz.sha256
+sha256 d73470e4217da388d8cd2a517ee8bb373853f33c569306e80f04397845157aea qtwayland-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+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/qt6wayland/qt6wayland.mk b/package/qt6/qt6wayland/qt6wayland.mk
new file mode 100644
index 0000000000..cf8727287e
--- /dev/null
+++ b/package/qt6/qt6wayland/qt6wayland.mk
@@ -0,0 +1,53 @@
+################################################################################
+#
+# qt6wayland
+#
+################################################################################
+
+QT6WAYLAND_VERSION = $(QT6_VERSION)
+QT6WAYLAND_SITE = $(QT6_SITE)
+QT6WAYLAND_SOURCE = qtwayland-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WAYLAND_VERSION).tar.xz
+QT6WAYLAND_INSTALL_STAGING = YES
+
+QT6WAYLAND_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6WAYLAND_CMAKE_BACKEND = ninja
+
+QT6WAYLAND_LICENSE = \
+ GPL-2.0+ or LGPL-3.0, \
+ GPL-3.0, GFDL-1.3 no invariants (docs)
+
+QT6WAYLAND_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
+
+QT6WAYLAND_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF \
+ -DFEATURE_wayland_client=ON
+
+ifeq ($(BR2_PACKAGE_QT6WAYLAND_COMPOSITOR),y)
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=ON
+else
+QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=OFF
+endif
+
+HOST_QT6WAYLAND_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6WAYLAND_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ host-qt6wayland \
+ wayland \
+ host-wayland
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v3 11/14] package/qt6/qt6base: add blind option to enable Network support on host
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (8 preceding siblings ...)
2024-05-12 11:45 ` [Buildroot] [PATCH v3 10/14] package/qt6/qt6wayland: " Roy Kollen Svendsen
@ 2024-05-12 11:45 ` Roy Kollen Svendsen
2024-05-12 11:45 ` [Buildroot] [PATCH v3 12/14] package/qt6/qt6tools: new package Roy Kollen Svendsen
` (2 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:45 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Qt Network is a required dependency of Qt Tools. Therefor we need a way
to enable the Qt Network module when building for host.
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v2 -> v3:
- Separate out this change from patch adding qttools package. (suggested by Yann)
package/qt6/qt6base/Config.in.host | 5 +++++
package/qt6/qt6base/qt6base.mk | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host
index 326c06278e..286da0ff03 100644
--- a/package/qt6/qt6base/Config.in.host
+++ b/package/qt6/qt6base/Config.in.host
@@ -2,3 +2,8 @@
# Qt Shader Baker(qsb)).
config BR2_PACKAGE_HOST_QT6BASE_GUI
bool
+
+# Select this if you need host qt6 tools that require the Qt::Network module
+# (e.g. Qt Tools).
+config BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ bool
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk
index 47f47b6f8c..7c3540ce01 100644
--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@@ -88,7 +88,6 @@ HOST_QT6BASE_CONF_OPTS = \
-DFEATURE_xml=ON \
-DFEATURE_sql=OFF \
-DFEATURE_testlib=OFF \
- -DFEATURE_network=OFF \
-DFEATURE_dbus=OFF \
-DFEATURE_icu=OFF \
-DFEATURE_glib=OFF \
@@ -103,6 +102,12 @@ else
HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF
endif
+ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y)
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=ON
+else
+HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF
+endif
+
# Conditional blocks below are ordered by alphabetic ordering of the
# BR2_PACKAGE_* option.
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v3 12/14] package/qt6/qt6tools: new package
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (9 preceding siblings ...)
2024-05-12 11:45 ` [Buildroot] [PATCH v3 11/14] package/qt6/qt6base: add blind option to enable Network support on host Roy Kollen Svendsen
@ 2024-05-12 11:45 ` Roy Kollen Svendsen
2024-05-12 11:46 ` [Buildroot] [PATCH v3 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
2024-05-12 11:46 ` [Buildroot] [PATCH v3 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
12 siblings, 0 replies; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:45 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v2 -> v3:
- Move part of this change to a separte commit (11/14). (suggested by Yann)
package/qt6/Config.in | 1 +
package/qt6/qt6tools/Config.in | 12 ++++++++++
package/qt6/qt6tools/qt6tools.hash | 11 +++++++++
package/qt6/qt6tools/qt6tools.mk | 37 ++++++++++++++++++++++++++++++
4 files changed, 61 insertions(+)
create mode 100644 package/qt6/qt6tools/Config.in
create mode 100644 package/qt6/qt6tools/qt6tools.hash
create mode 100644 package/qt6/qt6tools/qt6tools.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 69ce0b3f6a..48366f5fd1 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
+source "package/qt6/qt6tools/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in
new file mode 100644
index 0000000000..75453eaba5
--- /dev/null
+++ b/package/qt6/qt6tools/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_QT6TOOLS
+ bool "qt6tools"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ select BR2_PACKAGE_HOST_QT6BASE_NETWORK
+ 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
diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash
new file mode 100644
index 0000000000..6f2c962740
--- /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.0/submodules/qttools-everywhere-src-6.7.0.tar.xz.sha256
+sha256 c8da6b239e82fe1e23465cbf0936c0da5a334438d3fb433e19c503cbb1abee7b qttools-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+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..8779e8c00f
--- /dev/null
+++ b/package/qt6/qt6tools/qt6tools.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# 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
+
+QT6TOOLS_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6TOOLS_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ host-qt6tools
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v3 13/14] package/qt6/qt6virtualkeyboard: new package
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (10 preceding siblings ...)
2024-05-12 11:45 ` [Buildroot] [PATCH v3 12/14] package/qt6/qt6tools: new package Roy Kollen Svendsen
@ 2024-05-12 11:46 ` Roy Kollen Svendsen
2024-05-12 11:46 ` [Buildroot] [PATCH v3 14/14] package/qt6/qt6mqtt: " Roy Kollen Svendsen
12 siblings, 0 replies; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:46 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
package/qt6/Config.in | 1 +
package/qt6/qt6virtualkeyboard/Config.in | 9 ++++
.../qt6virtualkeyboard.hash | 12 +++++
.../qt6virtualkeyboard/qt6virtualkeyboard.mk | 49 +++++++++++++++++++
4 files changed, 71 insertions(+)
create mode 100644 package/qt6/qt6virtualkeyboard/Config.in
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 48366f5fd1..9dbc4b804a 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -52,6 +52,7 @@ source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
source "package/qt6/qt6svg/Config.in"
source "package/qt6/qt6tools/Config.in"
+source "package/qt6/qt6virtualkeyboard/Config.in"
source "package/qt6/qt6wayland/Config.in"
source "package/qt6/qt6websockets/Config.in"
diff --git a/package/qt6/qt6virtualkeyboard/Config.in b/package/qt6/qt6virtualkeyboard/Config.in
new file mode 100644
index 0000000000..59e9dc3595
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QT6VIRTUALKEYBOARD
+ bool "qt6virtualkeyboard"
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6virtualkeyboard module.
+
+ https://doc.qt.io/qt-6/qtvirtualkeyboard-index.html
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
new file mode 100644
index 0000000000..dc9a0f23ab
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash
@@ -0,0 +1,12 @@
+# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz.sha256
+sha256 d61bb2a18b1b06f64c956b2bde740c90a4bb46c47a99b31462e6e8d278a0cb6a qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt
+sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt
+sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt
+sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE
+sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE
+sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING
diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
new file mode 100644
index 0000000000..e49643149e
--- /dev/null
+++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk
@@ -0,0 +1,49 @@
+################################################################################
+#
+# qt6virtualkeyboard
+#
+################################################################################
+
+QT6VIRTUALKEYBOARD_VERSION = $(QT6_VERSION)
+QT6VIRTUALKEYBOARD_SITE = $(QT6_SITE)
+QT6VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6VIRTUALKEYBOARD_VERSION).tar.xz
+QT6VIRTUALKEYBOARD_INSTALL_STAGING = YES
+
+QT6VIRTUALKEYBOARD_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6VIRTUALKEYBOARD_CMAKE_BACKEND = ninja
+
+QT6VIRTUALKEYBOARD_LICENSE = \
+ GPL-3.0-only, GFDL-1.3 no invariants (docs), \
+ BSD-3-Clause
+
+QT6VIRTUALKEYBOARD_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/LicenseRef-Qt-Commercial.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt \
+ src/plugins/openwnn/3rdparty/openwnn/NOTICE \
+ src/plugins/pinyin/3rdparty/pinyin/NOTICE \
+ src/plugins/tcime/3rdparty/tcime/COPYING
+
+QT6VIRTUALKEYBOARD_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+HOST_QT6VIRTUALKEYBOARD_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6VIRTUALKEYBOARD_DEPENDENCIES = \
+ qt6base \
+ qt6declarative \
+ qt6svg \
+ host-qt6declarative
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v3 14/14] package/qt6/qt6mqtt: new package
2024-05-12 11:45 ` [Buildroot] [PATCH v3 01/14] package/qt6: bump version to 6.7.0 Roy Kollen Svendsen
` (11 preceding siblings ...)
2024-05-12 11:46 ` [Buildroot] [PATCH v3 13/14] package/qt6/qt6virtualkeyboard: " Roy Kollen Svendsen
@ 2024-05-12 11:46 ` Roy Kollen Svendsen
12 siblings, 0 replies; 19+ messages in thread
From: Roy Kollen Svendsen @ 2024-05-12 11:46 UTC (permalink / raw)
To: buildroot
Cc: Roy Kollen Svendsen, Samuel Martin, Roy Kollen Svendsen,
Thomas Petazzoni, Zoltan Gyarmati, Jesse Van Gavere
From: Roy Kollen Svendsen <roy.kollen.svendsen@akersolutions.com>
Signed-off-by: Roy Kollen Svendsen <roykollensvendsen@gmail.com>
---
Changes v2 -> v3:
- Fix build failure caused by new name and checksum for for download.
package/qt6/Config.in | 1 +
package/qt6/qt6.mk | 2 ++
package/qt6/qt6mqtt/Config.in | 10 +++++++++
package/qt6/qt6mqtt/qt6mqtt.hash | 8 ++++++++
package/qt6/qt6mqtt/qt6mqtt.mk | 35 ++++++++++++++++++++++++++++++++
5 files changed, 56 insertions(+)
create mode 100644 package/qt6/qt6mqtt/Config.in
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.hash
create mode 100644 package/qt6/qt6mqtt/qt6mqtt.mk
diff --git a/package/qt6/Config.in b/package/qt6/Config.in
index 9dbc4b804a..e84806d5e4 100644
--- a/package/qt6/Config.in
+++ b/package/qt6/Config.in
@@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in"
source "package/qt6/qt6core5compat/Config.in"
source "package/qt6/qt6declarative/Config.in"
source "package/qt6/qt6languageserver/Config.in"
+source "package/qt6/qt6mqtt/Config.in"
source "package/qt6/qt6serialbus/Config.in"
source "package/qt6/qt6serialport/Config.in"
source "package/qt6/qt6shadertools/Config.in"
diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk
index b87cb6748d..42984f89ee 100644
--- a/package/qt6/qt6.mk
+++ b/package/qt6/qt6.mk
@@ -9,4 +9,6 @@ QT6_VERSION = $(QT6_VERSION_MAJOR).0
QT6_SOURCE_TARBALL_PREFIX = everywhere-src
QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules
+QT6_GIT = git://code.qt.io
+
include $(sort $(wildcard package/qt6/*/*.mk))
diff --git a/package/qt6/qt6mqtt/Config.in b/package/qt6/qt6mqtt/Config.in
new file mode 100644
index 0000000000..2cda7e53c0
--- /dev/null
+++ b/package/qt6/qt6mqtt/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT6MQTT
+ bool "qt6mqtt"
+ select BR2_PACKAGE_QT6BASE_NETWORK
+ help
+ Qt is a cross-platform application and UI framework for
+ developers using C++.
+
+ This package corresponds to the qt6mqtt module.
+
+ https://doc.qt.io/qt-6/qtmqtt-index.html
diff --git a/package/qt6/qt6mqtt/qt6mqtt.hash b/package/qt6/qt6mqtt/qt6mqtt.hash
new file mode 100644
index 0000000000..0fad4fe06f
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.hash
@@ -0,0 +1,8 @@
+sha256 94024e3dd6c77feddfbd35520cc1f474d669aad7402f087827221890e07a64d5 qt6mqtt-6.7.0-git4.tar.gz
+
+# Hashes for license files:
+sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt
+sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-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/qt6mqtt/qt6mqtt.mk b/package/qt6/qt6mqtt/qt6mqtt.mk
new file mode 100644
index 0000000000..0405311065
--- /dev/null
+++ b/package/qt6/qt6mqtt/qt6mqtt.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# qt6mqtt
+#
+################################################################################
+
+QT6MQTT_VERSION = $(QT6_VERSION)
+QT6MQTT_SITE = $(QT6_GIT)/qt/qtmqtt.git
+
+QT6MQTT_INSTALL_STAGING = YES
+
+QT6MQTT_SUPPORTS_IN_SOURCE_BUILD = NO
+
+QT6MQTT_CMAKE_BACKEND = ninja
+
+QT6MQTT_LICENSE = \
+ BSD-3-Clause, GPL-3.0-only, \
+ GFDL-1.3-invariants-only (docs)
+
+QT6MQTT_LICENSE_FILES = \
+ LICENSES/BSD-3-Clause.txt \
+ LICENSES/GFDL-1.3-no-invariants-only.txt \
+ LICENSES/GPL-3.0-only.txt \
+ LICENSES/Qt-GPL-exception-1.0.txt
+
+QT6MQTT_CONF_OPTS = \
+ -DQT_HOST_PATH=$(HOST_DIR) \
+ -DBUILD_WITH_PCH=OFF \
+ -DQT_BUILD_EXAMPLES=OFF \
+ -DQT_BUILD_TESTS=OFF
+
+QT6MQTT_DEPENDENCIES = \
+ qt6base
+
+$(eval $(cmake-package))
--
2.45.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 19+ messages in thread