Makefile: only check _FINAL_DEPENDENCIES are selected
PATCH v2 1/4 Makefile: only check _FINAL_DEPENDENCIES are selected
_FINAL_ALL_DEPENDENCIES includes _FINAL_PATCH_DEPENDENCIES which may not need to be selected in kconfig in cases where building is not desired, so only check that _FINAL_DEPENDENCIES are selected.
--- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
@@ -589,7 +589,7 @@ endif endef $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ - $(foreach dep,$(call UPPERCASE,$($(pkg)_FINAL_ALL_DEPENDENCIES)),\ + $(foreach dep,$(call UPPERCASE,$($(pkg)_FINAL_DEPENDENCIES)),\ $(eval $(call CHECK_ONE_DEPENDENCY,$(pkg),$(dep))$(sep)))) endif
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 2/4 package/qt5/qt5webengine-chromium-catapult: new package
This version of catapult is python3 compatible and will be used to replace the python2 only version in qt5webengine-chromium.
--- .../qt5webengine-chromium-catapult.hash | 3 +++ .../qt5webengine-chromium-catapult.mk | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash create mode 100644 package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk
package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally calculated +sha256 66b8593e665c4236f7b1c487548d41d3826eddbf486ff985dbdfd01cddcaa1a8 qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-br1.tar.gz +sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE
package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# qt5webengine-chromium-catapult +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189 +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE_FILES = LICENSE + +$(eval $(generic-package))
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 3/4 package/qt5/qt5webengine: bump to version 5.15.8
In reply to James HilliardWe need to switch to the kde upstream as the existing upstream no longer updates the qt5 branch for most packages.
We need to add a separate package for the chromium submodule so that we can apply patches for python3 support to it and replace catapult with a python3 compatible version.
There are python3 patches available that apply to this version with minor modifications(to be added in a future patch).
We need to set QT5WEBENGINE_SYNC_QT_HEADERS = YES as we are building from a repository archive instead of a release archive.
We need to add some new required dependencies to qt5webengine so that it will build.
--- package/qt5/qt5.mk | 5 +- .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ .../qt5webengine-chromium.mk | 22 + package/qt5/qt5webengine/Config.in | 2 + package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ package/qt5/qt5webengine/qt5webengine.mk | 30 +- 8 files changed, 2561 insertions(+), 2012 deletions(-) create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk delete mode 100644 package/qt5/qt5webengine/chromium-latest.inc
package/qt5/qt5.mk +2 -3
@@ -5,9 +5,8 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src -QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_VERSION = $(QT5_VERSION_MAJOR).8 +QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk))
package/qt5/qt5webengine-chromium/chromium-latest.inc new file +1257 -0
1,257 lines not on this page · raw message
package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash new file +1256 -0
1,256 lines not on this page · raw message
package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk new file +22 -0
@@ -0,0 +1,22 @@ +################################################################################ +# +# qt5webengine-chromium +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_VERSION = 0ad2814370799a2161057d92231fe3ee00e2fe98 +QT5WEBENGINE_CHROMIUM_SITE = $(QT5_SITE)/qtwebengine-chromium/-/archive/$(QT5WEBENGINE_CHROMIUM_VERSION) +QT5WEBENGINE_CHROMIUM_SOURCE = qtwebengine-chromium-$(QT5WEBENGINE_CHROMIUM_VERSION).tar.bz2 +QT5WEBENGINE_CHROMIUM_PATCH_DEPENDENCIES = qt5webengine-chromium-catapult + +include package/qt5/qt5webengine-chromium/chromium-latest.inc + +QT5WEBENGINE_CHROMIUM_LICENSE = BSD-3-Clause, GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception + +define QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + rm -rf $(@D)/chromium/third_party/catapult + cp -a $(QT5WEBENGINE_CHROMIUM_CATAPULT_DIR) $(@D)/chromium/third_party/catapult +endef +QT5WEBENGINE_CHROMIUM_POST_PATCH_HOOKS += QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + +$(eval $(generic-package))
package/qt5/qt5webengine/Config.in +2 -0
@@ -32,6 +32,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_HOST_NODEJS # v8 (a chromium 3rd-party) compiles its internal host-tools with the # same word size as the target. For 32-bits targets, it adds the -m32 # flag (for 64-bits, it adds the -m64 flag).
@@ -60,6 +61,7 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXKBFILE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB
package/qt5/qt5webengine/chromium-latest.inc deleted +0 -1000
440 lines not on this page · raw message
package/qt5/qt5webengine/qt5webengine.hash +2 -999
1,001 lines not on this page · raw message
package/qt5/qt5webengine/qt5webengine.mk +20 -10
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Part of the diff is not shown here. View the raw message.
Re: [Buildroot] [PATCH v2 3/4] package/qt5/qt5webengine: bump to version 5.15.8
Quoted 6 lines · James Hilliard
We need to switch to the kde upstream as the existing upstream no longer updates the qt5 branch for most packages.
We need to add a separate package for the chromium submodule so that we can apply patches for python3 support to it and replace catapult with a python3 compatible version.
Creating a separate package that does nothing more than download something
that is later copied into another package's subdirectory is not the right approach. For this, we have FOO_EXTRA_DOWNLOADS, which can be followed by a _POST_EXTRACT_HOOK to graft it in.
So what I think you should do is download both chromium and catapult withQT5WEBENGINE_EXTRA_DOWNLOADS, then remove the directories in POST_EXTRACT_HOOK and untar the download over it.
That would vastly simplify this patch as well...
Regards,
Arnout
Quoted 21 lines
There are python3 patches available that apply to this version with minor modifications(to be added in a future patch).
We need to set
QT5WEBENGINE_SYNC_QT_HEADERS= YES as we are building from a repository archive instead of a release archive.We need to add some new required dependencies to qt5webengine so that it will build.
Signed-off-by James Hilliard <[email protected]>--- package/qt5/qt5.mk | 5 +- .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ .../qt5webengine-chromium.mk | 22 + package/qt5/qt5webengine/Config.in | 2 + package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ package/qt5/qt5webengine/qt5webengine.mk | 30 +- 8 files changed, 2561 insertions(+), 2012 deletions(-)
Quoted 4 lines
create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash create mode 100644
package/qt5/qt5webengine-chromium/qt5webengine-chromium.mkdelete mode 100644 package/qt5/qt5webengine/chromium-latest.inc
[snip]
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 3/4] package/qt5/qt5webengine: bump to version 5.15.8
Quoted 16 lines · Arnout Vandecappelle
Quoted 6 lines · James Hilliard
We need to switch to the kde upstream as the existing upstream no longer updates the qt5 branch for most packages.
We need to add a separate package for the chromium submodule so that we can apply patches for python3 support to it and replace catapult with a python3 compatible version.
Creating a separate package that does nothing more than download something
that is later copied into another package's subdirectory is not the right approach. For this, we haveFOO_EXTRA_DOWNLOADS, which can be followed by a_POST_EXTRACT_HOOKto graft it in.
Quoted 5 lines
So what I think you should do is download both chromium and catapult with
QT5WEBENGINE_EXTRA_DOWNLOADS, then remove the directories inPOST_EXTRACT_HOOKand untar the download over it.That would vastly simplify this patch as well...
One reason for doing this approach is that the available patches for adding python3
support to the qt5chromium-webengine tree apply to that dependency rather than the parent qt5chromium.
Quoted 30 lines
Regards,
ArnoutQuoted 21 lines
There are python3 patches available that apply to this version with minor modifications(to be added in a future patch).
We need to set
QT5WEBENGINE_SYNC_QT_HEADERS= YES as we are building from a repository archive instead of a release archive.We need to add some new required dependencies to qt5webengine so that it will build.
Signed-off-by James Hilliard <[email protected]>--- package/qt5/qt5.mk | 5 +- .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ .../qt5webengine-chromium.mk | 22 + package/qt5/qt5webengine/Config.in | 2 + package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ package/qt5/qt5webengine/qt5webengine.mk | 30 +- 8 files changed, 2561 insertions(+), 2012 deletions(-)Quoted 4 lines
create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash create mode 100644
package/qt5/qt5webengine-chromium/qt5webengine-chromium.mkdelete mode 100644 package/qt5/qt5webengine/chromium-latest.inc
Quoted 1 line
[snip]
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 3/4] package/qt5/qt5webengine: bump to version 5.15.8
Quoted 21 lines · James Hilliard
Quoted 20 lines · Arnout Vandecappelle
Quoted 6 lines · James Hilliard
We need to switch to the kde upstream as the existing upstream no longer updates the qt5 branch for most packages.
We need to add a separate package for the chromium submodule so that we can apply patches for python3 support to it and replace catapult with a python3 compatible version.
Creating a separate package that does nothing more than download something
that is later copied into another package's subdirectory is not the right approach. For this, we haveFOO_EXTRA_DOWNLOADS, which can be followed by a_POST_EXTRACT_HOOKto graft it in.So what I think you should do is download both chromium and catapult with
QT5WEBENGINE_EXTRA_DOWNLOADS, then remove the directories inPOST_EXTRACT_HOOKand untar the download over it.
Quoted 6 lines
Quoted 1 line
That would vastly simplify this patch as well...
One reason for doing this approach is that the available patches for adding python3
support to the qt5chromium-webengine tree apply to that dependency rather than the parent qt5chromium.
My eyesight is getting worse because I can't see those patches :-) The only
thing I see in this series is that you download and extract catapult, then download and extract chromium, then remove catapult from it and overwrite it with the catapult sources, then download and extract qt5webengine, and finally remove chromium and overwrite it with the chromium sources (including catapult). All of that can be done (and easier) with _EXTRA_DOWNLOADS and _POST_EXTRACT_HOOKS.
And if there is some upstream patch to catapult that you need to apply, it's
really easy to edit the patch manually. Just search/replace \b\([ab]\)/ with \1/<path>/
Regards,
Arnout
Quoted 31 lines
Quoted 31 lines
Regards,
ArnoutQuoted 25 lines
There are python3 patches available that apply to this version with minor modifications(to be added in a future patch).
We need to set
QT5WEBENGINE_SYNC_QT_HEADERS= YES as we are building from a repository archive instead of a release archive.We need to add some new required dependencies to qt5webengine so that it will build.
Signed-off-by James Hilliard <[email protected]>--- package/qt5/qt5.mk | 5 +- .../qt5webengine-chromium/chromium-latest.inc | 1257 +++++++++++++++++ .../qt5webengine-chromium.hash | 1256 ++++++++++++++++ .../qt5webengine-chromium.mk | 22 + package/qt5/qt5webengine/Config.in | 2 + package/qt5/qt5webengine/chromium-latest.inc | 1000 ------------- package/qt5/qt5webengine/qt5webengine.hash | 1001 +------------ package/qt5/qt5webengine/qt5webengine.mk | 30 +- 8 files changed, 2561 insertions(+), 2012 deletions(-)create mode 100644 package/qt5/qt5webengine-chromium/chromium-latest.inc create mode 100644 package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash create mode 100644
package/qt5/qt5webengine-chromium/qt5webengine-chromium.mkdelete mode 100644 package/qt5/qt5webengine/chromium-latest.inc
Quoted 1 line
Quoted 1 line
[snip]
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 4/4 package/qt5: bump packages to latest kde submodule versions
In reply to James HilliardThis points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15
We need to remove some patches applied upstream already.
We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives.
We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version.
We need to set SYNC_QT_HEADERS for all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream.
Set the MODULE_VERSION to 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches that don't have lts tags.
Create a .git file so to trigger headers sync during configure.
---
Changes v1 -> v2:
- fix headers sync and update MODULE_VERSION
---
package/pkg-qmake.mk | 4 +-
package/qt5/qt53d/qt53d.hash | 4 +-
package/qt5/qt53d/qt53d.mk | 7 ++-
...Fix-build-with-GCC-11-include-limits.patch | 53 ----------------
.../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 -------------------
.../0008-Add-missing-limits-include.patch | 32 ----------
.../qt5base/0009-Fix-build-on-riscv32.patch | 45 --------------
package/qt5/qt5base/qt5base.hash | 4 +-
package/qt5/qt5base/qt5base.mk | 7 ++-
package/qt5/qt5charts/qt5charts.hash | 4 +-
package/qt5/qt5charts/qt5charts.mk | 7 ++-
package/qt5/qt5coap/qt5coap.mk | 2 +-
.../qt5/qt5connectivity/qt5connectivity.hash | 4 +-
.../qt5/qt5connectivity/qt5connectivity.mk | 7 ++-
...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 --------------
.../qt5/qt5declarative/qt5declarative.hash | 4 +-
package/qt5/qt5declarative/qt5declarative.mk | 7 ++-
.../qt5graphicaleffects.hash | 4 +-
.../qt5graphicaleffects.mk | 7 ++-
.../qt5/qt5imageformats/qt5imageformats.hash | 4 +-
.../qt5/qt5imageformats/qt5imageformats.mk | 7 ++-
package/qt5/qt5knx/qt5knx.mk | 2 +-
...gl-native-fix-musl-compile-pthread_g.patch | 8 +--
.../qt5location-mapboxgl.hash | 16 +++++
.../qt5location-mapboxgl.mk | 13 ++++
...ix-compilation-for-no-opengl-builds.patch} | 0
package/qt5/qt5location/qt5location.hash | 4 +-
package/qt5/qt5location/qt5location.mk | 14 ++++-
package/qt5/qt5lottie/qt5lottie.hash | 4 +-
package/qt5/qt5lottie/qt5lottie.mk | 7 ++-
package/qt5/qt5mqtt/qt5mqtt.mk | 2 +-
package/qt5/qt5multimedia/qt5multimedia.hash | 4 +-
package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++-
package/qt5/qt5opcua/qt5opcua.mk | 2 +-
.../qt5quickcontrols/qt5quickcontrols.hash | 4 +-
.../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++-
.../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +-
.../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++-
.../qt5quicktimeline/qt5quicktimeline.hash | 4 +-
.../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++-
.../qt5remoteobjects/qt5remoteobjects.hash | 4 +-
.../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++-
package/qt5/qt5script/qt5script.hash | 4 +-
package/qt5/qt5script/qt5script.mk | 7 ++-
package/qt5/qt5scxml/qt5scxml.hash | 4 +-
package/qt5/qt5scxml/qt5scxml.mk | 7 ++-
package/qt5/qt5sensors/qt5sensors.hash | 4 +-
package/qt5/qt5sensors/qt5sensors.mk | 7 ++-
package/qt5/qt5serialbus/qt5serialbus.hash | 4 +-
package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++-
package/qt5/qt5serialport/qt5serialport.hash | 4 +-
package/qt5/qt5serialport/qt5serialport.mk | 7 ++-
package/qt5/qt5svg/qt5svg.hash | 4 +-
package/qt5/qt5svg/qt5svg.mk | 7 ++-
package/qt5/qt5tools/qt5tools.hash | 4 +-
package/qt5/qt5tools/qt5tools.mk | 7 ++-
.../qt5virtualkeyboard.hash | 4 +-
.../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++-
package/qt5/qt5wayland/qt5wayland.hash | 4 +-
package/qt5/qt5wayland/qt5wayland.mk | 7 ++-
package/qt5/qt5webchannel/qt5webchannel.hash | 4 +-
package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++-
.../qt5webkit-examples/qt5webkit-examples.mk | 2 +-
package/qt5/qt5websockets/qt5websockets.hash | 4 +-
package/qt5/qt5websockets/qt5websockets.mk | 7 ++-
package/qt5/qt5webview/qt5webview.hash | 4 +-
package/qt5/qt5webview/qt5webview.mk | 7 ++-
package/qt5/qt5x11extras/qt5x11extras.hash | 4 +-
package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++-
.../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +-
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++-
71 files changed, 216 insertions(+), 386 deletions(-)
delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch
delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch
delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch
delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch
rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%)
create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash
create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk
rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%)package/pkg-qmake.mk +3 -1
@@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################
package/qt5/qt53d/qt53d.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL
package/qt5/qt53d/qt53d.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimp
package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted +0 -53
53 lines not on this page · raw message
package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted +0 -61
61 lines not on this page · raw message
package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <[email protected]> -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo <[email protected]> - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer <[email protected]> ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include <tuple> - #include <array> -+#include <limits> - - QT_BEGIN_NAMESPACE - --- -2.32.0 -
package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted +0 -45
45 lines not on this page · raw message
package/qt5/qt5base/qt5base.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5base/qt5base.mk +4 -3
@@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described at
package/qt5/qt5charts/qt5charts.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
package/qt5/qt5charts/qt5charts.mk +4 -3
@@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3
package/qt5/qt5coap/qt5coap.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES
package/qt5/qt5connectivity/qt5connectivity.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5connectivity/qt5connectivity.mk +4 -3
@@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted +0 -45
45 lines not on this page · raw message
package/qt5/qt5declarative/qt5declarative.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5declarative/qt5declarative.mk +4 -3
@@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
package/qt5/qt5imageformats/qt5imageformats.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
package/qt5/qt5imageformats/qt5imageformats.mk +4 -3
@@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
package/qt5/qt5knx/qt5knx.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES
package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch renamed from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +4 -4
@@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer <[email protected]> [[email protected]: add uClibc] Signed-off-by: Yann E. MORIN <[email protected]> --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() {
package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file +16 -0
@@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txt
package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt + +$(eval $(generic-package))
package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch renamed from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch +0 -0
package/qt5/qt5location/qt5location.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5location/qt5location.mk +11 -3
@@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
@@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package))
package/qt5/qt5lottie/qt5lottie.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
package/qt5/qt5lottie/qt5lottie.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPT
package/qt5/qt5mqtt/qt5mqtt.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES
package/qt5/qt5multimedia/qt5multimedia.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5multimedia/qt5multimedia.mk +4 -3
@@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
package/qt5/qt5opcua/qt5opcua.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YES
package/qt5/qt5quickcontrols/qt5quickcontrols.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5quickcontrols/qt5quickcontrols.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL
package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3
package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
package/qt5/qt5quicktimeline/qt5quicktimeline.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
package/qt5/qt5quicktimeline/qt5quicktimeline.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3
package/qt5/qt5remoteobjects/qt5remoteobjects.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5remoteobjects/qt5remoteobjects.mk +4 -3
@@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarative
package/qt5/qt5script/qt5script.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
package/qt5/qt5script/qt5script.mk +4 -3
@@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources under
package/qt5/qt5scxml/qt5scxml.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
package/qt5/qt5scxml/qt5scxml.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
package/qt5/qt5sensors/qt5sensors.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5sensors/qt5sensors.mk +4 -3
@@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarative
package/qt5/qt5serialbus/qt5serialbus.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
package/qt5/qt5serialbus/qt5serialbus.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
package/qt5/qt5serialport/qt5serialport.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5serialport/qt5serialport.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package))
package/qt5/qt5svg/qt5svg.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5svg/qt5svg.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package))
package/qt5/qt5tools/qt5tools.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5tools/qt5tools.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will support
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3
package/qt5/qt5wayland/qt5wayland.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5wayland/qt5wayland.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarative
package/qt5/qt5webchannel/qt5webchannel.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5webchannel/qt5webchannel.mk +4 -3
@@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples)
package/qt5/qt5webkit-examples/qt5webkit-examples.mk +1 -1
@@ -6,7 +6,7 @@ QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3
package/qt5/qt5websockets/qt5websockets.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5websockets/qt5websockets.mk +4 -3
@@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples)
package/qt5/qt5webview/qt5webview.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
package/qt5/qt5webview/qt5webview.mk +4 -3
@@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples)
package/qt5/qt5x11extras/qt5x11extras.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5x11extras/qt5x11extras.mk +4 -3
@@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package))
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +4 -3
@@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 4/4] package/qt5: bump packages to latest kde submodule versions
Hello!
Thanks again for your help in getting rid of the scourge that is Python2! A few issues with this patch series:
- Qt5base is the package that installs syncqt.pl. This results in an immediate failure
at the begging of the build:
/bin/bash: /output/host/bin/syncqt.pl: No such file or directory
A simple solution would be to have a post_extract_hook to install the script:
define QT5BASE_INSTALL_SYNCQT
$(INSTALL) -m 0775 -D $(@D)/bin/syncqt.pl $(HOST_DIR)/bin/syncqt.pl
endefQT5BASE_POST_EXTRACT_HOOKS += QT5BASE_INSTALL_SYNCQT
After that, I get a lot of:
"fatal error: private/qiodevice_p.h: No such file or directory" errors when compiling.
The environment is a ubuntu 20.04 docker environment with the bare minimum requirements
installed to compile buildroot. You can find the Dockerfile here:
https://github.com/aduskett/buildroot-docker-devel/blob/master/Ubuntu/20.04/
Thanks!
Adam
Quoted 1,440 lines · James Hilliard
This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15
We need to remove some patches applied upstream already.
We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives.
We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version.
We need to set
SYNC_QT_HEADERSfor all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream.Set the
MODULE_VERSIONto 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches that don't have lts tags.Create a .git file so to trigger headers sync during configure.
Signed-off-by James Hilliard <[email protected]>---
Changes v1 -> v2:
- fix headers sync and updateMODULE_VERSION--- package/pkg-qmake.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 ++- ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- .../0008-Add-missing-limits-include.patch | 32 ---------- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 ++- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 ++- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 ++- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 ++- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- .../qt5location-mapboxgl.hash | 16 +++++ .../qt5location-mapboxgl.mk | 13 ++++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 ++++- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 ++- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 ++- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 ++- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 ++- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 ++- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 ++- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 ++- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 ++- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- .../qt5webkit-examples/qt5webkit-examples.mk | 2 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 ++- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 ++- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- 71 files changed, 216 insertions(+), 386 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%)package/pkg-qmake.mk +3
-1@@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################package/qt5/qt53d/qt53d.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLpackage/qt5/qt53d/qt53d.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimppackage/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted +0
-53@@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <[email protected]> -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include <limits> - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne <[email protected]> - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include <QtCore/qfloat16.h> - #include <QtCore/qglobal.h> - -+#include <limits> -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include <stdlib.h> - #include <string.h> -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include <QtCore/qglobal.h> - #include <QtCore/qmetatype.h> -+#include <limits> - #include <string.h> - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted +0
-61@@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen <[email protected]> -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll <[email protected]> -Reviewed-by: Thiago Macieira <[email protected]> -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov <[email protected]> ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include <QtCore/qbytearray.h> - -+#include <limits> -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 -package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted +0
-32@@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <[email protected]> -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo <[email protected]> - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer <[email protected]> ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include <tuple> - #include <array> -+#include <limits> - - QT_BEGIN_NAMESPACE - --- -2.32.0 -package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted +0
-45@@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira <[email protected]> -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 -package/qt5/qt5base/qt5base.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5base/qt5base.mk +4
-3@@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described atpackage/qt5/qt5charts/qt5charts.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3package/qt5/qt5charts/qt5charts.mk +4
-3@@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3package/qt5/qt5coap/qt5coap.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YESpackage/qt5/qt5connectivity/qt5connectivity.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5connectivity/qt5connectivity.mk +4
-3@@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDLpackage/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted +0
-45@@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <[email protected]> -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ‘void QQmlProfilerEvent::assignNumbers(const Container&)’: - qqmlprofilerevent_p.h:314:65: error: ‘numeric_limits’ is not a member of ‘std’ - 314 | static_cast<quint16>(numbers.size()) : std::numeric_limits<quint16>::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ‘>’ token - 314 | static_cast<quint16>(numbers.size()) : std::numeric_limits<quint16>::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ‘::max’ has not been declared; did you mean ‘std::max’? - 314 | static_cast<quint16>(numbers.size()) : std::numeric_limits<quint16>::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer <[email protected]> ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include <QtCore/qmetatype.h> - - #include <initializer_list> -+#include <limits> - #include <type_traits> - - // --- -2.32.0 -package/qt5/qt5declarative/qt5declarative.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5declarative/qt5declarative.mk +4
-3@@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDLpackage/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDLpackage/qt5/qt5imageformats/qt5imageformats.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2package/qt5/qt5imageformats/qt5imageformats.mk +4
-3@@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDLpackage/qt5/qt5knx/qt5knx.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YESpackage/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch renamed from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +4
-4@@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer <[email protected]> [[email protected]: add uClibc] Signed-off-by: Yann E. MORIN <[email protected]> --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() {package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file +16
-0@@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txtpackage/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file +13
-0@@ -0,0 +1,13 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt + +$(eval $(generic-package))package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch renamed from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch +0
-0package/qt5/qt5location/qt5location.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5location/qt5location.mk +11
-3@@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL@@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package))package/qt5/qt5lottie/qt5lottie.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3package/qt5/qt5lottie/qt5lottie.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPTpackage/qt5/qt5mqtt/qt5mqtt.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YESpackage/qt5/qt5multimedia/qt5multimedia.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5multimedia/qt5multimedia.mk +4
-3@@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDLpackage/qt5/qt5opcua/qt5opcua.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YESpackage/qt5/qt5quickcontrols/qt5quickcontrols.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5quickcontrols/qt5quickcontrols.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDLpackage/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDLpackage/qt5/qt5quicktimeline/qt5quicktimeline.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3package/qt5/qt5quicktimeline/qt5quicktimeline.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3package/qt5/qt5remoteobjects/qt5remoteobjects.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5remoteobjects/qt5remoteobjects.mk +4
-3@@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarativepackage/qt5/qt5script/qt5script.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3package/qt5/qt5script/qt5script.mk +4
-3@@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources underpackage/qt5/qt5scxml/qt5scxml.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPTpackage/qt5/qt5scxml/qt5scxml.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDLpackage/qt5/qt5sensors/qt5sensors.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5sensors/qt5sensors.mk +4
-3@@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarativepackage/qt5/qt5serialbus/qt5serialbus.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2package/qt5/qt5serialbus/qt5serialbus.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDLpackage/qt5/qt5serialport/qt5serialport.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5serialport/qt5serialport.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package))package/qt5/qt5svg/qt5svg.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5svg/qt5svg.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package))package/qt5/qt5tools/qt5tools.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5tools/qt5tools.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will supportpackage/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3package/qt5/qt5wayland/qt5wayland.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5wayland/qt5wayland.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarativepackage/qt5/qt5webchannel/qt5webchannel.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5webchannel/qt5webchannel.mk +4
-3@@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples)package/qt5/qt5webkit-examples/qt5webkit-examples.mk +1
-1@@ -6,7 +6,7 @@ QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3package/qt5/qt5websockets/qt5websockets.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5websockets/qt5websockets.mk +4
-3@@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples)package/qt5/qt5webview/qt5webview.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDLpackage/qt5/qt5webview/qt5webview.mk +4
-3@@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples)package/qt5/qt5x11extras/qt5x11extras.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5x11extras/qt5x11extras.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package))package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +4
-4@@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative --2.25.1
Quoted 4 lines
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v2 4/4] package/qt5: bump packages to latest kde submodule versions
All;
Ignore my previous email. I didn't realize I was responding to a v2.
This builds correctly!
Quoted 1,471 lines · Adam Duskett
Hello!
Thanks again for your help in getting rid of the scourge that is Python2! A few issues with this patch series:
- Qt5base is the package that installs syncqt.pl. This results in an immediate failure
at the begging of the build:
/bin/bash: /output/host/bin/syncqt.pl: No such file or directoryA simple solution would be to have a
post_extract_hookto install the script:
defineQT5BASE_INSTALL_SYNCQT$(INSTALL) -m 0775 -D $(@D)/bin/syncqt.pl $(HOST_DIR)/bin/syncqt.plendef
QT5BASE_POST_EXTRACT_HOOKS+=QT5BASE_INSTALL_SYNCQTAfter that, I get a lot of:
"fatal error:private/qiodevice_p.h: No such file or directory" errors when compiling.The environment is a ubuntu 20.04 docker environment with the bare minimum requirements
installed to compile buildroot. You can find the Dockerfile here:
https://github.com/aduskett/buildroot-docker-devel/blob/master/Ubuntu/20.04/Thanks!
AdamQuoted 1,440 lines · James Hilliard
This points all qt5 packages to the latest kde submodule versions available at https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15
We need to remove some patches applied upstream already.
We need to rework qt5location to pull in the mapboxgl dependency from a separate package as that dependency is only included in release archives.
We need to pin qt5 packages not available in the new upstream to the previous 5.15.2 version.
We need to set
SYNC_QT_HEADERSfor all qt5 packages in the new upstream as headers are only copied in release archives which are not provided in the kde upstream.Set the
MODULE_VERSIONto 5.15.8 to match latest qt5webengine which should be the closest release to the kde patches that don't have lts tags.Create a .git file so to trigger headers sync during configure.
Signed-off-by James Hilliard <[email protected]>---
Changes v1 -> v2:
- fix headers sync and updateMODULE_VERSION--- package/pkg-qmake.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- package/qt5/qt53d/qt53d.mk | 7 ++- ...Fix-build-with-GCC-11-include-limits.patch | 53 ---------------- .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 ------------------- .../0008-Add-missing-limits-include.patch | 32 ---------- .../qt5base/0009-Fix-build-on-riscv32.patch | 45 -------------- package/qt5/qt5base/qt5base.hash | 4 +- package/qt5/qt5base/qt5base.mk | 7 ++- package/qt5/qt5charts/qt5charts.hash | 4 +- package/qt5/qt5charts/qt5charts.mk | 7 ++- package/qt5/qt5coap/qt5coap.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +- .../qt5/qt5connectivity/qt5connectivity.mk | 7 ++- ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 -------------- .../qt5/qt5declarative/qt5declarative.hash | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 7 ++- .../qt5graphicaleffects.hash | 4 +- .../qt5graphicaleffects.mk | 7 ++- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.mk | 7 ++- package/qt5/qt5knx/qt5knx.mk | 2 +- ...gl-native-fix-musl-compile-pthread_g.patch | 8 +-- .../qt5location-mapboxgl.hash | 16 +++++ .../qt5location-mapboxgl.mk | 13 ++++ ...ix-compilation-for-no-opengl-builds.patch} | 0 package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5location/qt5location.mk | 14 ++++- package/qt5/qt5lottie/qt5lottie.hash | 4 +- package/qt5/qt5lottie/qt5lottie.mk | 7 ++- package/qt5/qt5mqtt/qt5mqtt.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 7 ++- package/qt5/qt5opcua/qt5opcua.mk | 2 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 7 ++- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 7 ++- .../qt5quicktimeline/qt5quicktimeline.hash | 4 +- .../qt5/qt5quicktimeline/qt5quicktimeline.mk | 7 ++- .../qt5remoteobjects/qt5remoteobjects.hash | 4 +- .../qt5/qt5remoteobjects/qt5remoteobjects.mk | 7 ++- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5script/qt5script.mk | 7 ++- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5scxml/qt5scxml.mk | 7 ++- package/qt5/qt5sensors/qt5sensors.hash | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 7 ++- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +- package/qt5/qt5serialbus/qt5serialbus.mk | 7 ++- package/qt5/qt5serialport/qt5serialport.hash | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 7 ++- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5svg/qt5svg.mk | 7 ++- package/qt5/qt5tools/qt5tools.hash | 4 +- package/qt5/qt5tools/qt5tools.mk | 7 ++- .../qt5virtualkeyboard.hash | 4 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 ++- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5wayland/qt5wayland.mk | 7 ++- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 7 ++- .../qt5webkit-examples/qt5webkit-examples.mk | 2 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- package/qt5/qt5websockets/qt5websockets.mk | 7 ++- package/qt5/qt5webview/qt5webview.hash | 4 +- package/qt5/qt5webview/qt5webview.mk | 7 ++- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 7 ++- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 7 ++- 71 files changed, 216 insertions(+), 386 deletions(-) delete mode 100644 package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch delete mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch delete mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch delete mode 100644 package/qt5/qt5base/0009-Fix-build-on-riscv32.patch delete mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch rename package/qt5/{qt5location => qt5location-mapboxgl}/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch (81%) create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash create mode 100644 package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk rename package/qt5/qt5location/{0002-fix-compilation-for-no-opengl-builds.patch => 0001-fix-compilation-for-no-opengl-builds.patch} (100%)package/pkg-qmake.mk +3
-1@@ -24,7 +24,9 @@ # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - $(Q)cd $($(PKG)_BUILDDIR) && $(HOST_DIR)/bin/syncqt.pl -version $(QT5_VERSION) + sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + $($(PKG)_BUILDDIR)/.qmake.conf + touch $($(PKG)_BUILDDIR)/.git endef ################################################################################package/qt5/qt53d/qt53d.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz.sha256 -sha256 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d qt3d-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLpackage/qt5/qt53d/qt53d.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT53D_VERSION).tar.xz +QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) +QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES +QT53D_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_ASSIMP),y) QT53D_DEPENDENCIES += assimppackage/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch deleted +0
-53@@ -1,53 +0,0 @@ -From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <[email protected]> -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: [PATCH] Fix build with GCC 11: include <limits> - -Fixes: QTBUG-90395 -Pick-to: 6.0 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne <[email protected]> - -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c] -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - src/corelib/global/qendian.h | 6 ++++-- - src/corelib/global/qfloat16.h | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 99b529f17cd..c874c5e47ab 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -1,7 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. --** Copyright (C) 2016 Intel Corporation. -+** Copyright (C) 2021 The Qt Company Ltd. -+** Copyright (C) 2021 Intel Corporation. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtCore module of the Qt Toolkit. -@@ -44,6 +44,8 @@ - #include <QtCore/qfloat16.h> - #include <QtCore/qglobal.h> - -+#include <limits> -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include <stdlib.h> - #include <string.h> -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index e9477d2ecec..a25fac28862 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - - #include <QtCore/qglobal.h> - #include <QtCore/qmetatype.h> -+#include <limits> - #include <string.h> - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch deleted +0
-61@@ -1,61 +0,0 @@ -From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen <[email protected]> -Date: Mon, 18 Jan 2021 09:58:17 +0200 -Subject: [PATCH] Build fixes for GCC 11 - -Task-number: QTBUG-89977 -Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -Reviewed-by: Lars Knoll <[email protected]> -Reviewed-by: Thiago Macieira <[email protected]> -[Retrieved (and backported) from: -https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -Signed-off-by: Maxim Kochetkov <[email protected]> ---- - src/corelib/text/qbytearraymatcher.h | 2 ++ - src/corelib/tools/qsharedpointer_impl.h | 3 --- - src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include <QtCore/qbytearray.h> - -+#include <limits> -+ - QT_BEGIN_NAMESPACE - - -diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -index 790c187cb9..4aee98af53 100644 ---- a/src/corelib/tools/qsharedpointer_impl.h -+++ b/src/corelib/tools/qsharedpointer_impl.h -@@ -155,9 +155,6 @@ namespace QtSharedPointer { - #endif - inline void checkQObjectShared(...) { } - inline void setQObjectShared(...) { } -- -- inline void operator delete(void *ptr) { ::operator delete(ptr); } -- inline void operator delete(void *, void *) { } - }; - // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) - -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 9e7e1a5572..f0866a90ac 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -698,7 +698,7 @@ void QXcbWindow::show() - if (isTransient(window())) { - const QWindow *tp = window()->transientParent(); - if (tp && tp->handle()) -- transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId(); -+ transientXcbParent = tp->handle()->winId(); - // Default to client leader if there is no transient parent, else modal dialogs can - // be hidden by their parents. - if (!transientXcbParent) --- -2.31.1 -package/qt5/qt5base/0008-Add-missing-limits-include.patch deleted +0
-32@@ -1,32 +0,0 @@ -From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <[email protected]> -Date: Sun, 20 Jun 2021 17:36:41 +0200 -Subject: [PATCH] Add missing limits include - -The code uses std::numeric_limits but is lacking the appropriate include - -Pick-to: 5.15 6.1 6.2 -Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -Reviewed-by: Giuseppe D'Angelo <[email protected]> - -[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -Signed-off-by: Peter Seiderer <[email protected]> ---- - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e960..e26a57ff 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include <tuple> - #include <array> -+#include <limits> - - QT_BEGIN_NAMESPACE - --- -2.32.0 -package/qt5/qt5base/0009-Fix-build-on-riscv32.patch deleted +0
-45@@ -1,45 +0,0 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 - -riscv32 fails to build because __NR_futex is not defined on this -architecture: - -In file included from thread/qmutex_linux.cpp:45, - from thread/qmutex.cpp:804: -thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)': -thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'? - 116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); - | ^~~~~~~~~~ - | _q_futex - -Pick-to: 6.1 6.2 -Fixes: QTBUG-96067 -Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 -Reviewed-by: Thiago Macieira <[email protected]> -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] ---- - src/corelib/thread/qfutex_p.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 ---- a/src/corelib/thread/qfutex_p.h -+++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE - // if not defined in linux/futex.h - # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 - -+// RISC-V does not supply __NR_futex -+# ifndef __NR_futex -+# define __NR_futex __NR_futex_time64 -+# endif -+ - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } --- -cgit v1.2.1 -package/qt5/qt5base/qt5base.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256 -sha256 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 qtbase-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b23754a97af171a6b0b0a21eda3fcc47ad4ac96db172010a7453afc41b6b227d qtbase-6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5base/qt5base.mk +4
-3@@ -4,12 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz +QT5BASE_VERSION = 6e9cf7f32ceffd62d230d482d8d0d4a5b2c9303a +QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) +QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES +QT5BASE_SYNC_QT_HEADERS = YES # A few comments: # * -no-pch to workaround the issue described atpackage/qt5/qt5charts/qt5charts.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz.sha256 -sha256 e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 qtcharts-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3package/qt5/qt5charts/qt5charts.mk +4
-3@@ -4,10 +4,11 @@ # ################################################################################ -QT5CHARTS_VERSION = $(QT5_VERSION) -QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) +QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES +QT5CHARTS_SYNC_QT_HEADERS = YES QT5CHARTS_LICENSE = GPL-3.0 QT5CHARTS_LICENSE_FILES = LICENSE.GPL3package/qt5/qt5coap/qt5coap.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -QT5COAP_VERSION = $(QT5_VERSION) +QT5COAP_VERSION = 5.15.2 QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YESpackage/qt5/qt5connectivity/qt5connectivity.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 qtconnectivity-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5connectivity/qt5connectivity.mk +4
-3@@ -4,10 +4,11 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) +QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES +QT5CONNECTIVITY_SYNC_QT_HEADERS = YES QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDLpackage/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch deleted +0
-45@@ -1,45 +0,0 @@ -From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <[email protected]> -Date: Thu, 22 Jul 2021 23:13:43 +0200 -Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 - compile) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ‘void QQmlProfilerEvent::assignNumbers(const Container&)’: - qqmlprofilerevent_p.h:314:65: error: ‘numeric_limits’ is not a member of ‘std’ - 314 | static_cast<quint16>(numbers.size()) : std::numeric_limits<quint16>::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ‘>’ token - 314 | static_cast<quint16>(numbers.size()) : std::numeric_limits<quint16>::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ‘::max’ has not been declared; did you mean ‘std::max’? - 314 | static_cast<quint16>(numbers.size()) : std::numeric_limits<quint16>::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer <[email protected]> ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include <QtCore/qmetatype.h> - - #include <initializer_list> -+#include <limits> - #include <type_traits> - - // --- -2.32.0 -package/qt5/qt5declarative/qt5declarative.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 ff460197ea96d2313d1da92587d82ff5d90e9d56ac8249d83f4a01ea847bdfb3 qtdeclarative-8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5declarative/qt5declarative.mk +4
-3@@ -4,10 +4,11 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_VERSION = 8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) +QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES +QT5DECLARATIVE_SYNC_QT_HEADERS = YES QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDLpackage/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 qtgraphicaleffects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES +QT5GRAPHICALEFFECTS_SYNC_QT_HEADERS = YES QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDLpackage/qt5/qt5imageformats/qt5imageformats.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz.sha256 -sha256 bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 qtimageformats-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2package/qt5/qt5imageformats/qt5imageformats.mk +4
-3@@ -4,10 +4,11 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) +QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES +QT5IMAGEFORMATS_SYNC_QT_HEADERS = YES QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDLpackage/qt5/qt5knx/qt5knx.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -QT5KNX_VERSION = $(QT5_VERSION) +QT5KNX_VERSION = 5.15.2 QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YESpackage/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch renamed from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch +4
-4@@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer <[email protected]> [[email protected]: add uClibc] Signed-off-by: Yann E. MORIN <[email protected]> --- - src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + platform/default/thread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index c7c79b4..3f135eb 100644 ---- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp -+++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +--- a/platform/default/thread.cpp ++++ b/platform/default/thread.cpp @@ -11,8 +11,9 @@ namespace platform { std::string getCurrentThreadName() {package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash new file +16
-0@@ -0,0 +1,16 @@ +# Locally calculated +sha256 71e3eb527b94a3e2be381cadf0a286eb5d5f248258b2cfb04013ee4009501220 qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.bz2 + +# Hashes for license files: +sha256 50fbbf443ab764019871ed5eedd9035967cb1b4f94baccbc05f3062f2d0fef4e LICENSE.md +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_Boost.txt +sha256 23b997149a52805b5e6acfbd26924e2d2c8dc31d4824c85da46dac4603815055 LICENSE_CSSColorParser.txt +sha256 44b7f71c4d7f3da85e5e6a5d0cfa6942055d326a24f4d60a3728ebed26ea2b9d LICENSE_geojson.txt +sha256 828f2aed51b6526881a236758ec9b08cd69928fbfc70346d9d44a0b3a3444fe1 LICENSE_geojson_vt_cpp.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_geometry.txt +sha256 900ee7709271d6c227e33e600fd3ff156a6eac63fdd7a9089021cd49fe48e19a LICENSE_mapbox.txt +sha256 b4fa5cbec66c57716d1a5cd528af311ebb9610f57ae1550b82dac1dff690c6e9 LICENSE_parsedate.txt +sha256 1f4d477e3c2d74d8706c8f05437bd86804abe46853b1f233ce1549a4de76fa49 LICENSE_protozero.txt +sha256 3bb670161958064f54329ca1d9d45854f6ec5225aa937048c2c4b8af5b8ab5d0 LICENSE_rapidjson.txt +sha256 e2bf3affd357261f7451bb19108281c1bde54746bfa2beb0c1c34ab042b21700 LICENSE_vectortile.txt +sha256 5e39d227943f601123be20a99151094be889e3d6925799d5c67173ab5b2996d5 LICENSE_wagyu.txtpackage/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk new file +13
-0@@ -0,0 +1,13 @@ +################################################################################ +# +# qt5location-mapboxgl +# +################################################################################ + +QT5LOCATION_MAPBOXGL_VERSION = d3101bbc22edd41c9036ea487d4a71eabd97823d +QT5LOCATION_MAPBOXGL_SITE = $(QT5_SITE)/qtlocation-mapboxgl/-/archive/$(QT5LOCATION_MAPBOXGL_VERSION) +QT5LOCATION_MAPBOXGL_SOURCE = qtlocation-mapboxgl-$(QT5LOCATION_MAPBOXGL_VERSION).tar.bz2 +QT5LOCATION_MAPBOXGL_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, BSL-1.0, curl, IJG, ISC, Libpng, MIT, NCSA, OpenSSL, Zlib +QT5LOCATION_MAPBOXGL_LICENSE_FILES = LICENSE.md LICENSE_Boost.txt LICENSE_CSSColorParser.txt LICENSE_geojson.txt LICENSE_geojson_vt_cpp.txt LICENSE_geometry.txt LICENSE_mapbox.txt LICENSE_parsedate.txt LICENSE_protozero.txt LICENSE_rapidjson.txt LICENSE_vectortile.txt LICENSE_wagyu.txt + +$(eval $(generic-package))package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch renamed from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch +0
-0package/qt5/qt5location/qt5location.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz.sha256 -sha256 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 qtlocation-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d8ae2e2b6c1a379fcf68d35a587c2660fbd7d10148bfd93840af98c5800072b qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5location/qt5location.mk +11
-3@@ -4,10 +4,12 @@ # ################################################################################ -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_SITE = $(QT5_SITE)/qtlocation/-/archive/$(QT5LOCATION_VERSION) +QT5LOCATION_SOURCE = qtlocation-$(QT5LOCATION_VERSION).tar.bz2 +QT5LOCATION_PATCH_DEPENDENCIES = qt5location-mapboxgl QT5LOCATION_INSTALL_STAGING = YES +QT5LOCATION_SYNC_QT_HEADERS = YES QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL@@ -16,4 +18,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative endif +define QT5LOCATION_COPY_MAPBOXGL + rm -rf $(@D)/src/3rdparty/mapbox-gl-native + cp -a $(QT5LOCATION_MAPBOXGL_DIR) $(@D)/src/3rdparty/mapbox-gl-native +endef +QT5LOCATION_POST_PATCH_HOOKS += QT5LOCATION_COPY_MAPBOXGL + $(eval $(qmake-package))package/qt5/qt5lottie/qt5lottie.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz.sha256 -sha256 cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 qtlottie-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3package/qt5/qt5lottie/qt5lottie.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5LOTTIE_VERSION = $(QT5_VERSION) -QT5LOTTIE_SITE = $(QT5_SITE) -QT5LOTTIE_SOURCE = qtlottie-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOTTIE_VERSION).tar.xz +QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) +QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative QT5LOTTIE_INSTALL_STAGING = YES +QT5LOTTIE_SYNC_QT_HEADERS = YES QT5LOTTIE_LICENSE = GPL-3.0 QT5LOTTIE_LICENSE_FILES = LICENSE.GPL3 LICENSE.GPL3-EXCEPTpackage/qt5/qt5mqtt/qt5mqtt.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -QT5MQTT_VERSION = $(QT5_VERSION) +QT5MQTT_VERSION = 5.15.2 QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YESpackage/qt5/qt5multimedia/qt5multimedia.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz.sha256 -sha256 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 qtmultimedia-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5multimedia/qt5multimedia.mk +4
-3@@ -4,10 +4,11 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) +QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES +QT5MULTIMEDIA_SYNC_QT_HEADERS = YES QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDLpackage/qt5/qt5opcua/qt5opcua.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_VERSION = 5.15.2 QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git QT5OPCUA_SITE_METHOD = git QT5OPCUA_INSTALL_STAGING = YESpackage/qt5/qt5quickcontrols/qt5quickcontrols.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 qtquickcontrols-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5quickcontrols/qt5quickcontrols.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES +QT5QUICKCONTROLS_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDLpackage/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz.sha256 -sha256 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 qtquickcontrols2-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 d786f7ca3e825eb754d9eff0eb33dee2848e7d447426178625a9bd3fb547bf17 qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_VERSION = be66bf9a5618c745d2a6ee2262967af6307b3b07 +QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES +QT5QUICKCONTROLS2_SYNC_QT_HEADERS = YES QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDLpackage/qt5/qt5quicktimeline/qt5quicktimeline.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz.sha256 -sha256 b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 qtquicktimeline-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3package/qt5/qt5quicktimeline/qt5quicktimeline.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) -QT5QUICKTIMELINE_SITE = $(QT5_SITE) -QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative QT5QUICKTIMELINE_INSTALL_STAGING = YES +QT5QUICKTIMELINE_SYNC_QT_HEADERS = YES QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3package/qt5/qt5remoteobjects/qt5remoteobjects.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz.sha256 -sha256 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 qtremoteobjects-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5remoteobjects/qt5remoteobjects.mk +4
-3@@ -4,13 +4,14 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = $(QT5_VERSION) -QT5REMOTEOBJECTS_SITE = $(QT5_SITE) -QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5REMOTEOBJECTS_VERSION).tar.xz +QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) +QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base QT5REMOTEOBJECTS_INSTALL_STAGING = YES QT5REMOTEOBJECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception (tools), GFDL-1.3 (docs) QT5REMOTEOBJECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5REMOTEOBJECTS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5REMOTEOBJECTS_DEPENDENCIES += qt5declarativepackage/qt5/qt5script/qt5script.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e qtscript-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3package/qt5/qt5script/qt5script.mk +4
-3@@ -4,10 +4,11 @@ # ################################################################################ -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) +QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES +QT5SCRIPT_SYNC_QT_HEADERS = YES # JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+. # This is linked into libQt5Script, which also contains Qt sources underpackage/qt5/qt5scxml/qt5scxml.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz.sha256 -sha256 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc qtscxml-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPTpackage/qt5/qt5scxml/qt5scxml.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5SCXML_VERSION = $(QT5_VERSION) -QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) +QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative QT5SCXML_INSTALL_STAGING = YES +QT5SCXML_SYNC_QT_HEADERS = YES QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDLpackage/qt5/qt5sensors/qt5sensors.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz.sha256 -sha256 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 qtsensors-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5sensors/qt5sensors.mk +4
-3@@ -4,12 +4,13 @@ # ################################################################################ -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) +QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SENSORS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5SENSORS_DEPENDENCIES += qt5declarativepackage/qt5/qt5serialbus/qt5serialbus.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz.sha256 -sha256 aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 qtserialbus-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2package/qt5/qt5serialbus/qt5serialbus.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) +QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES +QT5SERIALBUS_SYNC_QT_HEADERS = YES QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs) QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDLpackage/qt5/qt5serialport/qt5serialport.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz.sha256 -sha256 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d qtserialport-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5serialport/qt5serialport.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) +QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5SERIALPORT_SYNC_QT_HEADERS = YES $(eval $(qmake-package))package/qt5/qt5svg/qt5svg.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256 -sha256 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e qtsvg-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5d058785a3fd18fa9b94656e1b0bb097d423e21cd3d2a217a77e9dc708a9eb0c qtsvg-0cb681eacca0f757702fa409bb05d3d3650aba4e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5svg/qt5svg.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz +QT5SVG_VERSION = 0cb681eacca0f757702fa409bb05d3d3650aba4e +QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) +QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5SVG_SYNC_QT_HEADERS = YES $(eval $(qmake-package))package/qt5/qt5tools/qt5tools.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5tools/qt5tools.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) +QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 QT5TOOLS_INSTALL_STAGING = YES +QT5TOOLS_SYNC_QT_HEADERS = YES # linguist tools compile conditionally on qtHaveModule(qmldevtools-private), # but the condition is used only used to decide if lupdate will supportpackage/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz.sha256 -sha256 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 5da55e63278127365d8d8881e43b34fd6544dfb46c7e1116ea15e16a3d211afe qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) -QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_VERSION = 353b75b2e34bdae901625bbddf5c5e3f3e6c0de5 +QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES +QT5VIRTUALKEYBOARD_SYNC_QT_HEADERS = YES QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0 QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3package/qt5/qt5wayland/qt5wayland.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256 -sha256 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 qtwayland-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 11dcc39291976721adc453f484e7b5ae22a574bce0710e24c61c2e80e6268e30 qtwayland-e0646f531e1e73a90a93faaa45d933ae40769985.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5wayland/qt5wayland.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5WAYLAND_VERSION = $(QT5_VERSION) -QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_VERSION = e0646f531e1e73a90a93faaa45d933ae40769985 +QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) +QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland QT5WAYLAND_INSTALL_STAGING = YES +QT5WAYLAND_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) QT5WAYLAND_DEPENDENCIES += qt5declarativepackage/qt5/qt5webchannel/qt5webchannel.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz.sha256 -sha256 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 qtwebchannel-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5webchannel/qt5webchannel.mk +4
-3@@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) +QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5WEBCHANNEL_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples)package/qt5/qt5webkit-examples/qt5webkit-examples.mk +1
-1@@ -6,7 +6,7 @@ QT5WEBKIT_EXAMPLES_VERSION = 5.9.1 QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLES_VERSION).tar.xz QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3package/qt5/qt5websockets/qt5websockets.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz.sha256 -sha256 a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f qtwebsockets-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5websockets/qt5websockets.mk +4
-3@@ -4,12 +4,13 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) +QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 +QT5WEBSOCKETS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples)package/qt5/qt5webview/qt5webview.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz.sha256 -sha256 be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 qtwebview-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDLpackage/qt5/qt5webview/qt5webview.mk +4
-3@@ -4,13 +4,14 @@ # ################################################################################ -QT5WEBVIEW_VERSION = $(QT5_VERSION) -QT5WEBVIEW_SITE = $(QT5_SITE) -QT5WEBVIEW_SOURCE = qtwebview-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBVIEW_VERSION).tar.xz +QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) +QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine QT5WEBVIEW_INSTALL_STAGING = YES QT5WEBVIEW_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0, GFDL-1.3 (docs) QT5WEBVIEW_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +QT5WEBVIEW_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBVIEW_LICENSE += , BSD-3-Clause (examples)package/qt5/qt5x11extras/qt5x11extras.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256 -sha256 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e qtx11extras-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5x11extras/qt5x11extras.mk +4
-3@@ -4,11 +4,12 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) +QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5X11EXTRAS_SYNC_QT_HEADERS = YES $(eval $(qmake-package))package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +2
-2@@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz.sha256 -sha256 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa qtxmlpatterns-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +4
-4@@ -4,12 +4,13 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +QT5XMLPATTERNS_SYNC_QT_HEADERS = YES ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5XMLPATTERNS_DEPENDENCIES += qt5declarative --2.25.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 3 lines · On Wed, 5 Jan 2022 23:24:04 -0700 James Hilliard <[email protected]>…
_FINAL_ALL_DEPENDENCIESincludes_FINAL_PATCH_DEPENDENCIESwhich may not need to be selected in kconfig in cases where building is not desired, so only check that_FINAL_DEPENDENCIESare selected.
Could you expand the commit log with some specific details of which packages/dependencies are causing issues? I haven't followed the problem and it's not obvious to me what this patch is fixing.
Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 11 lines · Thomas Petazzoni
Quoted 3 lines · On Wed, 5 Jan 2022 23:24:04 -0700 James Hilliard <[email protected]>…
_FINAL_ALL_DEPENDENCIESincludes_FINAL_PATCH_DEPENDENCIESwhich may not need to be selected in kconfig in cases where building is not desired, so only check that_FINAL_DEPENDENCIESare selected.Could you expand the commit log with some specific details of which packages/dependencies are causing issues? I haven't followed the problem and it's not obvious to me what this patch is fixing.
It's needed for this series:
https://patchwork.ozlabs.org/project/buildroot/list/?series=279567
Quoted 8 lines
Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 10 lines · James Hilliard
Quoted 8 lines · Thomas Petazzoni
Quoted 3 lines · On Wed, 5 Jan 2022 23:24:04 -0700 James Hilliard <[email protected]>…
_FINAL_ALL_DEPENDENCIESincludes_FINAL_PATCH_DEPENDENCIESwhich may not need to be selected in kconfig in cases where building is not desired, so only check that_FINAL_DEPENDENCIESare selected.
Quoted 6 lines
Quoted 3 lines
Could you expand the commit log with some specific details of which packages/dependencies are causing issues? I haven't followed the problem and it's not obvious to me what this patch is fixing.
It's needed for this series:
https://patchwork.ozlabs.org/project/buildroot/list/?series=279567
Well, obviously, since it's part of that series.
I think the patch is wrong though. A patch dependency is still a dependency,
so the package should be selected.
The problem is that you add two target packages which have no Config.in. That
is simply a no go: target packages should always have a Config.in symbol.
I'm going to reply with more explanation down the line though.
Regards,
Arnout
Quoted 9 lines
Quoted 9 lines
Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training
https://bootlin.com
Quoted 5 lines
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 18 lines · Arnout Vandecappelle
Quoted 14 lines · James Hilliard
Quoted 11 lines · Thomas Petazzoni
Quoted 3 lines · On Wed, 5 Jan 2022 23:24:04 -0700 James Hilliard <[email protected]>…
_FINAL_ALL_DEPENDENCIESincludes_FINAL_PATCH_DEPENDENCIESwhich may not need to be selected in kconfig in cases where building is not desired, so only check that_FINAL_DEPENDENCIESare selected.Could you expand the commit log with some specific details of which packages/dependencies are causing issues? I haven't followed the problem and it's not obvious to me what this patch is fixing.
Quoted 7 lines
Quoted 2 lines
It's needed for this series:
https://patchwork.ozlabs.org/project/buildroot/list/?series=279567Well, obviously, since it's part of that series.
I think the patch is wrong though. A patch dependency is still a dependency,
so the package should be selected.
Well I thought selection was to enable a package build, I thought selection was only for packages that need their build executed.
Quoted 3 lines
The problem is that you add two target packages which have no Config.in. That
is simply a no go: target packages should always have a Config.in symbol.
Well we don't want to actually build the package, only extract+patch it, I wasn't
sure how else to do that.
Quoted 20 lines
I'm going to reply with more explanation down the line though.
Regards,
ArnoutQuoted 14 lines
Quoted 9 lines
Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training
https://bootlin.com_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
James, All,
On 2022-01-06 13:14 -0600, James Hilliard spake thusly:
Quoted 9 lines · Arnout Vandecappelle
Quoted 8 lines · James Hilliard
Quoted 7 lines
Quoted 5 lines · Thomas Petazzoni
Quoted 3 lines · On Wed, 5 Jan 2022 23:24:04 -0700 James Hilliard <[email protected]>…
_FINAL_ALL_DEPENDENCIESincludes_FINAL_PATCH_DEPENDENCIESwhich may not need to be selected in kconfig in cases where building is not desired, so only check that_FINAL_DEPENDENCIESare selected.
[--SNIP--]
Quoted 4 lines
Quoted 2 lines
I think the patch is wrong though. A patch dependency is still a dependency,
so the package should be selected.Well I thought selection was to enable a package build, I thought selection was only for packages that need their build executed.
No, they are needed for all target packages.
Quoted 5 lines
Quoted 2 lines
The problem is that you add two target packages which have no Config.in. That
is simply a no go: target packages should always have a Config.in symbol.Well we don't want to actually build the package, only extract+patch it, I wasn't
sure how else to do that.
From what we discussed on IRC the other day, I thought I had udnerstood that qt5webengine-chromium-catapult was a hot package, that's why I suggested it to not have a Config.in entry.
However, I might have misunderstood, and it really is a target package, so it needs to have a Config.in entry, even one that does not have a prompt
we already have for a few packages in that situation, that are not user-selectable but are still target packages: glibc, mesa3d-headers, bluez5_utils-headers and a few others... Most interestingly, though, is that we already have a similar situation with linux extensions: they are packages that are present only to provide files that are copied into the kernel tree, like ev3dev-linux-drivers or fbtft.
So, in your case, I believe that qt5webengine-chromium-catapult.mk is basically correct, but a simple Config.in is missing:
# Not user-selectable, it is only needed to be copied # into the chromium source tree.
config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT
bool
And then you should not have any issue anymore with patch-depednencies.
Regards,
Yann E. MORIN.
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
On 06/01/2022 21:19, Yann E. MORIN wrote:
[snip]
Quoted 6 lines
we already have for a few packages in that situation, that are not user-selectable but are still target packages: glibc, mesa3d-headers, bluez5_utils-headers and a few others... Most interestingly, though, is that we already have a similar situation with linux extensions: they are packages that are present only to provide files that are copied into the kernel tree, like ev3dev-linux-drivers or fbtft.
Yeah, true. I find that solution ugly but for those there really is no other way.
But Yann is right, I'm putting a bit too much stress on dropping those
additional packages and using EXTRA_DOWNLOADS instead. I won't mention it again.
Regards,
Arnout
Quoted 8 lines
So, in your case, I believe that qt5webengine-chromium-catapult.mk is basically correct, but a simple Config.in is missing:
# Not user-selectable, it is only needed to be copied # into the chromium source tree.
configBR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT
bool
Quoted 5 lines
And then you should not have any issue anymore with patch-depednencies.
Regards,
Yann E. MORIN.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot