Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/qt5: bump packages to latest kde submodule versions
@ 2022-05-18  1:34 James Hilliard
  2022-07-26 21:11 ` Thomas Petazzoni via buildroot
  2022-07-27  7:58 ` Arnout Vandecappelle
  0 siblings, 2 replies; 10+ messages in thread
From: James Hilliard @ 2022-05-18  1:34 UTC (permalink / raw)
  To: buildroot
  Cc: Joshua Henderson, James Hilliard, Bartosz Bilas, Peter Seiderer,
	Julien Corjon, Gaël Portay

Bump qt5 packages to latest submodule versions from:
https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15

Drop a qt5location patch which is now upstream.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/qt5/qt53d/qt53d.hash                  |   2 +-
 package/qt5/qt53d/qt53d.mk                    |   2 +-
 package/qt5/qt5base/qt5base.hash              |   2 +-
 package/qt5/qt5base/qt5base.mk                |   2 +-
 package/qt5/qt5charts/qt5charts.hash          |   2 +-
 package/qt5/qt5charts/qt5charts.mk            |   2 +-
 .../qt5/qt5connectivity/qt5connectivity.hash  |   2 +-
 .../qt5/qt5connectivity/qt5connectivity.mk    |   2 +-
 .../qt5/qt5declarative/qt5declarative.hash    |   2 +-
 package/qt5/qt5declarative/qt5declarative.mk  |   2 +-
 .../qt5graphicaleffects.hash                  |   2 +-
 .../qt5graphicaleffects.mk                    |   2 +-
 .../qt5/qt5imageformats/qt5imageformats.hash  |   2 +-
 .../qt5/qt5imageformats/qt5imageformats.mk    |   2 +-
 ...fix-compilation-for-no-opengl-builds.patch | 528 ------------------
 package/qt5/qt5location/qt5location.hash      |   2 +-
 package/qt5/qt5location/qt5location.mk        |   2 +-
 package/qt5/qt5lottie/qt5lottie.hash          |   2 +-
 package/qt5/qt5lottie/qt5lottie.mk            |   2 +-
 package/qt5/qt5multimedia/qt5multimedia.hash  |   2 +-
 package/qt5/qt5multimedia/qt5multimedia.mk    |   2 +-
 .../qt5quickcontrols/qt5quickcontrols.hash    |   2 +-
 .../qt5/qt5quickcontrols/qt5quickcontrols.mk  |   2 +-
 .../qt5quickcontrols2/qt5quickcontrols2.hash  |   2 +-
 .../qt5quickcontrols2/qt5quickcontrols2.mk    |   2 +-
 .../qt5quicktimeline/qt5quicktimeline.hash    |   2 +-
 .../qt5/qt5quicktimeline/qt5quicktimeline.mk  |   2 +-
 .../qt5remoteobjects/qt5remoteobjects.hash    |   2 +-
 .../qt5/qt5remoteobjects/qt5remoteobjects.mk  |   2 +-
 package/qt5/qt5script/qt5script.hash          |   2 +-
 package/qt5/qt5script/qt5script.mk            |   2 +-
 package/qt5/qt5scxml/qt5scxml.hash            |   2 +-
 package/qt5/qt5scxml/qt5scxml.mk              |   2 +-
 package/qt5/qt5sensors/qt5sensors.hash        |   2 +-
 package/qt5/qt5sensors/qt5sensors.mk          |   2 +-
 package/qt5/qt5serialbus/qt5serialbus.hash    |   2 +-
 package/qt5/qt5serialbus/qt5serialbus.mk      |   2 +-
 package/qt5/qt5serialport/qt5serialport.hash  |   2 +-
 package/qt5/qt5serialport/qt5serialport.mk    |   2 +-
 package/qt5/qt5svg/qt5svg.hash                |   2 +-
 package/qt5/qt5svg/qt5svg.mk                  |   2 +-
 package/qt5/qt5tools/qt5tools.hash            |   2 +-
 package/qt5/qt5tools/qt5tools.mk              |   2 +-
 .../qt5virtualkeyboard.hash                   |   2 +-
 .../qt5virtualkeyboard/qt5virtualkeyboard.mk  |   2 +-
 package/qt5/qt5wayland/qt5wayland.hash        |   2 +-
 package/qt5/qt5wayland/qt5wayland.mk          |   2 +-
 package/qt5/qt5webchannel/qt5webchannel.hash  |   2 +-
 package/qt5/qt5webchannel/qt5webchannel.mk    |   2 +-
 package/qt5/qt5websockets/qt5websockets.hash  |   2 +-
 package/qt5/qt5websockets/qt5websockets.mk    |   2 +-
 package/qt5/qt5webview/qt5webview.hash        |   2 +-
 package/qt5/qt5webview/qt5webview.mk          |   2 +-
 package/qt5/qt5x11extras/qt5x11extras.hash    |   2 +-
 package/qt5/qt5x11extras/qt5x11extras.mk      |   2 +-
 .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash    |   2 +-
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk  |   2 +-
 57 files changed, 56 insertions(+), 584 deletions(-)
 delete mode 100644 package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch

diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash
index 32d3675619..0f63aab72a 100644
--- a/package/qt5/qt53d/qt53d.hash
+++ b/package/qt5/qt53d/qt53d.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696  qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2
+sha256  44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173  qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2
 
 # Hashes for license files:
 sha256  edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253  LICENSE.GPL
diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk
index 9a07d189bd..4b748a4972 100644
--- a/package/qt5/qt53d/qt53d.mk
+++ b/package/qt5/qt53d/qt53d.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416
+QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016
 QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION)
 QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2
 QT53D_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash
index c031f71c77..27d2b99c34 100644
--- a/package/qt5/qt5base/qt5base.hash
+++ b/package/qt5/qt5base/qt5base.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  18c17d441fbefa9dd13d1d6bfb5f542c986ba86cc37930247f9e4d782df2244b  qtbase-f31e001a9399e4e620847ea2c3e90749350140ae.tar.bz2
+sha256  ecff8cf42af98c2294f7c99eb8c41564892f470382adaf8f4048c85252849808  qtbase-2ffb7ad8a1079a0444b9c72affe3d19b089b60de.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 926d6a307a..a81892422c 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5BASE_VERSION = f31e001a9399e4e620847ea2c3e90749350140ae
+QT5BASE_VERSION = 2ffb7ad8a1079a0444b9c72affe3d19b089b60de
 QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION)
 QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2
 
diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash
index 021d4ea19f..ba22e29996 100644
--- a/package/qt5/qt5charts/qt5charts.hash
+++ b/package/qt5/qt5charts/qt5charts.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21  qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2
+sha256  32119f7ac88c250b24835b91a71510bf673f1cede6e572fd1059debf8325d7ff  qtcharts-16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk
index 24e635b93b..0028c9f8cb 100644
--- a/package/qt5/qt5charts/qt5charts.mk
+++ b/package/qt5/qt5charts/qt5charts.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8
+QT5CHARTS_VERSION = 16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5
 QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION)
 QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2
 QT5CHARTS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash
index 12e9d637b2..1252a73247 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.hash
+++ b/package/qt5/qt5connectivity/qt5connectivity.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450  qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2
+sha256  ec1d91fc35d8b4a333209fb5fd85e00ab77345bff48b60b4e43b804a59f60979  qtconnectivity-c5f35f89e975c2ad58c83c6b606d40ba41057f15.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index a4c79be10b..72797de1a0 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26
+QT5CONNECTIVITY_VERSION = c5f35f89e975c2ad58c83c6b606d40ba41057f15
 QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION)
 QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2
 QT5CONNECTIVITY_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash
index e5b016fc20..00c9a04432 100644
--- a/package/qt5/qt5declarative/qt5declarative.hash
+++ b/package/qt5/qt5declarative/qt5declarative.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  afea60cbfa48f88c1f0f54b8dbbf90370f6d2535179b4ccaf489db8133ff37ea  qtdeclarative-1d49a5b678957adde7e2db23a485a3f48157bc8f.tar.bz2
+sha256  0dd6b29bb19ad419d47d1fb612b39b1834d675fd1c58b80cd85c7d3da98b40bf  qtdeclarative-51efb2ed2f071beda188270a23ac450fe4b318f7.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 54aa3be1cb..cece8e476b 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5DECLARATIVE_VERSION = 1d49a5b678957adde7e2db23a485a3f48157bc8f
+QT5DECLARATIVE_VERSION = 51efb2ed2f071beda188270a23ac450fe4b318f7
 QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION)
 QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2
 QT5DECLARATIVE_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
index e755f0848b..5de13a176d 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9  qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2
+sha256  83ee3888473fb786c1615c4b98320a9b1eeeb66dbc1ef9743b8339718594e48e  qtgraphicaleffects-4c6ec38635aa22cf0854df8e710733c529f4ec02.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index 542eb4de90..e4c464b8c7 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e
+QT5GRAPHICALEFFECTS_VERSION = 4c6ec38635aa22cf0854df8e710733c529f4ec02
 QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION)
 QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2
 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash
index 49690de3bb..9b8a788cae 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.hash
+++ b/package/qt5/qt5imageformats/qt5imageformats.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9  qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2
+sha256  4ce1982ccf3232d25187286ca4893bcf00b149cf9f6706f06f60d908fab480a0  qtimageformats-b43e31b9f31ec482ddea2066fda7ca9315512815.tar.bz2
 
 # Hashes for license files:
 sha256  edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253  LICENSE.GPLv2
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index 506cd123a8..2cc8e0f17b 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f
+QT5IMAGEFORMATS_VERSION = b43e31b9f31ec482ddea2066fda7ca9315512815
 QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION)
 QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2
 QT5IMAGEFORMATS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch
deleted file mode 100644
index 98e65df202..0000000000
--- a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch
+++ /dev/null
@@ -1,528 +0,0 @@
-From 4bcacd0dc8f73de7b9e5e5f5fa2129fd88bdff3b Mon Sep 17 00:00:00 2001
-From: Michal Klocek <michal.klocek@qt.io>
-Date: Mon, 11 Jan 2021 16:02:14 +0100
-Subject: [PATCH] Fix compilation for no opengl builds
-
-Disables experimental labs qml plugin, which
-since a4469cad40 depends heavily on opengl backend.
-
-Fix warnings with msvc when compiling without experimental
-plugin.
-
-Task-number: QTBUG-91623
-Fixes: QTBUG-88017
-Change-Id: I53c5da915981bd05f39134ba57f585d0a0786aa8
-
-Signed-off-by: Michal Klocek <michal.klocek@qt.io>
-Signed-off-by: Alex Blasche <alexander.blasche@qt.io>
-
-[Retrieved from: https://codereview.qt-project.org/c/qt/qtlocation/+/340353]
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
----
- src/location/configure.json                   |  1 +
- .../qdeclarativecirclemapitem.cpp             | 20 +++++++++++--
- .../qdeclarativecirclemapitem_p_p.h           |  2 ++
- .../qdeclarativepolygonmapitem.cpp            | 27 +++++++++++++----
- .../qdeclarativepolygonmapitem_p_p.h          |  6 ++++
- .../qdeclarativepolylinemapitem.cpp           | 30 +++++++++++++++----
- .../qdeclarativepolylinemapitem_p.h           |  2 ++
- .../qdeclarativepolylinemapitem_p_p.h         |  5 +++-
- .../qdeclarativerectanglemapitem.cpp          | 17 +++++++++--
- .../qdeclarativerectanglemapitem_p_p.h        |  2 ++
- src/location/location.pro                     |  9 +++++-
- .../itemsoverlay/qgeomapitemsoverlay.cpp      |  9 +++++-
- 12 files changed, 109 insertions(+), 21 deletions(-)
-
-diff --git a/src/location/configure.json b/src/location/configure.json
-index 62ab029..6d01a9a 100644
---- a/src/location/configure.json
-+++ b/src/location/configure.json
-@@ -9,6 +9,7 @@
-             "label": "Qt.labs.location experimental QML plugin",
-             "purpose": "Provides experimental QtLocation QML types",
-             "section": "Location",
-+            "condition": "config.opengl",
-             "output": [ "privateFeature" ]
-         },
-         "geoservices_osm": {
-diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
-index 841c29a..955de2c 100644
---- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
-+++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
-@@ -446,6 +446,7 @@ void QDeclarativeCircleMapItem::updatePolish()
- */
- void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldCenter, qreal oldRadius, const QGeoCoordinate &newCenter, qreal newRadius)
- {
-+#if QT_CONFIG(opengl)
-     if (m_backend != QDeclarativeCircleMapItem::OpenGL)
-         return;
- 
-@@ -459,6 +460,9 @@ void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldC
-         QScopedPointer<QDeclarativeCircleMapItemPrivate> d(static_cast<QDeclarativeCircleMapItemPrivate *>(new QDeclarativeCircleMapItemPrivateOpenGL(*this)));
-         m_d.swap(d);
-     }
-+#else
-+    return;
-+#endif
- }
- 
- /*!
-@@ -534,9 +538,17 @@ void QDeclarativeCircleMapItem::setBackend(QDeclarativeCircleMapItem::Backend b)
-     if (b == m_backend)
-         return;
-     m_backend = b;
--    QScopedPointer<QDeclarativeCircleMapItemPrivate> d((m_backend == Software)
--                                                        ? static_cast<QDeclarativeCircleMapItemPrivate *>(new QDeclarativeCircleMapItemPrivateCPU(*this))
--                                                        : static_cast<QDeclarativeCircleMapItemPrivate * >(new QDeclarativeCircleMapItemPrivateOpenGL(*this)));
-+    QScopedPointer<QDeclarativeCircleMapItemPrivate> d(
-+            (m_backend == Software) ? static_cast<QDeclarativeCircleMapItemPrivate *>(
-+                    new QDeclarativeCircleMapItemPrivateCPU(*this))
-+#if QT_CONFIG(opengl)
-+                                    : static_cast<QDeclarativeCircleMapItemPrivate *>(
-+                                            new QDeclarativeCircleMapItemPrivateOpenGL(*this)));
-+#else
-+                                    : nullptr);
-+    qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl "
-+           "support");
-+#endif
-     m_d.swap(d);
-     m_d->onGeoGeometryChanged();
-     emit backendChanged();
-@@ -565,7 +577,9 @@ QDeclarativeCircleMapItemPrivate::~QDeclarativeCircleMapItemPrivate() {}
- 
- QDeclarativeCircleMapItemPrivateCPU::~QDeclarativeCircleMapItemPrivateCPU() {}
- 
-+#if QT_CONFIG(opengl)
- QDeclarativeCircleMapItemPrivateOpenGL::~QDeclarativeCircleMapItemPrivateOpenGL() {}
-+#endif
- 
- bool QDeclarativeCircleMapItemPrivate::preserveCircleGeometry (QList<QDoubleVector2D> &path,
-                                     const QGeoCoordinate &center, qreal distance, const QGeoProjectionWebMercator &p)
-diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h
-index 4cf4217..dbe6c8b 100644
---- a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h
-+++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h
-@@ -275,6 +275,7 @@ public:
-     MapPolygonNode *m_node = nullptr;
- };
- 
-+#if QT_CONFIG(opengl)
- class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItemPrivateOpenGL: public QDeclarativeCircleMapItemPrivate
- {
- public:
-@@ -443,6 +444,7 @@ public:
-     MapPolygonNodeGL *m_node = nullptr;
-     MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr;
- };
-+#endif // QT_CONFIG(opengl)
- 
- QT_END_NAMESPACE
- 
-diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
-index fa6ee17..af4f55e 100644
---- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
-+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
-@@ -334,6 +334,7 @@ void QGeoMapPolygonGeometry::updateScreenPoints(const QGeoMap &map, qreal stroke
-         this->translate(QPointF(strokeWidth, strokeWidth));
- }
- 
-+#if QT_CONFIG(opengl)
- QGeoMapPolygonGeometryOpenGL::QGeoMapPolygonGeometryOpenGL(){
- }
- 
-@@ -344,6 +345,7 @@ void QGeoMapPolygonGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const
-         geopath.append(QWebMercator::mercatorToCoord(c));
-     updateSourcePoints(map, geopath);
- }
-+#endif
- 
- // wrapPath always preserves the geometry
- // This one handles holes
-@@ -452,6 +454,7 @@ static void cutPathEars(const QList<QDoubleVector2D> &wrappedPath,
-         screenIndices << quint32(i);
- }
- 
-+#if QT_CONFIG(opengl)
- /*!
-     \internal
- */
-@@ -594,7 +597,7 @@ void QGeoMapPolygonGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebMe
-     sourceBounds_.setWidth(brect.width());
-     sourceBounds_.setHeight(brect.height());
- }
--
-+#endif // QT_CONFIG(opengl)
- /*
-  * QDeclarativePolygonMapItem Private Implementations
-  */
-@@ -603,8 +606,9 @@ QDeclarativePolygonMapItemPrivate::~QDeclarativePolygonMapItemPrivate() {}
- 
- QDeclarativePolygonMapItemPrivateCPU::~QDeclarativePolygonMapItemPrivateCPU() {}
- 
-+#if QT_CONFIG(opengl)
- QDeclarativePolygonMapItemPrivateOpenGL::~QDeclarativePolygonMapItemPrivateOpenGL() {}
--
-+#endif
- /*
-  * QDeclarativePolygonMapItem Implementation
-  */
-@@ -689,9 +693,17 @@ void QDeclarativePolygonMapItem::setBackend(QDeclarativePolygonMapItem::Backend
-     if (b == m_backend)
-         return;
-     m_backend = b;
--    QScopedPointer<QDeclarativePolygonMapItemPrivate> d((m_backend == Software)
--                                                        ? static_cast<QDeclarativePolygonMapItemPrivate *>(new QDeclarativePolygonMapItemPrivateCPU(*this))
--                                                        : static_cast<QDeclarativePolygonMapItemPrivate * >(new QDeclarativePolygonMapItemPrivateOpenGL(*this)));
-+    QScopedPointer<QDeclarativePolygonMapItemPrivate> d(
-+            (m_backend == Software) ? static_cast<QDeclarativePolygonMapItemPrivate *>(
-+                    new QDeclarativePolygonMapItemPrivateCPU(*this))
-+#if QT_CONFIG(opengl)
-+                                    : static_cast<QDeclarativePolygonMapItemPrivate *>(
-+                                            new QDeclarativePolygonMapItemPrivateOpenGL(*this)));
-+#else
-+                                    : nullptr);
-+    qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl "
-+           "support");
-+#endif
-     m_d.swap(d);
-     m_d->onGeoGeometryChanged();
-     emit backendChanged();
-@@ -898,6 +910,7 @@ void QDeclarativePolygonMapItem::geometryChanged(const QRectF &newGeometry, cons
- 
- //////////////////////////////////////////////////////////////////////
- 
-+#if QT_CONFIG(opengl)
- QSGMaterialShader *MapPolygonMaterial::createShader() const
- {
-     return new MapPolygonShader();
-@@ -916,6 +929,7 @@ QSGMaterialType *MapPolygonMaterial::type() const
-     static QSGMaterialType type;
-     return &type;
- }
-+#endif
- 
- MapPolygonNode::MapPolygonNode() :
-     border_(new MapPolylineNode()),
-@@ -967,6 +981,7 @@ void MapPolygonNode::update(const QColor &fillColor, const QColor &borderColor,
-     }
- }
- 
-+#if QT_CONFIG(opengl)
- MapPolygonNodeGL::MapPolygonNodeGL() :
-     //fill_material_(this),
-     fill_material_(),
-@@ -1052,5 +1067,5 @@ void MapPolygonShader::updateState(const QSGMaterialShader::RenderState &state,
-     program()->setUniformValue(m_center_lowpart_id, vecCenter_lowpart);
-     program()->setUniformValue(m_wrapOffset_id, float(newMaterial->wrapOffset()));
- }
--
-+#endif // QT_CONFIG(opengl)
- QT_END_NAMESPACE
-diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h
-index 8d566e6..5e75deb 100644
---- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h
-+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h
-@@ -89,6 +89,7 @@ protected:
-     bool assumeSimple_;
- };
- 
-+#if QT_CONFIG(opengl)
- class Q_LOCATION_PRIVATE_EXPORT QGeoMapPolygonGeometryOpenGL : public QGeoMapItemGeometry
- {
- public:
-@@ -197,6 +198,7 @@ private:
-     int m_color_id;
-     int m_wrapOffset_id;
- };
-+#endif // QT_CONFIG(opengl)
- 
- class Q_LOCATION_PRIVATE_EXPORT MapPolygonMaterial : public QSGFlatColorMaterial
- {
-@@ -269,6 +271,7 @@ private:
-     QSGGeometry geometry_;
- };
- 
-+#if QT_CONFIG(opengl)
- class Q_LOCATION_PRIVATE_EXPORT MapPolygonNodeGL : public MapItemGeometryNode
- {
- 
-@@ -284,6 +287,7 @@ public:
-     MapPolygonMaterial fill_material_;
-     QSGGeometry geometry_;
- };
-+#endif // QT_CONFIG(opengl)
- 
- class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivate
- {
-@@ -479,6 +483,7 @@ public:
-     MapPolygonNode *m_node = nullptr;
- };
- 
-+#if QT_CONFIG(opengl)
- class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivateOpenGL: public QDeclarativePolygonMapItemPrivate
- {
- public:
-@@ -662,6 +667,7 @@ public:
-     MapPolygonNodeGL *m_node = nullptr;
-     MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr;
- };
-+#endif // QT_CONFIG(opengl)
- 
- QT_END_NAMESPACE
- 
-diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
-index d59704d..83d253f 100644
---- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
-+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
-@@ -769,6 +769,7 @@ bool QGeoMapPolylineGeometry::contains(const QPointF &point) const
-     return false;
- }
- 
-+#if QT_CONFIG(opengl)
- void QGeoMapPolylineGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const QGeoPolygon &poly)
- {
-     if (!sourceDirty_)
-@@ -921,6 +922,7 @@ void QGeoMapPolylineGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebM
-     sourceBounds_.setWidth(brect.width() + strokeWidth);
-     sourceBounds_.setHeight(brect.height() + strokeWidth);
- }
-+#endif // QT_CONFIG(opengl)
- 
- /*
-  * QDeclarativePolygonMapItem Private Implementations
-@@ -928,12 +930,13 @@ void QGeoMapPolylineGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebM
- 
- QDeclarativePolylineMapItemPrivate::~QDeclarativePolylineMapItemPrivate() {}
- 
--
- QDeclarativePolylineMapItemPrivateCPU::~QDeclarativePolylineMapItemPrivateCPU() {}
- 
-+#if QT_CONFIG(opengl)
- QDeclarativePolylineMapItemPrivateOpenGLLineStrip::~QDeclarativePolylineMapItemPrivateOpenGLLineStrip() {}
- 
- QDeclarativePolylineMapItemPrivateOpenGLExtruded::~QDeclarativePolylineMapItemPrivateOpenGLExtruded() {}
-+#endif
- 
- /*
-  * QDeclarativePolygonMapItem Implementation
-@@ -941,10 +944,12 @@ QDeclarativePolylineMapItemPrivateOpenGLExtruded::~QDeclarativePolylineMapItemPr
- 
- struct PolylineBackendSelector
- {
-+#if QT_CONFIG(opengl)
-     PolylineBackendSelector()
-     {
-         backend = (qgetenv("QTLOCATION_OPENGL_ITEMS").toInt()) ? QDeclarativePolylineMapItem::OpenGLExtruded : QDeclarativePolylineMapItem::Software;
-     }
-+#endif
-     QDeclarativePolylineMapItem::Backend backend = QDeclarativePolylineMapItem::Software;
- };
- 
-@@ -1236,11 +1241,22 @@ void QDeclarativePolylineMapItem::setBackend(QDeclarativePolylineMapItem::Backen
-     if (b == m_backend)
-         return;
-     m_backend = b;
--    QScopedPointer<QDeclarativePolylineMapItemPrivate> d((m_backend == Software)
--                                                        ? static_cast<QDeclarativePolylineMapItemPrivate *>(new QDeclarativePolylineMapItemPrivateCPU(*this))
--                                                        : ((m_backend == OpenGLExtruded)
--                                                           ? static_cast<QDeclarativePolylineMapItemPrivate * >(new QDeclarativePolylineMapItemPrivateOpenGLExtruded(*this))
--                                                           : static_cast<QDeclarativePolylineMapItemPrivate * >(new QDeclarativePolylineMapItemPrivateOpenGLLineStrip(*this))));
-+    QScopedPointer<QDeclarativePolylineMapItemPrivate> d(
-+            (m_backend == Software)
-+                    ? static_cast<QDeclarativePolylineMapItemPrivate *>(
-+                            new QDeclarativePolylineMapItemPrivateCPU(*this))
-+#if QT_CONFIG(opengl)
-+                    : ((m_backend == OpenGLExtruded)
-+                               ? static_cast<QDeclarativePolylineMapItemPrivate *>(
-+                                       new QDeclarativePolylineMapItemPrivateOpenGLExtruded(*this))
-+                               : static_cast<QDeclarativePolylineMapItemPrivate *>(
-+                                       new QDeclarativePolylineMapItemPrivateOpenGLLineStrip(
-+                                               *this))));
-+#else
-+                    : nullptr);
-+    qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl "
-+           "support");
-+#endif
-     m_d.swap(d);
-     m_d->onGeoGeometryChanged();
-     emit backendChanged();
-@@ -1477,6 +1493,7 @@ void MapPolylineNode::update(const QColor &fillColor,
-     }
- }
- 
-+#if QT_CONFIG(opengl)
- MapPolylineNodeOpenGLLineStrip::MapPolylineNodeOpenGLLineStrip()
- : geometry_(QSGGeometry::defaultAttributes_Point2D(), 0)
- {
-@@ -2080,5 +2097,6 @@ unsigned int QGeoMapItemLODGeometry::zoomForLOD(unsigned int zoom)
-         return res;
-     return res + 1; // give more resolution when closing in
- }
-+#endif // QT_CONFIG(opengl)
- 
- QT_END_NAMESPACE
-diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
-index 9cd20ea..d3d0ebd 100644
---- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
-+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
-@@ -97,8 +97,10 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItem : public QDeclarativ
- public:
-     enum Backend {
-         Software = 0,
-+#if QT_CONFIG(opengl)
-         OpenGLLineStrip = 1,
-         OpenGLExtruded = 2,
-+#endif
-     };
- 
-     explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0);
-diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h
-index 2a921e2..e184391 100644
---- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h
-+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h
-@@ -213,6 +213,7 @@ protected:
-     QSGGeometry geometry_;
- };
- 
-+#if QT_CONFIG(opengl)
- class Q_LOCATION_PRIVATE_EXPORT QGeoMapItemLODGeometry
- {
- public:
-@@ -566,6 +567,7 @@ protected:
-     MapPolylineMaterialExtruded fill_material_;
-     QSGGeometry m_geometryTriangulating;
- };
-+#endif // QT_CONFIG(opengl)
- 
- class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivate
- {
-@@ -720,6 +722,7 @@ public:
-     MapPolylineNode *m_node = nullptr;
- };
- 
-+#if QT_CONFIG(opengl)
- class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivateOpenGLLineStrip: public QDeclarativePolylineMapItemPrivate
- {
- public:
-@@ -884,7 +887,7 @@ public:
- 
-     MapPolylineNodeOpenGLExtruded *m_nodeTri = nullptr;
- };
--
-+#endif // QT_CONFIG(opengl)
- QT_END_NAMESPACE
- 
- #endif // QDECLARATIVEPOLYLINEMAPITEM_P_P_H
-diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
-index 74d2cc1..6192be0 100644
---- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
-+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
-@@ -185,9 +185,18 @@ void QDeclarativeRectangleMapItem::setBackend(QDeclarativeRectangleMapItem::Back
-     if (b == m_backend)
-         return;
-     m_backend = b;
--    QScopedPointer<QDeclarativeRectangleMapItemPrivate> d((m_backend == Software)
--                                                        ? static_cast<QDeclarativeRectangleMapItemPrivate *>(new QDeclarativeRectangleMapItemPrivateCPU(*this))
--                                                        : static_cast<QDeclarativeRectangleMapItemPrivate * >(new QDeclarativeRectangleMapItemPrivateOpenGL(*this)));
-+    QScopedPointer<QDeclarativeRectangleMapItemPrivate> d(
-+            (m_backend == Software) ? static_cast<QDeclarativeRectangleMapItemPrivate *>(
-+                    new QDeclarativeRectangleMapItemPrivateCPU(*this))
-+#if QT_CONFIG(opengl)
-+                                    : static_cast<QDeclarativeRectangleMapItemPrivate *>(
-+                                            new QDeclarativeRectangleMapItemPrivateOpenGL(*this)));
-+#else
-+                                    : nullptr);
-+    qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl "
-+           "support");
-+#endif
-+
-     m_d.swap(d);
-     m_d->onGeoGeometryChanged();
-     emit backendChanged();
-@@ -397,6 +406,8 @@ QDeclarativeRectangleMapItemPrivate::~QDeclarativeRectangleMapItemPrivate() {}
- 
- QDeclarativeRectangleMapItemPrivateCPU::~QDeclarativeRectangleMapItemPrivateCPU() {}
- 
-+#if QT_CONFIG(opengl)
- QDeclarativeRectangleMapItemPrivateOpenGL::~QDeclarativeRectangleMapItemPrivateOpenGL() {}
-+#endif
- 
- QT_END_NAMESPACE
-diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h
-index 65d2f61..f7ecd2a 100644
---- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h
-+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h
-@@ -244,6 +244,7 @@ public:
-     MapPolygonNode *m_node = nullptr;
- };
- 
-+#if QT_CONFIG(opengl)
- class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItemPrivateOpenGL: public QDeclarativeRectangleMapItemPrivate
- {
- public:
-@@ -410,6 +411,7 @@ public:
-     MapPolygonNodeGL *m_node = nullptr;
-     MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr;
- };
-+#endif // QT_CONFIG(opengl)
- 
- QT_END_NAMESPACE
- 
-diff --git a/src/location/location.pro b/src/location/location.pro
-index b0e2c3f..ae20271 100644
---- a/src/location/location.pro
-+++ b/src/location/location.pro
-@@ -39,7 +39,14 @@ include(maps/maps.pri)
- include(places/places.pri)
- include(declarativemaps/declarativemaps.pri)
- include(declarativeplaces/declarativeplaces.pri)
--qtConfig(location-labs-plugin):include(labs/labs.pri)
-+qtConfig(location-labs-plugin) {
-+   include(labs/labs.pri)
-+} else {
-+  # FIXME: this should be moved out of plugin source code, geojson is referenced from other places
-+  # within codebase,however compilation of location-labs-plugin is optional
-+  PRIVATE_HEADERS += labs/qgeojson_p.h
-+  SOURCES += labs/qgeojson.cpp
-+}
- 
- HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
- 
-diff --git a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
-index 1ebad08..a764438 100644
---- a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
-+++ b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
-@@ -103,6 +103,7 @@ QGeoMap::Capabilities QGeoMapItemsOverlay::capabilities() const
- bool QGeoMapItemsOverlay::createMapObjectImplementation(QGeoMapObject *obj)
- {
- #ifndef LOCATIONLABS
-+    Q_UNUSED(obj);
-     return false;
- #else
-     Q_D(QGeoMapItemsOverlay);
-@@ -132,7 +133,9 @@ QSGNode *QGeoMapItemsOverlay::updateSceneGraph(QSGNode *node, QQuickWindow *wind
- 
- void QGeoMapItemsOverlay::removeMapObject(QGeoMapObject *obj)
- {
--#ifdef LOCATIONLABS
-+#ifndef LOCATIONLABS
-+    Q_UNUSED(obj);
-+#else
-     Q_D(QGeoMapItemsOverlay);
-     d->removeMapObject(obj);
- #endif
-@@ -169,7 +172,11 @@ QRectF QGeoMapItemsOverlayPrivate::visibleArea() const
- QGeoMapItemsOverlayPrivate::QGeoMapItemsOverlayPrivate(QGeoMappingManagerEngineItemsOverlay *engine, QGeoMapItemsOverlay *map)
-     : QGeoMapPrivate(engine, new QGeoProjectionWebMercator)
- {
-+#ifndef LOCATIONLABS
-+    Q_UNUSED(map);
-+#else
-     m_qsgSupport.m_map = map;
-+#endif
- }
- 
- QGeoMapItemsOverlayPrivate::~QGeoMapItemsOverlayPrivate()
--- 
-2.33.1
-
diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash
index 17da2bb9ad..e41b20fd9b 100644
--- a/package/qt5/qt5location/qt5location.hash
+++ b/package/qt5/qt5location/qt5location.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  11cf8320598821c97f853635c529451503917895f11e664dfdd0b63bf48c8a46  qt5location-861e372b6ad81570d4f496e42fb25a6699b72f2f-br1.tar.gz
+sha256  f9673cb1e5b88b4c43d663d7b9b666ff82d6843bf2b445805367cf537839a782  qt5location-db3b6bc6afed6477e6ab2d8465e41efee30fb6d5-br1.tar.gz
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
index b1d19d7811..a61994fa53 100644
--- a/package/qt5/qt5location/qt5location.mk
+++ b/package/qt5/qt5location/qt5location.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f
+QT5LOCATION_VERSION = db3b6bc6afed6477e6ab2d8465e41efee30fb6d5
 QT5LOCATION_SITE = $(QT5_SITE)/qtlocation
 QT5LOCATION_SITE_METHOD = git
 QT5LOCATION_GIT_SUBMODULES = YES
diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash
index 46ab3f60df..c5c71ddf6c 100644
--- a/package/qt5/qt5lottie/qt5lottie.hash
+++ b/package/qt5/qt5lottie/qt5lottie.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1  qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2
+sha256  7e006b7a3608f0737f41682352819c404db4c1506d9ebe82eb4af7b1ae652d14  qtlottie-ccba2b00bd7f10558edb8664d6b9a95e9fafe6ac.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk
index e9614fbecf..d02d693401 100644
--- a/package/qt5/qt5lottie/qt5lottie.mk
+++ b/package/qt5/qt5lottie/qt5lottie.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4
+QT5LOTTIE_VERSION = ccba2b00bd7f10558edb8664d6b9a95e9fafe6ac
 QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION)
 QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2
 QT5LOTTIE_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash
index 1c4d930248..527e3948b8 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.hash
+++ b/package/qt5/qt5multimedia/qt5multimedia.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef  qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2
+sha256  b6a17deafe7ea7ad44e2852a92ea73b0089beaf9f24cb3434d018db9b8170ee6  qtmultimedia-dc0ee181d4c56ff66c989bd3292dad7cc35e234b.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 6695369063..bf2126b285 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545
+QT5MULTIMEDIA_VERSION = dc0ee181d4c56ff66c989bd3292dad7cc35e234b
 QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION)
 QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2
 QT5MULTIMEDIA_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
index 2138b3e313..45af81c99f 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b  qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2
+sha256  c2ddcf9c524ef12a0786c410ac4b3c6d4be9aa17db71f2ea8c57ff615fda62dd  qtquickcontrols-d405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index c2b5ae182e..5903e6d69c 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420
+QT5QUICKCONTROLS_VERSION = d405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b
 QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION)
 QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2
 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
index 766fd69077..7d81b61407 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  f0315b0f0301fdb16d6ee78c57e3cd600121884c1356ca1160ace96a57ac17bc  qtquickcontrols2-d8d6b14b9907adbc6ce307d52be34aaa761a58fa.tar.bz2
+sha256  0c4204257be906c13f863b9481bb20ad616c9a80a074b6f160f863ac046dad27  qtquickcontrols2-0d3d39e821ea7634c174a29910c18d7101bce6f7.tar.bz2
 
 # Hashes for license files:
 sha256  d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca  LICENSE.GPLv3
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
index ff1a49a9ce..f847ec95ab 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5QUICKCONTROLS2_VERSION = d8d6b14b9907adbc6ce307d52be34aaa761a58fa
+QT5QUICKCONTROLS2_VERSION = 0d3d39e821ea7634c174a29910c18d7101bce6f7
 QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION)
 QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2
 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash
index c2d0b11f2b..e68f66edd8 100644
--- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash
+++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3  qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2
+sha256  ab113ead993206de4025c78fd2babea69824f52ff88fa78451b6bbcb932a6ab6  qtquicktimeline-2ce816fa5822bcc1c47678447405b2e5dc1312c1.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk
index 49d0cb330b..70cca38ff4 100644
--- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk
+++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07
+QT5QUICKTIMELINE_VERSION = 2ce816fa5822bcc1c47678447405b2e5dc1312c1
 QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION)
 QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2
 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash
index a2573a018a..980101c7fb 100644
--- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash
+++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90  qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2
+sha256  f51631a142ac47a03266496dae9d07c734f092a0afe8c4e18cd78b7cf9c17b38  qtremoteobjects-809412e1cc2151c21f843796ef67705600f6aafb.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk
index b7dee4f2f3..984f392dda 100644
--- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk
+++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735
+QT5REMOTEOBJECTS_VERSION = 809412e1cc2151c21f843796ef67705600f6aafb
 QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION)
 QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2
 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base
diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash
index 0b34ff3e8f..b3e10491fd 100644
--- a/package/qt5/qt5script/qt5script.hash
+++ b/package/qt5/qt5script/qt5script.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011  qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2
+sha256  fc625c1682d7ee5d1092255408cbaf08d5cac52eb45bacd3ab52937dc84d91f2  qtscript-5cec94b2c1503f106f4ef4778d016410ebb86211.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index 4e51eacfc3..313895f11b 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6
+QT5SCRIPT_VERSION = 5cec94b2c1503f106f4ef4778d016410ebb86211
 QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION)
 QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2
 QT5SCRIPT_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash
index 85e72f5378..1c11ae5853 100644
--- a/package/qt5/qt5scxml/qt5scxml.hash
+++ b/package/qt5/qt5scxml/qt5scxml.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69  qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2
+sha256  5fc3e6166ab3588242864c5d8f18235a45f5c3396482ccfeb8590fe67d0cd549  qtscxml-dcbd73cf3e8a07dbfa249d7db2257caafa83781b.tar.bz2
 
 # Hashes for license files:
 sha256  0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652  LICENSE.GPL3-EXCEPT
diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk
index d5d26536a3..af18b84e9d 100644
--- a/package/qt5/qt5scxml/qt5scxml.mk
+++ b/package/qt5/qt5scxml/qt5scxml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7
+QT5SCXML_VERSION = dcbd73cf3e8a07dbfa249d7db2257caafa83781b
 QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION)
 QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2
 QT5SCXML_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash
index 6be87e8cf9..559f02e7f6 100644
--- a/package/qt5/qt5sensors/qt5sensors.hash
+++ b/package/qt5/qt5sensors/qt5sensors.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498  qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2
+sha256  fa0ffba89fed2086d06dab84074cdd789acbfb89da6f64c40a64fc3bc067832e  qtsensors-1ab8d6c7257f9ec060739b648704be1cf1c16b05.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
index eebda912a9..299fab3db0 100644
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1
+QT5SENSORS_VERSION = 1ab8d6c7257f9ec060739b648704be1cf1c16b05
 QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION)
 QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2
 QT5SENSORS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash
index 8b560a8a83..b8f96cf0c0 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.hash
+++ b/package/qt5/qt5serialbus/qt5serialbus.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b  qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2
+sha256  caaccfdabdf502c3aacf9fa842ed31ed7682cab6ada69b06be1ba49273fb1f1c  qtserialbus-e34053fbda8d687e3dc294fbd5e3a88bf94a7a66.tar.bz2
 
 # Hashes for license files:
 sha256  edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253  LICENSE.GPLv2
diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
index fc62c85318..70f23ce407 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.mk
+++ b/package/qt5/qt5serialbus/qt5serialbus.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32
+QT5SERIALBUS_VERSION = e34053fbda8d687e3dc294fbd5e3a88bf94a7a66
 QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION)
 QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2
 QT5SERIALBUS_DEPENDENCIES = qt5serialport
diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash
index 6d821c387f..d25b2193e7 100644
--- a/package/qt5/qt5serialport/qt5serialport.hash
+++ b/package/qt5/qt5serialport/qt5serialport.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075  qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2
+sha256  83abb0c5b9c435a031abf1a36d6d44f8e3f5e2fc16150bdc78c6d33b25386bb6  qtserialport-191e67e428522a0e2e1e8d2f3440607a9760d441.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
index 370093f6f8..cd96df2007 100644
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4
+QT5SERIALPORT_VERSION = 191e67e428522a0e2e1e8d2f3440607a9760d441
 QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION)
 QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2
 QT5SERIALPORT_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash
index 1e4dc54c67..424891ac2c 100644
--- a/package/qt5/qt5svg/qt5svg.hash
+++ b/package/qt5/qt5svg/qt5svg.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  7f45cc161ede4e918a4f3236af7e81d63404199529460cf74b620565dfce6d9e  qtsvg-728012f7762ecd5762d493f8796907c6456f31e7.tar.bz2
+sha256  eeb4175f0b2c3299abf0ca9d751886612dad5ecd212c954f9801b28b4696f4f7  qtsvg-23b8cf7d833c335d7735855570c05e9e0893a9b7.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index 849a2b7f1b..3072fd7a18 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SVG_VERSION = 728012f7762ecd5762d493f8796907c6456f31e7
+QT5SVG_VERSION = 23b8cf7d833c335d7735855570c05e9e0893a9b7
 QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION)
 QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2
 QT5SVG_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash
index a563801997..58ed752b9b 100644
--- a/package/qt5/qt5tools/qt5tools.hash
+++ b/package/qt5/qt5tools/qt5tools.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8  qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2
+sha256  76052a183a41fcddfd4446ffba6a99c3e77a21453fe629cf67379ffa617a0d53  qttools-53ee43a51b5a3de2877dafffc78e71ff55926708.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index e2385080ce..e87c9b50a5 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402
+QT5TOOLS_VERSION = 53ee43a51b5a3de2877dafffc78e71ff55926708
 QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION)
 QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2
 
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
index 432e3099c3..1cdd8f0386 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  a91024f241df0d24ee398c262b61d126d451c70f05ef109901cfb483d1201538  qtvirtualkeyboard-98d1fd864cbb6c7c012c4139118808af110fb8f0.tar.bz2
+sha256  6ef14ba8bb5eb287320b6c0d6e61c5c2916a94ef754bb8a2d89c123043485d67  qtvirtualkeyboard-e8ae4757dd32e8dbf69a7c57f2bc5c1e238416db.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
index 8e997a2426..c31d455c4e 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5VIRTUALKEYBOARD_VERSION = 98d1fd864cbb6c7c012c4139118808af110fb8f0
+QT5VIRTUALKEYBOARD_VERSION = e8ae4757dd32e8dbf69a7c57f2bc5c1e238416db
 QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION)
 QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2
 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg
diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash
index 2acdd1643c..58935ceadc 100644
--- a/package/qt5/qt5wayland/qt5wayland.hash
+++ b/package/qt5/qt5wayland/qt5wayland.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  f43c8ce9070249dfa91b94c09bcbf7c4fa881daf5eecdb9ff93c0eed43a3b7b0  qtwayland-ce2caf493a1343fbd9f8e4c85baf6a61c057f242.tar.bz2
+sha256  bfe9bce353c036356dc7bca04e634f03c7c924381062ce89627a88df0ae7484e  qtwayland-36659e6130ed3fc2b3f0c91423408ef5ecb7b991.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk
index 61182f611c..63fa1f21c0 100644
--- a/package/qt5/qt5wayland/qt5wayland.mk
+++ b/package/qt5/qt5wayland/qt5wayland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WAYLAND_VERSION = ce2caf493a1343fbd9f8e4c85baf6a61c057f242
+QT5WAYLAND_VERSION = 36659e6130ed3fc2b3f0c91423408ef5ecb7b991
 QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION)
 QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2
 QT5WAYLAND_DEPENDENCIES = wayland
diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash
index af195b32b3..b5e9f1a043 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.hash
+++ b/package/qt5/qt5webchannel/qt5webchannel.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf  qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2
+sha256  a281a053471f5c480d7c2679caa0a759e8628f6eafc07c1781f1eb8bb97ee37d  qtwebchannel-8c842152da613f941892481d62267c73c4a4f006.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index 042a28fca9..54e6a70ddb 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7
+QT5WEBCHANNEL_VERSION = 8c842152da613f941892481d62267c73c4a4f006
 QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION)
 QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2
 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets
diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash
index 3cc87865dc..72fbb4a599 100644
--- a/package/qt5/qt5websockets/qt5websockets.hash
+++ b/package/qt5/qt5websockets/qt5websockets.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653  qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2
+sha256  00a6d312f2e0ec8c64c12f6a178681d5936ec65bc7f1b85948b58cdb5021a8b6  qtwebsockets-6a4991250793cd38efa5e8db858cd49c82439130.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index d222f025ee..4eafb0b212 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96
+QT5WEBSOCKETS_VERSION = 6a4991250793cd38efa5e8db858cd49c82439130
 QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION)
 QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2
 QT5WEBSOCKETS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash
index 51d0fb0d7a..fe12950929 100644
--- a/package/qt5/qt5webview/qt5webview.hash
+++ b/package/qt5/qt5webview/qt5webview.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3  qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2
+sha256  6b84aab9bc8292f299b249840218e9e69a1dbbff42e08c5da7cb659cff8bc37d  qtwebview-826d2a33929c69807917536d48b7861e7682001e.tar.bz2
 
 # Hashes for license files:
 sha256  ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d  LICENSE.FDL
diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk
index ed1cfe5065..54da733e7b 100644
--- a/package/qt5/qt5webview/qt5webview.mk
+++ b/package/qt5/qt5webview/qt5webview.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f
+QT5WEBVIEW_VERSION = 826d2a33929c69807917536d48b7861e7682001e
 QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION)
 QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2
 QT5WEBVIEW_DEPENDENCIES = qt5webengine
diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash
index b854cedcb6..7b369b0a02 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.hash
+++ b/package/qt5/qt5x11extras/qt5x11extras.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da  qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2
+sha256  fde322c017bee349d56f73f402ca67ad986e0c43a592e3ee032313aa194406da  qtx11extras-51b0a5a2e3e35f4cb17da1e7cb4babef6294bfb4.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index 7b1e32df17..fb6650e84a 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f
+QT5X11EXTRAS_VERSION = 51b0a5a2e3e35f4cb17da1e7cb4babef6294bfb4
 QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION)
 QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2
 QT5X11EXTRAS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
index c0e3caa407..a1dbb40154 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09  qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2
+sha256  6243e6334c0d1467e3e5bdecd981d7e673f4cc99cf2cee3b99597be4218a4bd2  qtxmlpatterns-dfcae10dec8c1c2c544ad0cd303cea113b0af51d.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 27818ecb78..3bb4ef74fd 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c
+QT5XMLPATTERNS_VERSION = dfcae10dec8c1c2c544ad0cd303cea113b0af51d
 QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION)
 QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2
 QT5XMLPATTERNS_INSTALL_STAGING = YES
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] package/qt5: bump packages to latest kde submodule versions
@ 2024-07-12  8:48 Simon Ruepp via buildroot
  2024-07-12 14:32 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 10+ messages in thread
From: Simon Ruepp via buildroot @ 2024-07-12  8:48 UTC (permalink / raw)
  To: buildroot
  Cc: Joshua Henderson, Bartosz Bilas, Julien Corjon, Thomas Petazzoni,
	Simon Ruepp, Giulio Benetti

From: "Simon Ruepp" <ruepp.simon@mailbox.org>

Bump qt5 packages to latest submodule versions from:
https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15

Signed-off-by: Simon Ruepp <ruepp.simon@mailbox.org>
---
 package/qt5/Config.in                         |    1 +
 package/qt5/qt5.mk                            |    2 +-
 package/qt5/qt53d-assimp/Config.in            |    4 +
 package/qt5/qt53d-assimp/qt53d-assimp.hash    |    5 +
 package/qt5/qt53d-assimp/qt53d-assimp.mk      |   15 +
 package/qt5/qt53d/Config.in                   |    1 +
 package/qt5/qt53d/qt53d.hash                  |    2 +-
 package/qt5/qt53d/qt53d.mk                    |   10 +-
 package/qt5/qt5base/qt5base.hash              |    2 +-
 package/qt5/qt5base/qt5base.mk                |    2 +-
 package/qt5/qt5charts/qt5charts.hash          |    2 +-
 package/qt5/qt5charts/qt5charts.mk            |    2 +-
 .../qt5/qt5connectivity/qt5connectivity.hash  |    2 +-
 .../qt5/qt5connectivity/qt5connectivity.mk    |    2 +-
 .../qt5/qt5declarative/qt5declarative.hash    |    2 +-
 package/qt5/qt5declarative/qt5declarative.mk  |    2 +-
 .../qt5graphicaleffects.hash                  |    2 +-
 .../qt5graphicaleffects.mk                    |    2 +-
 .../qt5/qt5imageformats/qt5imageformats.hash  |    2 +-
 .../qt5/qt5imageformats/qt5imageformats.mk    |    2 +-
 package/qt5/qt5location/qt5location.hash      |    2 +-
 package/qt5/qt5location/qt5location.mk        |    2 +-
 package/qt5/qt5lottie/qt5lottie.hash          |    2 +-
 package/qt5/qt5lottie/qt5lottie.mk            |    2 +-
 package/qt5/qt5multimedia/qt5multimedia.hash  |    2 +-
 package/qt5/qt5multimedia/qt5multimedia.mk    |    2 +-
 .../qt5quickcontrols/qt5quickcontrols.hash    |    2 +-
 .../qt5/qt5quickcontrols/qt5quickcontrols.mk  |    2 +-
 .../qt5quickcontrols2/qt5quickcontrols2.hash  |    2 +-
 .../qt5quickcontrols2/qt5quickcontrols2.mk    |    2 +-
 .../qt5quicktimeline/qt5quicktimeline.hash    |    2 +-
 .../qt5/qt5quicktimeline/qt5quicktimeline.mk  |    2 +-
 .../qt5remoteobjects/qt5remoteobjects.hash    |    2 +-
 .../qt5/qt5remoteobjects/qt5remoteobjects.mk  |    2 +-
 package/qt5/qt5script/qt5script.hash          |    2 +-
 package/qt5/qt5script/qt5script.mk            |    2 +-
 package/qt5/qt5scxml/qt5scxml.hash            |    2 +-
 package/qt5/qt5scxml/qt5scxml.mk              |    2 +-
 package/qt5/qt5sensors/qt5sensors.hash        |    2 +-
 package/qt5/qt5sensors/qt5sensors.mk          |    2 +-
 package/qt5/qt5serialbus/qt5serialbus.hash    |    2 +-
 package/qt5/qt5serialbus/qt5serialbus.mk      |    2 +-
 package/qt5/qt5serialport/qt5serialport.hash  |    2 +-
 package/qt5/qt5serialport/qt5serialport.mk    |    2 +-
 package/qt5/qt5svg/qt5svg.hash                |    2 +-
 package/qt5/qt5svg/qt5svg.mk                  |    2 +-
 package/qt5/qt5tools/qt5tools.hash            |    2 +-
 package/qt5/qt5tools/qt5tools.mk              |    2 +-
 .../qt5virtualkeyboard.hash                   |    2 +-
 .../qt5virtualkeyboard/qt5virtualkeyboard.mk  |    2 +-
 package/qt5/qt5wayland/qt5wayland.hash        |    2 +-
 package/qt5/qt5wayland/qt5wayland.mk          |    2 +-
 package/qt5/qt5webchannel/qt5webchannel.hash  |    2 +-
 package/qt5/qt5webchannel/qt5webchannel.mk    |    2 +-
 .../0001-Add-python3-build-support.patch      | 1858 -----------------
 ...h => 0001-Don-t-rebase-sysroot-path.patch} |    0
 .../qt5webengine-chromium.hash                |    2 +-
 .../qt5webengine-chromium.mk                  |    2 +-
 ...h => 0001-Add-python3-build-support.patch} |    0
 ...2-Pass-cppflags-and-ldflags-to-build.patch |   55 +
 package/qt5/qt5webengine/qt5webengine.hash    |    2 +-
 package/qt5/qt5websockets/qt5websockets.hash  |    2 +-
 package/qt5/qt5websockets/qt5websockets.mk    |    2 +-
 package/qt5/qt5webview/qt5webview.hash        |    2 +-
 package/qt5/qt5webview/qt5webview.mk          |    2 +-
 package/qt5/qt5x11extras/qt5x11extras.hash    |    2 +-
 package/qt5/qt5x11extras/qt5x11extras.mk      |    2 +-
 .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash    |    2 +-
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk  |    2 +-
 69 files changed, 148 insertions(+), 1919 deletions(-)
 create mode 100644 package/qt5/qt53d-assimp/Config.in
 create mode 100644 package/qt5/qt53d-assimp/qt53d-assimp.hash
 create mode 100644 package/qt5/qt53d-assimp/qt53d-assimp.mk
 delete mode 100644 package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch
 rename package/qt5/qt5webengine-chromium/{0002-Don-t-rebase-sysroot-path.patch => 0001-Don-t-rebase-sysroot-path.patch} (100%)
 rename package/qt5/qt5webengine/{0002-Add-python3-build-support.patch => 0001-Add-python3-build-support.patch} (100%)
 create mode 100644 package/qt5/qt5webengine/0002-Pass-cppflags-and-ldflags-to-build.patch

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index f1b16ff39b..879378e057 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -35,6 +35,7 @@ menuconfig BR2_PACKAGE_QT5
 
 if BR2_PACKAGE_QT5
 source "package/qt5/qt53d/Config.in"
+source "package/qt5/qt53d-assimp/Config.in"
 source "package/qt5/qt5base/Config.in"
 source "package/qt5/qt5charts/Config.in"
 source "package/qt5/qt5coap/Config.in"
diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index a43b36dd51..783dbd8c14 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 QT5_VERSION_MAJOR = 5.15
-QT5_VERSION = $(QT5_VERSION_MAJOR).11
+QT5_VERSION = $(QT5_VERSION_MAJOR).14
 QT5_SITE = https://invent.kde.org/qt/qt
 
 include $(sort $(wildcard package/qt5/*/*.mk))
diff --git a/package/qt5/qt53d-assimp/Config.in b/package/qt5/qt53d-assimp/Config.in
new file mode 100644
index 0000000000..421e424f8d
--- /dev/null
+++ b/package/qt5/qt53d-assimp/Config.in
@@ -0,0 +1,4 @@
+# Not user-selectable, it is only needed to be copied
+# into the qt53d source tree.
+config QT53D_ASSIMP
+	bool
diff --git a/package/qt5/qt53d-assimp/qt53d-assimp.hash b/package/qt5/qt53d-assimp/qt53d-assimp.hash
new file mode 100644
index 0000000000..43f36f7f5c
--- /dev/null
+++ b/package/qt5/qt53d-assimp/qt53d-assimp.hash
@@ -0,0 +1,5 @@
+# Locally calculated:
+sha256  00ec879857f511bed0c8b04ea4e7882a282051ec299245af487183c790e65539  qt3d-assimp-8f0c6b04b2257a520aaab38421b2e090204b69df.tar.bz2
+
+# Hashes for license files:
+sha256  a26ccc3dbf2f58ea99c100945a8a126fa0f9f4d7fd2b49aa8bdb8e09355864d8  LICENSE
diff --git a/package/qt5/qt53d-assimp/qt53d-assimp.mk b/package/qt5/qt53d-assimp/qt53d-assimp.mk
new file mode 100644
index 0000000000..c5211fdd5c
--- /dev/null
+++ b/package/qt5/qt53d-assimp/qt53d-assimp.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# qt53d-assimp
+#
+################################################################################
+
+QT53D_ASSIMP_VERSION = 8f0c6b04b2257a520aaab38421b2e090204b69df
+QT53D_ASSIMP_SITE = $(QT5_SITE)/qtquick3d-assimp/-/archive/$(QT53D_ASSIMP_VERSION)
+QT53D_ASSIMP_SOURCE = qt3d-assimp-$(QT53D_ASSIMP_VERSION).tar.bz2
+QT53D_ASSIMP_INSTALL_TARGET = NO
+
+QT53D_ASSIMP_LICENSE = BSD-3-Clause
+QT53D_ASSIMP_LICENSE_FILES = LICENSE
+
+$(eval $(generic-package))
diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in
index 9187bee82b..805dfa2d94 100644
--- a/package/qt5/qt53d/Config.in
+++ b/package/qt5/qt53d/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_QT53D
 	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_QT5DECLARATIVE
 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
+	select BR2_PACKAGE_QT53D_ASSIMP
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash
index 0f63aab72a..65e6e8e380 100644
--- a/package/qt5/qt53d/qt53d.hash
+++ b/package/qt5/qt53d/qt53d.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173  qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2
+sha256  31b3e52fb0b28f1e99dd25342a0204d239f7f42bcb25fb56393956904ef412ea  qt3d-9bf4d03e2515f7c454647d54542330b6e90f8191.tar.bz2
 
 # Hashes for license files:
 sha256  edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253  LICENSE.GPL
diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk
index 4b748a4972..54f8191fb5 100644
--- a/package/qt5/qt53d/qt53d.mk
+++ b/package/qt5/qt53d/qt53d.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016
+QT53D_VERSION = 9bf4d03e2515f7c454647d54542330b6e90f8191
 QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION)
 QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2
-QT53D_DEPENDENCIES = qt5declarative
+QT53D_DEPENDENCIES = qt5declarative qt53d-assimp
 QT53D_INSTALL_STAGING = YES
 QT53D_SYNC_QT_HEADERS = YES
 
@@ -18,4 +18,10 @@ endif
 QT53D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0
 QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3
 
+define QT53D_COPY_ASSIMP
+	rm -rf $(@D)/src/3rdparty/assimp/src
+	cp -a $(QT53D_ASSIMP_DIR) $(@D)/src/3rdparty/assimp/src
+endef
+QT53D_POST_PATCH_HOOKS += QT53D_COPY_ASSIMP
+
 $(eval $(qmake-package))
diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash
index 77b88fa909..7a01b6552c 100644
--- a/package/qt5/qt5base/qt5base.hash
+++ b/package/qt5/qt5base/qt5base.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  9219c8e5d82b32b351743fb548f248400f3b3eca9db37a43b2b8c929d2625c01  qt5base-da6e958319e95fe564d3b30c931492dd666bfaff-git4.tar.gz
+sha256  d3fb227a892b007f26811e3f2b0d9cb941bd8afdf145297e6eea267f457f22b3  qtbase-0e1ff2f06ddac7c32c5a5e0b65e402c9332e56f8.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index bbab9b3de1..cf0c26400a 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5BASE_VERSION = da6e958319e95fe564d3b30c931492dd666bfaff
+QT5BASE_VERSION = 0e1ff2f06ddac7c32c5a5e0b65e402c9332e56f8
 QT5BASE_SITE = $(QT5_SITE)/qtbase
 QT5BASE_SITE_METHOD = git
 QT5BASE_CPE_ID_VENDOR = qt
diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash
index fec54c86b1..009edbd240 100644
--- a/package/qt5/qt5charts/qt5charts.hash
+++ b/package/qt5/qt5charts/qt5charts.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  66dae46a8bcb1dfc10dd3404296701c41e50658792e4a6a7317a182fad6f36c8  qtcharts-e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826.tar.bz2
+sha256  c66fec01fedf753bee860aedc365730367026c28a2418a6819b0b2550336293c  qtcharts-7315c48bcec88014e78165bbda54abfcd557e0af.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk
index bfc6021289..25da7f8ed7 100644
--- a/package/qt5/qt5charts/qt5charts.mk
+++ b/package/qt5/qt5charts/qt5charts.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5CHARTS_VERSION = e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826
+QT5CHARTS_VERSION = 7315c48bcec88014e78165bbda54abfcd557e0af
 QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION)
 QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2
 QT5CHARTS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash
index 776448502b..8185a272ea 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.hash
+++ b/package/qt5/qt5connectivity/qt5connectivity.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  7a44848e113e1d7232c077f9fa8021ab038f59765123920e11936e7d4b8e3c66  qtconnectivity-f0c98c39447894bba493aa91c65053d7f18d68cb.tar.bz2
+sha256  3f7ed280d234a50d21937aecaf5494bbd570fb80e71f49598e082cefe81d41fe  qtconnectivity-99f30db37c63447c59d5fac15bc8feb832a7fd04.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index dc5e647e0b..e1592e80bb 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5CONNECTIVITY_VERSION = f0c98c39447894bba493aa91c65053d7f18d68cb
+QT5CONNECTIVITY_VERSION = 99f30db37c63447c59d5fac15bc8feb832a7fd04
 QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION)
 QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2
 QT5CONNECTIVITY_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash
index 3db5c94458..3a5fc44356 100644
--- a/package/qt5/qt5declarative/qt5declarative.hash
+++ b/package/qt5/qt5declarative/qt5declarative.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  bebd1205aa087f529b8824f0284e127e08672ff7ce36a6b865cd921514ec1192  qtdeclarative-960a980dc885622cb84990c4da75d5060318302d.tar.bz2
+sha256  9a84a707411c0daa6b3292ebe264ac7e979639d9f6d5fd45bb18799b42ca0c33  qtdeclarative-50c8def854806485d66aabcf6918e8b987032e55.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 99c88e7d06..0dbb69f2e0 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5DECLARATIVE_VERSION = 960a980dc885622cb84990c4da75d5060318302d
+QT5DECLARATIVE_VERSION = 50c8def854806485d66aabcf6918e8b987032e55
 QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION)
 QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2
 QT5DECLARATIVE_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
index e5fdaf67bf..900edaee05 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  18afbc24b40420ce0fe6bfad8331f43a1d8c8ec22501b7987ecec9334b69e9a2  qtgraphicaleffects-cce7d784237cd2dd4af1abe2757d048e34e02685.tar.bz2
+sha256  dca1697c8dd21e53999df67f0ac59c1c26531ef3a693bfc066408047ea511e7a  qtgraphicaleffects-2c39e673d6c15a84dcc7882d3772fa04cc79f9ed.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index ddf805303b..341f4a70ac 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5GRAPHICALEFFECTS_VERSION = cce7d784237cd2dd4af1abe2757d048e34e02685
+QT5GRAPHICALEFFECTS_VERSION = 2c39e673d6c15a84dcc7882d3772fa04cc79f9ed
 QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION)
 QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2
 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash
index 779db8d109..5da2563187 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.hash
+++ b/package/qt5/qt5imageformats/qt5imageformats.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  bac150b9c5eaf0132a39a0b2a75cfca5400c11f4b8bf60f7362a6e0307f5c19e  qtimageformats-6a1af670d52492ab0955933b830026b2a18ed6d6.tar.bz2
+sha256  d4805fadfd33243c4a1c9f81083f75b5162e25b92a39a56d87558ba03a2fb8a3  qtimageformats-4e4f5fc6bdac96f5281a3ebeb0fee78df7b1a498.tar.bz2
 
 # Hashes for license files:
 sha256  edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253  LICENSE.GPLv2
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index 27ef05777d..1f51e002e9 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5IMAGEFORMATS_VERSION = 6a1af670d52492ab0955933b830026b2a18ed6d6
+QT5IMAGEFORMATS_VERSION = 4e4f5fc6bdac96f5281a3ebeb0fee78df7b1a498
 QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION)
 QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2
 QT5IMAGEFORMATS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash
index 062dfd42ff..5b6655a262 100644
--- a/package/qt5/qt5location/qt5location.hash
+++ b/package/qt5/qt5location/qt5location.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  7664c9f2bb8a111c939f988c1951737858e91754b9302476ae7cedcf112aa4a3  qt5location-0ec8f5e82da7369a92824167c4d7331f6c502325-git4.tar.gz
+sha256  0485d10a5ca4f2ef078bc033b6e853afcc5b46b83208d39fdefcf219afca707f  qt5location-3beb9c810611337fde61d89aa981e9f177a9ede9-br1.tar.gz
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
index 88bf3d289c..01bb4f747b 100644
--- a/package/qt5/qt5location/qt5location.mk
+++ b/package/qt5/qt5location/qt5location.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5LOCATION_VERSION = 0ec8f5e82da7369a92824167c4d7331f6c502325
+QT5LOCATION_VERSION = 3beb9c810611337fde61d89aa981e9f177a9ede9
 QT5LOCATION_SITE = $(QT5_SITE)/qtlocation
 QT5LOCATION_SITE_METHOD = git
 QT5LOCATION_GIT_SUBMODULES = YES
diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash
index 642625753c..304b92de86 100644
--- a/package/qt5/qt5lottie/qt5lottie.hash
+++ b/package/qt5/qt5lottie/qt5lottie.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  4d8a063687c25675b012821e252a1afd455bdb4ea43e6d79787f9991c68cb5c5  qtlottie-909b79f4810b8ac62baa3544837793cfb132593b.tar.bz2
+sha256  514e4a8e334e69eb345e9ae7186f6254854077ebf5ca30f0ae216df3ea78bacd  qtlottie-b8c1fa109dce6f8bff9f55738d2f1e21ff677796.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk
index d4ad3afc63..a364f2e10a 100644
--- a/package/qt5/qt5lottie/qt5lottie.mk
+++ b/package/qt5/qt5lottie/qt5lottie.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5LOTTIE_VERSION = 909b79f4810b8ac62baa3544837793cfb132593b
+QT5LOTTIE_VERSION = b8c1fa109dce6f8bff9f55738d2f1e21ff677796
 QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION)
 QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2
 QT5LOTTIE_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash
index 7925c4fe05..d6aca5c74d 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.hash
+++ b/package/qt5/qt5multimedia/qt5multimedia.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  3f78ede5dcc231d0e92e9907d11fa1d7a7cf506eb73d3f035e8461b57dc692b4  qtmultimedia-b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4.tar.bz2
+sha256  62d9ab403bae05d3ca1335324143c371a33089ceed6f4124be74a1518b85906e  qtmultimedia-53069c9c6eb52b744333812f42aed36c3db6e752.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 7a56d238f2..07314b3de3 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5MULTIMEDIA_VERSION = b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4
+QT5MULTIMEDIA_VERSION = 53069c9c6eb52b744333812f42aed36c3db6e752
 QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION)
 QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2
 QT5MULTIMEDIA_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
index 219dc8d588..fda3198571 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  8c02691d3eb45b9f144bef64c9705e26e8a4c725a0731b18450d39a589965c49  qtquickcontrols-dcc90558d9c0cba41eec7df290943994289b0e87.tar.bz2
+sha256  0f2244f4425b8886bbeef77c92b807ef4749ace18d31e02ca88183e5af088c18  qtquickcontrols-9325659ec390eda5b160736a926ba58ccb445cce.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index 86792ddd8e..ab7b49f0b8 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5QUICKCONTROLS_VERSION = dcc90558d9c0cba41eec7df290943994289b0e87
+QT5QUICKCONTROLS_VERSION = 9325659ec390eda5b160736a926ba58ccb445cce
 QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION)
 QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2
 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
index 91fb31a7b7..9c401c00e3 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  481220682ce3127711465d6ade22c9ce0e4a4130dd9735344f7464f9147d8f0d  qtquickcontrols2-1ce461bd1dc713cd2f79fc16c5454d587b45eefa.tar.bz2
+sha256  90fb0d1b578af622b98a291f7bc1069695c180040b18e9cd8423fe86e325c290  qtquickcontrols2-69fea340f8f4c483a9b2889e4e24a4b1b52ebc87.tar.bz2
 
 # Hashes for license files:
 sha256  d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca  LICENSE.GPLv3
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
index a2503eb9a3..34c27b7cb7 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5QUICKCONTROLS2_VERSION = 1ce461bd1dc713cd2f79fc16c5454d587b45eefa
+QT5QUICKCONTROLS2_VERSION = 69fea340f8f4c483a9b2889e4e24a4b1b52ebc87
 QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION)
 QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2
 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash
index 1c9f436b1b..602127d769 100644
--- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash
+++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  ee404943ef00dbac33928cf001b613ca517fdfdf2767b932a8def5f8c2b0797f  qtquicktimeline-b1b4b882dabaa036c3fb73c4a879ba8efbb02ded.tar.bz2
+sha256  72b1e95f7d4235b03c0d3ffcbc67ab3e7fbe4c96a4d9631cb8c9024a2b9d4f50  qtquicktimeline-bf6c73064c82b07fcb1f7e72c263b249e137e224.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk
index 3a8542ab1b..4307c9b123 100644
--- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk
+++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5QUICKTIMELINE_VERSION = b1b4b882dabaa036c3fb73c4a879ba8efbb02ded
+QT5QUICKTIMELINE_VERSION = bf6c73064c82b07fcb1f7e72c263b249e137e224
 QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION)
 QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2
 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash
index a931ce09cb..943ecb268e 100644
--- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash
+++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  677b8ccb5c07673296c4fa01bcbc6bd9b8e3a534d332624f61fe0360a5649703  qtremoteobjects-bdc316aca82769b43cb7821c10d80a1ca02b846e.tar.bz2
+sha256  347c89c24480b1f20f12d7415706aba6536ff7277862d3450e34c40cc711016e  qtremoteobjects-3873bdc809ca8d58d91968cb0de34da26646bc79.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk
index 5fea3487a5..8848af3c81 100644
--- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk
+++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5REMOTEOBJECTS_VERSION = bdc316aca82769b43cb7821c10d80a1ca02b846e
+QT5REMOTEOBJECTS_VERSION = 3873bdc809ca8d58d91968cb0de34da26646bc79
 QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION)
 QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2
 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base
diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash
index d6572be818..655b772595 100644
--- a/package/qt5/qt5script/qt5script.hash
+++ b/package/qt5/qt5script/qt5script.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  7731d8c85636d039a2b35a9ee0de7b5ebb0c3900a9b4845676041ce91f56f01f  qtscript-f237e324508dcf0dbabde9dd498eda9fa61c4ff0.tar.bz2
+sha256  6462533cb1749d76c890cb3c325524835a6ee7f12682d425a2cf19628806b284  qtscript-572daa83e990ce88cca27909470c5404657ec9de.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index 96cbbfbbad..4c8a7e1676 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SCRIPT_VERSION = f237e324508dcf0dbabde9dd498eda9fa61c4ff0
+QT5SCRIPT_VERSION = 572daa83e990ce88cca27909470c5404657ec9de
 QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION)
 QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2
 QT5SCRIPT_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash
index 0f13743f45..60e64feb88 100644
--- a/package/qt5/qt5scxml/qt5scxml.hash
+++ b/package/qt5/qt5scxml/qt5scxml.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  d598238bfa3bbbe283a8bd2907a4e8e813e00c522f08297a856e6595bbd44099  qtscxml-e8727aabe55526956295407d27317ec15e12b283.tar.bz2
+sha256  92191932423bdbb11e3005bf4c8bc43faa623d7b16558ecf884f20564ad8dbff  qtscxml-6834b183966d08d9f061642ee7ea2d482cbbf073.tar.bz2
 
 # Hashes for license files:
 sha256  0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652  LICENSE.GPL3-EXCEPT
diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk
index 32ef425e97..f92bfdf645 100644
--- a/package/qt5/qt5scxml/qt5scxml.mk
+++ b/package/qt5/qt5scxml/qt5scxml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SCXML_VERSION = e8727aabe55526956295407d27317ec15e12b283
+QT5SCXML_VERSION = 6834b183966d08d9f061642ee7ea2d482cbbf073
 QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION)
 QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2
 QT5SCXML_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash
index 37a23516df..2955e651e7 100644
--- a/package/qt5/qt5sensors/qt5sensors.hash
+++ b/package/qt5/qt5sensors/qt5sensors.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  f44148d1a21f3959d79f973d8aa233ddfacf37af6e27902fca8c885b91933fcc  qtsensors-a41492b23cde20d1e00427d31e4637d06aea3638.tar.bz2
+sha256  d01ee718ae1c00329a6b3cdadb190a2159e7d1e1e76d7345815cb17a42d48113  qtsensors-bf0b718cd0b6c7823e9d2037d3bdece44185f444.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
index 29e257fdda..b99440e21e 100644
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SENSORS_VERSION = a41492b23cde20d1e00427d31e4637d06aea3638
+QT5SENSORS_VERSION = bf0b718cd0b6c7823e9d2037d3bdece44185f444
 QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION)
 QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2
 QT5SENSORS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash
index 1d1861a4a3..64a518734c 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.hash
+++ b/package/qt5/qt5serialbus/qt5serialbus.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  952b145ae64e03208d7c2a0b0b2b94b928e8998eb72c6762b54e4d9760737dde  qtserialbus-c41785c9f36560722b917d373ee97eed8cc4089a.tar.bz2
+sha256  45bf8a97ef2f2e85c023f4e7ce761b64f98ac6a9c3af2a8f232f2cc778762736  qtserialbus-616bc5b962cdcacb1c1ba985d7236392e9cadb8c.tar.bz2
 
 # Hashes for license files:
 sha256  edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253  LICENSE.GPLv2
diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
index 3315ef5be7..ca22a0ca1c 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.mk
+++ b/package/qt5/qt5serialbus/qt5serialbus.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SERIALBUS_VERSION = c41785c9f36560722b917d373ee97eed8cc4089a
+QT5SERIALBUS_VERSION = 616bc5b962cdcacb1c1ba985d7236392e9cadb8c
 QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION)
 QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2
 QT5SERIALBUS_DEPENDENCIES = qt5serialport
diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash
index e95392b880..b18d0d05b4 100644
--- a/package/qt5/qt5serialport/qt5serialport.hash
+++ b/package/qt5/qt5serialport/qt5serialport.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  2b7584de148f0b6ea2cf162609d44d7ad3bb893b1995427ceed72cb4562db6d7  qtserialport-3380465d5d4977326616c5e57789a81681be650e.tar.bz2
+sha256  c8eea27d6fc031088fc84cf08cdfffda3b72b6fdd279144a0de7a1bcb9f19d91  qtserialport-34c19c6441cd440dc65b59ae7670eadf099d51f8.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
index 462d1dd7b9..592de6f0a9 100644
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SERIALPORT_VERSION = 3380465d5d4977326616c5e57789a81681be650e
+QT5SERIALPORT_VERSION = 34c19c6441cd440dc65b59ae7670eadf099d51f8
 QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION)
 QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2
 QT5SERIALPORT_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash
index f3e47da5de..654016d94c 100644
--- a/package/qt5/qt5svg/qt5svg.hash
+++ b/package/qt5/qt5svg/qt5svg.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  6a71029b46e71667f86c48923f0b292c3057ea56b2aedb8aeaa5af70e85e71c3  qtsvg-3385b64df939815e9df5955f991d270d47a5515b.tar.bz2
+sha256  8e4d0fbfdd8bd33ec23036af932b12f838974ac322a5d53f487190477b2be286  qtsvg-690128b2b8fb6d6fbdc43b2b2633f0f1de3f0638.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index c1d019000b..1221dedcc9 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SVG_VERSION = 3385b64df939815e9df5955f991d270d47a5515b
+QT5SVG_VERSION = 690128b2b8fb6d6fbdc43b2b2633f0f1de3f0638
 QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION)
 QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2
 QT5SVG_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash
index d4ea0dc047..c19eb41e5b 100644
--- a/package/qt5/qt5tools/qt5tools.hash
+++ b/package/qt5/qt5tools/qt5tools.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  7214584115d0b89a362c6b0e8586d6228ac138f3ed5e52c97962b8634edbbcfd  qttools-ddf6686e9bce7a3232af14a2966b4c895e654f02.tar.bz2
+sha256  46bd221011a6b4b1b9da6ce13099e10d09548af325a8b2082b8bc2f692a0d95d  qttools-f82ed367d1b80b69d738cfcde534b75854a45476.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index 98f3948d17..c03d5d6e38 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5TOOLS_VERSION = ddf6686e9bce7a3232af14a2966b4c895e654f02
+QT5TOOLS_VERSION = f82ed367d1b80b69d738cfcde534b75854a45476
 QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION)
 QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2
 
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
index 89559b63f2..d091df1b94 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  c8dfb16614a63e39c714673abe35a7c30107d359356695634af619e62e8ce6cd  qtvirtualkeyboard-817378aa10176fd26eed36542bc657e48d9dd42e.tar.bz2
+sha256  264d7fb33bc7cf1e9a387c7220c997f96e64a2659738a419d558e7c518718bd0  qtvirtualkeyboard-7389450a5de5fdd210f1459abcf73621ec0496bd.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
index 5657d78c30..b4673f7fd4 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5VIRTUALKEYBOARD_VERSION = 817378aa10176fd26eed36542bc657e48d9dd42e
+QT5VIRTUALKEYBOARD_VERSION = 7389450a5de5fdd210f1459abcf73621ec0496bd
 QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION)
 QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2
 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg
diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash
index f4a1663add..eab32f563e 100644
--- a/package/qt5/qt5wayland/qt5wayland.hash
+++ b/package/qt5/qt5wayland/qt5wayland.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  d45149cce43ad76f0c8ee43f0469728259d2ab341cf7e2c02ddab6163c5f1d13  qtwayland-b8f1882df7215b6e00f66b7a6a08afafe230de29.tar.bz2
+sha256  250f54bc9633b0302fc3ec85947c15b4e217cfcbd9fe141bf8abd3df41996857  qtwayland-75f434f14499eb47ede2cb66f0946527bf555791.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk
index 4ce89fc46a..a50402c2bb 100644
--- a/package/qt5/qt5wayland/qt5wayland.mk
+++ b/package/qt5/qt5wayland/qt5wayland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WAYLAND_VERSION = b8f1882df7215b6e00f66b7a6a08afafe230de29
+QT5WAYLAND_VERSION = 75f434f14499eb47ede2cb66f0946527bf555791
 QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION)
 QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2
 QT5WAYLAND_DEPENDENCIES = wayland
diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash
index 7f2a357dbb..bf613d0785 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.hash
+++ b/package/qt5/qt5webchannel/qt5webchannel.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  7d482e5140d789b417c359f557da783ed2cc07e8148133971caeb5b48b418645  qtwebchannel-48a520c11a0ef57f2553746159acf739c7f3863d.tar.bz2
+sha256  fef1e1180d479293b23569190ddfaff5643737f3da065f8954c24b3a1030ea71  qtwebchannel-fca83088ef430f96257d2014e77d08bd350259af.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index 8ba81383d1..fe509045b9 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WEBCHANNEL_VERSION = 48a520c11a0ef57f2553746159acf739c7f3863d
+QT5WEBCHANNEL_VERSION = fca83088ef430f96257d2014e77d08bd350259af
 QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION)
 QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2
 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets
diff --git a/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch
deleted file mode 100644
index cc9726418e..0000000000
--- a/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch
+++ /dev/null
@@ -1,1858 +0,0 @@
-From bf94b834e9beb4e7bc25dbc4c61f5e2db39e7cdc Mon Sep 17 00:00:00 2001
-From: James Hilliard <james.hilliard1@gmail.com>
-Date: Fri, 4 Feb 2022 15:43:35 -0700
-Subject: [PATCH] Add python3 build support
-
-Adapted from:
-https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-chromium-python3.patch
-
-Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
----
- .../protobufs/binary_proto_generator.py       |  8 +-
- .../tracing/generate_trace_viewer_grd.py      |  2 +-
- chromium/mojo/public/tools/bindings/BUILD.gn  |  2 +
- .../tools/bindings/gen_data_files_list.py     |  8 +-
- .../generators/mojom_java_generator.py        |  4 +
- .../tools/mojom/mojom/generate/generator.py   | 14 ++--
- .../tools/mojom/mojom/generate/module.py      |  3 +-
- .../mojom/mojom/generate/template_expander.py | 12 +--
- .../scripts/bind_gen/blink_v8_bridge.py       |  6 +-
- .../scripts/bind_gen/callback_interface.py    |  2 +-
- .../bindings/scripts/bind_gen/code_node.py    | 10 +--
- .../bindings/scripts/bind_gen/codegen_expr.py | 15 ++--
- .../scripts/bind_gen/codegen_format.py        |  2 +-
- .../scripts/bind_gen/codegen_utils.py         |  2 +-
- .../bindings/scripts/bind_gen/dictionary.py   |  2 +-
- .../bindings/scripts/bind_gen/interface.py    | 82 +++++++++++--------
- .../scripts/bind_gen/mako_renderer.py         |  2 +-
- .../bindings/scripts/bind_gen/style_format.py |  9 +-
- .../bindings/scripts/bind_gen/task_queue.py   |  5 +-
- .../bindings/scripts/code_generator.py        | 10 +++
- .../scripts/generate_origin_trial_features.py |  4 +-
- .../bindings/scripts/idl_definitions.py       |  8 +-
- .../renderer/bindings/scripts/idl_reader.py   |  4 +-
- .../renderer/bindings/scripts/idl_types.py    |  2 +-
- .../renderer/bindings/scripts/utilities.py    | 28 +++----
- .../renderer/bindings/scripts/v8_interface.py |  9 +-
- .../renderer/bindings/scripts/v8_methods.py   |  4 +
- .../renderer/bindings/scripts/v8_utilities.py |  2 +-
- .../scripts/web_idl/callback_interface.py     | 12 +--
- .../bindings/scripts/web_idl/database.py      |  2 +-
- .../bindings/scripts/web_idl/exposure.py      |  5 +-
- .../bindings/scripts/web_idl/function_like.py | 28 +++----
- .../bindings/scripts/web_idl/idl_compiler.py  | 21 ++---
- .../bindings/scripts/web_idl/interface.py     | 45 +++++-----
- .../bindings/scripts/web_idl/ir_builder.py    | 29 ++++---
- .../bindings/scripts/web_idl/make_copy.py     |  7 ++
- .../bindings/scripts/web_idl/namespace.py     | 12 +--
- .../bindings/templates/dictionary_v8.cc.tmpl  |  8 +-
- .../scripts/core/css/make_style_shorthands.py | 23 +++---
- .../properties/make_css_property_instances.py |  4 +-
- .../blink/renderer/build/scripts/gperf.py     |  2 +-
- .../blink/renderer/build/scripts/in_file.py   |  2 +-
- .../renderer/build/scripts/in_generator.py    |  5 ++
- .../build/scripts/make_runtime_features.py    |  2 +-
- .../scripts/templates/element_factory.cc.tmpl |  4 +-
- .../templates/element_type_helpers.cc.tmpl    |  4 +-
- .../templates/element_type_helpers.h.tmpl     |  2 +-
- .../build/scripts/templates/macros.tmpl       |  4 +-
- .../templates/make_qualified_names.h.tmpl     |  4 +-
- .../dawn/generator/generator_lib.py           |  4 +
- .../devtools-frontend/src/BUILD.gn            |  2 +
- .../scripts/build/build_inspector_overlay.py  |  3 +-
- .../build/build_release_applications.py       |  9 +-
- .../scripts/build/generate_devtools_grd.py    |  4 +-
- .../src/scripts/build/modular_build.py        |  6 +-
- chromium/third_party/jinja2/tests.py          |  2 +-
- chromium/tools/metrics/ukm/gen_builders.py    |  5 +-
- .../ui/ozone/generate_constructor_list.py     | 13 ++-
- .../ui/ozone/generate_ozone_platform_list.py  | 26 ++++--
- 59 files changed, 331 insertions(+), 229 deletions(-)
-
-diff --git a/chromium/components/resources/protobufs/binary_proto_generator.py b/chromium/components/resources/protobufs/binary_proto_generator.py
-index 7422ead9697..16365515f26 100755
---- a/chromium/components/resources/protobufs/binary_proto_generator.py
-+++ b/chromium/components/resources/protobufs/binary_proto_generator.py
-@@ -7,7 +7,7 @@
-  Converts a given ASCII proto into a binary resource.
- 
- """
--
-+from __future__ import print_function
- import abc
- import imp
- import optparse
-@@ -196,12 +196,12 @@ class BinaryProtoGenerator:
-     self._ImportProtoModules(opts.path)
- 
-     if not self.VerifyArgs(opts):
--      print "Wrong arguments"
-+      print("Wrong arguments")
-       return 1
- 
-     try:
-       self._GenerateBinaryProtos(opts)
-     except Exception as e:
--      print "ERROR: Failed to render binary version of %s:\n  %s\n%s" % (
--          opts.infile, str(e), traceback.format_exc())
-+      print("ERROR: Failed to render binary version of %s:\n  %s\n%s" %
-+            (opts.infile, str(e), traceback.format_exc()))
-       return 1
-diff --git a/chromium/content/browser/tracing/generate_trace_viewer_grd.py b/chromium/content/browser/tracing/generate_trace_viewer_grd.py
-index 037f9497dc2..be393d21f90 100755
---- a/chromium/content/browser/tracing/generate_trace_viewer_grd.py
-+++ b/chromium/content/browser/tracing/generate_trace_viewer_grd.py
-@@ -74,7 +74,7 @@ def main(argv):
-   for filename in parsed_args.source_files:
-     add_file_to_grd(doc, os.path.basename(filename))
- 
--  with open(parsed_args.output_filename, 'w') as output_file:
-+  with open(parsed_args.output_filename, 'wb') as output_file:
-     output_file.write(doc.toxml(encoding='UTF-8'))
- 
- 
-diff --git a/chromium/mojo/public/tools/bindings/BUILD.gn b/chromium/mojo/public/tools/bindings/BUILD.gn
-index fc04b5dd0b1..708958e438b 100644
---- a/chromium/mojo/public/tools/bindings/BUILD.gn
-+++ b/chromium/mojo/public/tools/bindings/BUILD.gn
-@@ -2,9 +2,11 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
- 
-+import("//build/config/python.gni")
- import("//mojo/public/tools/bindings/mojom.gni")
- import("//third_party/jinja2/jinja2.gni")
- 
-+# TODO(crbug.com/1194274): Investigate nondeterminism in Py3 builds.
- action("precompile_templates") {
-   sources = mojom_generator_sources
-   sources += [
-diff --git a/chromium/mojo/public/tools/bindings/gen_data_files_list.py b/chromium/mojo/public/tools/bindings/gen_data_files_list.py
-index 79c9e50efce..8b78d092418 100644
---- a/chromium/mojo/public/tools/bindings/gen_data_files_list.py
-+++ b/chromium/mojo/public/tools/bindings/gen_data_files_list.py
-@@ -18,7 +18,6 @@ import os
- import re
- import sys
- 
--from cStringIO import StringIO
- from optparse import OptionParser
- 
- sys.path.insert(
-@@ -41,12 +40,9 @@ def main():
-   pattern = re.compile(options.pattern)
-   files = [f for f in os.listdir(options.directory) if pattern.match(f)]
- 
--  stream = StringIO()
--  for f in files:
--    print(f, file=stream)
-+  contents = '\n'.join(f for f in files) + '\n'
-+  WriteFile(contents, options.output)
- 
--  WriteFile(stream.getvalue(), options.output)
--  stream.close()
- 
- if __name__ == '__main__':
-   sys.exit(main())
-diff --git a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py
-index 96b2fdfae0c..00b9dccd00c 100644
---- a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py
-+++ b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py
-@@ -25,6 +25,10 @@ sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir,
-                              'build', 'android', 'gyp'))
- from util import build_utils
- 
-+# TODO(crbug.com/1174969): Remove this once Python2 is obsoleted.
-+if sys.version_info.major != 2:
-+  basestring = str
-+  long = int
- 
- GENERATOR_PREFIX = 'java'
- 
-diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py
-index de62260a5c9..4a1c73fcf82 100644
---- a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py
-+++ b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py
-@@ -136,9 +136,14 @@ class Stylizer(object):
- 
- def WriteFile(contents, full_path):
-   # If |contents| is same with the file content, we skip updating.
-+  if not isinstance(contents, bytes):
-+    data = contents.encode('utf8')
-+  else:
-+    data = contents
-+
-   if os.path.isfile(full_path):
-     with open(full_path, 'rb') as destination_file:
--      if destination_file.read() == contents:
-+      if destination_file.read() == data:
-         return
- 
-   # Make sure the containing directory exists.
-@@ -146,11 +151,8 @@ def WriteFile(contents, full_path):
-   fileutil.EnsureDirectoryExists(full_dir)
- 
-   # Dump the data to disk.
--  with open(full_path, "wb") as f:
--    if not isinstance(contents, bytes):
--      f.write(contents.encode('utf-8'))
--    else:
--      f.write(contents)
-+  with open(full_path, 'wb') as f:
-+    f.write(data)
- 
- 
- def AddComputedData(module):
-diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/module.py b/chromium/mojo/public/tools/mojom/mojom/generate/module.py
-index ebbc9b322ea..3d026429bbc 100644
---- a/chromium/mojo/public/tools/mojom/mojom/generate/module.py
-+++ b/chromium/mojo/public/tools/mojom/mojom/generate/module.py
-@@ -398,7 +398,8 @@ class Field(object):
- 
- 
- class StructField(Field):
--  pass
-+  def __hash__(self):
-+    return super(Field, self).__hash__()
- 
- 
- class UnionField(Field):
-diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py
-index 7a300560246..8d9e26fb7f6 100644
---- a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py
-+++ b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py
-@@ -75,9 +75,9 @@ def PrecompileTemplates(generator_modules, output_dir):
-                 os.path.dirname(module.__file__), generator.GetTemplatePrefix())
-         ]))
-     jinja_env.filters.update(generator.GetFilters())
--    jinja_env.compile_templates(
--        os.path.join(output_dir, "%s.zip" % generator.GetTemplatePrefix()),
--        extensions=["tmpl"],
--        zip="stored",
--        py_compile=True,
--        ignore_errors=False)
-+    jinja_env.compile_templates(os.path.join(
-+        output_dir, "%s.zip" % generator.GetTemplatePrefix()),
-+                                extensions=["tmpl"],
-+                                zip="stored",
-+                                py_compile=sys.version_info.major < 3,
-+                                ignore_errors=False)
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py
-index 3225ecca6e4..fc078d31b55 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py
-@@ -344,7 +344,7 @@ def make_default_value_expr(idl_type, default_value):
-     """
-     assert default_value.is_type_compatible_with(idl_type)
- 
--    class DefaultValueExpr:
-+    class DefaultValueExpr(object):
-         _ALLOWED_SYMBOLS_IN_DEPS = ("isolate")
- 
-         def __init__(self, initializer_expr, initializer_deps,
-@@ -502,7 +502,7 @@ def make_v8_to_blink_value(blink_var_name,
-     assert isinstance(blink_var_name, str)
-     assert isinstance(v8_value_expr, str)
-     assert isinstance(idl_type, web_idl.IdlType)
--    assert (argument_index is None or isinstance(argument_index, (int, long)))
-+    assert (argument_index is None or isinstance(argument_index, int))
-     assert (default_value is None
-             or isinstance(default_value, web_idl.LiteralConstant))
- 
-@@ -622,7 +622,7 @@ def make_v8_to_blink_value_variadic(blink_var_name, v8_array,
-     """
-     assert isinstance(blink_var_name, str)
-     assert isinstance(v8_array, str)
--    assert isinstance(v8_array_start_index, (int, long))
-+    assert isinstance(v8_array_start_index, int)
-     assert isinstance(idl_type, web_idl.IdlType)
- 
-     pattern = ("auto&& ${{{_1}}} = "
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py
-index 4a6df513068..8b51f23a409 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py
-@@ -177,7 +177,7 @@ def generate_callback_interface(callback_interface_identifier):
-          prop_install_mode=PropInstallMode.UNCONDITIONAL,
-          trampoline_var_name=None,
-          attribute_entries=[],
--         constant_entries=filter(is_unconditional, constant_entries),
-+         constant_entries=list(filter(is_unconditional, constant_entries)),
-          exposed_construct_entries=[],
-          operation_entries=[])
-     (install_interface_template_decl, install_interface_template_def,
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py
-index 52972fefe20..e5ae9d9629e 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py
-@@ -503,13 +503,13 @@ class CompositeNode(CodeNode):
-         gensym_kwargs = {}
-         template_vars = {}
-         for arg in args:
--            assert isinstance(arg, (CodeNode, int, long, str))
-+            assert isinstance(arg, (CodeNode, int, str))
-             gensym = CodeNode.gensym()
-             gensym_args.append("${{{}}}".format(gensym))
-             template_vars[gensym] = arg
-         for key, value in kwargs.items():
--            assert isinstance(key, (int, long, str))
--            assert isinstance(value, (CodeNode, int, long, str))
-+            assert isinstance(key, (int, str))
-+            assert isinstance(value, (CodeNode, int, str))
-             gensym = CodeNode.gensym()
-             gensym_kwargs[key] = "${{{}}}".format(gensym)
-             template_vars[gensym] = value
-@@ -602,7 +602,7 @@ class ListNode(CodeNode):
-     def insert(self, index, node):
-         if node is None:
-             return
--        assert isinstance(index, (int, long))
-+        assert isinstance(index, int)
-         assert isinstance(node, CodeNode)
-         assert node.outer is None and node.prev is None
- 
-@@ -721,7 +721,7 @@ class SymbolScopeNode(SequenceNode):
-             if not scope_chains:
-                 return counts
- 
--            self_index = iter(scope_chains).next().index(self)
-+            self_index = next(iter(scope_chains)).index(self)
-             scope_chains = map(
-                 lambda scope_chain: scope_chain[self_index + 1:], scope_chains)
-             scope_to_likeliness = {}
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py
-index a229a6c71c9..5fa288dabf2 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py
-@@ -109,7 +109,7 @@ def expr_and(terms):
- 
-     if any(term.is_always_false for term in terms):
-         return _Expr(False)
--    terms = filter(lambda x: not x.is_always_true, terms)
-+    terms = list(filter(lambda x: not x.is_always_true, terms))
-     if not terms:
-         return _Expr(True)
-     if len(terms) == 1:
-@@ -124,7 +124,7 @@ def expr_or(terms):
- 
-     if any(term.is_always_true for term in terms):
-         return _Expr(True)
--    terms = filter(lambda x: not x.is_always_false, terms)
-+    terms = list(filter(lambda x: not x.is_always_false, terms))
-     if not terms:
-         return _Expr(False)
-     if len(terms) == 1:
-@@ -222,7 +222,7 @@ def expr_from_exposure(exposure,
-     elif exposure.only_in_secure_contexts is False:
-         secure_context_term = _Expr(True)
-     else:
--        terms = map(ref_enabled, exposure.only_in_secure_contexts)
-+        terms = list(map(ref_enabled, exposure.only_in_secure_contexts))
-         secure_context_term = expr_or(
-             [_Expr("${is_in_secure_context}"),
-              expr_not(expr_and(terms))])
-@@ -275,10 +275,11 @@ def expr_from_exposure(exposure,
- 
-     # [ContextEnabled]
-     if exposure.context_enabled_features:
--        terms = map(
--            lambda feature: _Expr(
--                "${{context_feature_settings}}->is{}Enabled()".format(
--                    feature)), exposure.context_enabled_features)
-+        terms = list(
-+            map(
-+                lambda feature: _Expr(
-+                    "${{context_feature_settings}}->is{}Enabled()".format(
-+                        feature)), exposure.context_enabled_features))
-         context_enabled_terms.append(
-             expr_and([_Expr("${context_feature_settings}"),
-                       expr_or(terms)]))
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py
-index 87d26eec3ca..f3e9d38247e 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py
-@@ -23,7 +23,7 @@ class _TemplateFormatter(string.Formatter):
-         self._template_formatter_indexing_count_ = 0
- 
-     def get_value(self, key, args, kwargs):
--        if isinstance(key, (int, long)):
-+        if isinstance(key, int):
-             return args[key]
-         assert isinstance(key, str)
-         if not key:
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py
-index 2bcc4fed49a..e72282aa696 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py
-@@ -116,4 +116,4 @@ def write_code_node_to_file(code_node, filepath):
- #                               stderr=format_result.error_message))
- #
- #    web_idl.file_io.write_to_file_if_changed(filepath, format_result.contents)
--    web_idl.file_io.write_to_file_if_changed(filepath, rendered_text)
-+    web_idl.file_io.write_to_file_if_changed(filepath, rendered_text.encode('utf-8'))
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py
-index b39f0100410..4d68202296b 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py
-@@ -993,7 +993,7 @@ def make_dict_trace_func(cg_context):
-         _2 = _blink_member_name(member).value_var
-         return TextNode(_format(pattern, _1=_1, _2=_2))
- 
--    body.extend(map(make_trace_member_node, own_members))
-+    body.extend(list(map(make_trace_member_node, own_members)))
-     body.append(TextNode("BaseClass::Trace(visitor);"))
- 
-     return func_decl, func_def
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
-index 10ff30656ad..bfdf7128aac 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py
-@@ -582,7 +582,7 @@ def _make_blink_api_call(code_node,
-                          overriding_args=None):
-     assert isinstance(code_node, SymbolScopeNode)
-     assert isinstance(cg_context, CodeGenContext)
--    assert num_of_args is None or isinstance(num_of_args, (int, long))
-+    assert num_of_args is None or isinstance(num_of_args, int)
-     assert (overriding_args is None
-             or (isinstance(overriding_args, (list, tuple))
-                 and all(isinstance(arg, str) for arg in overriding_args)))
-@@ -1196,8 +1196,10 @@ def make_overload_dispatcher(cg_context):
-             did_use_break = did_use_break or can_fail
- 
-         conditional = expr_or(
--            map(lambda item: expr_from_exposure(item.function_like.exposure),
--                items))
-+            list(
-+                map(
-+                    lambda item: expr_from_exposure(item.function_like.exposure
-+                                                    ), items)))
-         if not conditional.is_always_true:
-             node = CxxUnlikelyIfNode(cond=conditional, body=node)
- 
-@@ -4642,7 +4644,7 @@ class _PropEntryConstructorGroup(_PropEntryBase):
-     def __init__(self, is_context_dependent, exposure_conditional, world,
-                  constructor_group, ctor_callback_name, ctor_func_length):
-         assert isinstance(ctor_callback_name, str)
--        assert isinstance(ctor_func_length, (int, long))
-+        assert isinstance(ctor_func_length, int)
- 
-         _PropEntryBase.__init__(self, is_context_dependent,
-                                 exposure_conditional, world, constructor_group)
-@@ -4670,7 +4672,7 @@ class _PropEntryOperationGroup(_PropEntryBase):
-                  op_func_length,
-                  no_alloc_direct_callback_name=None):
-         assert isinstance(op_callback_name, str)
--        assert isinstance(op_func_length, (int, long))
-+        assert isinstance(op_func_length, int)
- 
-         _PropEntryBase.__init__(self, is_context_dependent,
-                                 exposure_conditional, world, operation_group)
-@@ -5175,9 +5177,9 @@ def make_install_interface_template(cg_context, function_name, class_name, api_c
-     ])
- 
-     if class_like.identifier == "CSSStyleDeclaration":
--        css_properties = filter(
--            lambda attr: "CSSProperty" in attr.extended_attributes,
--            class_like.attributes)
-+        css_properties = list(
-+            filter(lambda attr: "CSSProperty" in attr.extended_attributes,
-+                   class_like.attributes))
-         if css_properties:
-             prop_name_list = "".join(
-                 map(lambda attr: "\"{}\", ".format(attr.identifier),
-@@ -5567,8 +5569,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As<v8::Object>();\
-             "V8DOMConfiguration::InstallConstants(${isolate}, "
-             "${interface_template}, ${prototype_template}, "
-             "kConstantCallbackTable, base::size(kConstantCallbackTable));")
--    constant_callback_entries = filter(lambda entry: entry.const_callback_name,
--                                       constant_entries)
-+    constant_callback_entries = list(filter(lambda entry: entry.const_callback_name,
-+                                       constant_entries))
-     install_properties(table_name, constant_callback_entries,
-                        _make_constant_callback_registration_table,
-                        installer_call_text)
-@@ -5584,8 +5586,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As<v8::Object>();\
-             "V8DOMConfiguration::InstallConstants(${isolate}, "
-             "${interface_template}, ${prototype_template}, "
-             "kConstantValueTable, base::size(kConstantValueTable));")
--    constant_value_entries = filter(
--        lambda entry: not entry.const_callback_name, constant_entries)
-+    constant_value_entries = list(filter(
-+        lambda entry: not entry.const_callback_name, constant_entries))
-     install_properties(table_name, constant_value_entries,
-                        _make_constant_value_registration_table,
-                        installer_call_text)
-@@ -6336,8 +6338,8 @@ def make_v8_context_snapshot_api(cg_context, component, attribute_entries,
-     assert isinstance(component, web_idl.Component)
- 
-     derived_interfaces = cg_context.interface.deriveds
--    derived_names = map(lambda interface: interface.identifier,
--                        derived_interfaces)
-+    derived_names = list(
-+        map(lambda interface: interface.identifier, derived_interfaces))
-     derived_names.append(cg_context.interface.identifier)
-     if not ("Window" in derived_names or "HTMLDocument" in derived_names):
-         return None, None
-@@ -6411,9 +6413,11 @@ def _make_v8_context_snapshot_get_reference_table_function(
-     collect_callbacks(named_properties_object_callback_defs)
-     collect_callbacks(cross_origin_property_callback_defs)
- 
--    entry_nodes = map(
--        lambda name: TextNode("reinterpret_cast<intptr_t>({}),".format(name)),
--        filter(None, callback_names))
-+    entry_nodes = list(
-+        map(
-+            lambda name: TextNode("reinterpret_cast<intptr_t>({}),".format(name
-+                                                                           )),
-+            filter(None, callback_names)))
-     table_node = ListNode([
-         TextNode("using namespace ${class_name}Callbacks;"),
-         TextNode("static const intptr_t kReferenceTable[] = {"),
-@@ -6451,10 +6455,11 @@ def _make_v8_context_snapshot_install_props_per_context_function(
-         class_name=None,
-         prop_install_mode=PropInstallMode.V8_CONTEXT_SNAPSHOT,
-         trampoline_var_name=None,
--        attribute_entries=filter(selector, attribute_entries),
--        constant_entries=filter(selector, constant_entries),
--        exposed_construct_entries=filter(selector, exposed_construct_entries),
--        operation_entries=filter(selector, operation_entries))
-+        attribute_entries=list(filter(selector, attribute_entries)),
-+        constant_entries=list(filter(selector, constant_entries)),
-+        exposed_construct_entries=list(
-+            filter(selector, exposed_construct_entries)),
-+        operation_entries=list(filter(selector, operation_entries)))
- 
-     return func_decl, func_def
- 
-@@ -6810,11 +6815,11 @@ def generate_interface(interface_identifier):
-          class_name=impl_class_name,
-          prop_install_mode=PropInstallMode.UNCONDITIONAL,
-          trampoline_var_name=tp_install_unconditional_props,
--         attribute_entries=filter(is_unconditional, attribute_entries),
--         constant_entries=filter(is_unconditional, constant_entries),
--         exposed_construct_entries=filter(is_unconditional,
--                                          exposed_construct_entries),
--         operation_entries=filter(is_unconditional, operation_entries))
-+         attribute_entries=list(filter(is_unconditional, attribute_entries)),
-+         constant_entries=list(filter(is_unconditional, constant_entries)),
-+         exposed_construct_entries=list(
-+             filter(is_unconditional, exposed_construct_entries)),
-+         operation_entries=list(filter(is_unconditional, operation_entries)))
-     (install_context_independent_props_decl,
-      install_context_independent_props_def,
-      install_context_independent_props_trampoline) = make_install_properties(
-@@ -6823,11 +6828,14 @@ def generate_interface(interface_identifier):
-          class_name=impl_class_name,
-          prop_install_mode=PropInstallMode.CONTEXT_INDEPENDENT,
-          trampoline_var_name=tp_install_context_independent_props,
--         attribute_entries=filter(is_context_independent, attribute_entries),
--         constant_entries=filter(is_context_independent, constant_entries),
--         exposed_construct_entries=filter(is_context_independent,
--                                          exposed_construct_entries),
--         operation_entries=filter(is_context_independent, operation_entries))
-+         attribute_entries=list(
-+             filter(is_context_independent, attribute_entries)),
-+         constant_entries=list(filter(is_context_independent,
-+                                      constant_entries)),
-+         exposed_construct_entries=list(
-+             filter(is_context_independent, exposed_construct_entries)),
-+         operation_entries=list(
-+             filter(is_context_independent, operation_entries)))
-     (install_context_dependent_props_decl, install_context_dependent_props_def,
-      install_context_dependent_props_trampoline) = make_install_properties(
-          cg_context,
-@@ -6835,11 +6843,13 @@ def generate_interface(interface_identifier):
-          class_name=impl_class_name,
-          prop_install_mode=PropInstallMode.CONTEXT_DEPENDENT,
-          trampoline_var_name=tp_install_context_dependent_props,
--         attribute_entries=filter(is_context_dependent, attribute_entries),
--         constant_entries=filter(is_context_dependent, constant_entries),
--         exposed_construct_entries=filter(is_context_dependent,
--                                          exposed_construct_entries),
--         operation_entries=filter(is_context_dependent, operation_entries))
-+         attribute_entries=list(filter(is_context_dependent,
-+                                       attribute_entries)),
-+         constant_entries=list(filter(is_context_dependent, constant_entries)),
-+         exposed_construct_entries=list(
-+             filter(is_context_dependent, exposed_construct_entries)),
-+         operation_entries=list(filter(is_context_dependent,
-+                                       operation_entries)))
-     (install_interface_template_decl, install_interface_template_def,
-      install_interface_template_trampoline) = make_install_interface_template(
-          cg_context,
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py
-index b4c70553863..f3a2fcd772d 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py
-@@ -105,7 +105,7 @@ class MakoRenderer(object):
-             on_error = self._caller_stack_on_error
-             if (len(current) <= len(on_error)
-                     and all(current[i] == on_error[i]
--                            for i in xrange(len(current)))):
-+                            for i in range(len(current)))):
-                 pass  # Error happened in a deeper caller.
-             else:
-                 self._caller_stack_on_error = list(self._caller_stack)
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py
-index dc3493cc394..017d3d47bb3 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py
-@@ -70,8 +70,13 @@ def gn_format(contents, filename=None):
- 
- 
- def _invoke_format_command(command_line, filename, contents):
--    proc = subprocess.Popen(
--        command_line, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-+    kwargs = {}
-+    if sys.version_info.major != 2:
-+        kwargs['encoding'] = 'utf-8'
-+    proc = subprocess.Popen(command_line,
-+                            stdin=subprocess.PIPE,
-+                            stdout=subprocess.PIPE,
-+                            **kwargs)
-     stdout_output, stderr_output = proc.communicate(input=contents)
-     exit_code = proc.wait()
- 
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py
-index 0d8f4c0f303..e666a9b668e 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py
-@@ -2,6 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
- 
-+import functools
- import multiprocessing
- 
- from .package_initializer import package_initializer
-@@ -76,7 +77,7 @@ class TaskQueue(object):
-         if not report_progress:
-             return
- 
--        done_count = reduce(
-+        done_count = functools.reduce(
-             lambda count, worker_task: count + bool(worker_task.ready()),
-             self._worker_tasks, 0)
-         report_progress(len(self._worker_tasks), done_count)
-@@ -85,4 +86,4 @@ class TaskQueue(object):
- def _task_queue_run_tasks(tasks):
-     for task in tasks:
-         func, args, kwargs = task
--        apply(func, args, kwargs)
-+        func(*args, **kwargs)
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py
-index e8280be7213..e49e6eb965e 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py
-@@ -13,6 +13,7 @@ import re
- import sys
- 
- from idl_types import set_ancestors, IdlType
-+from itertools import groupby
- from v8_globals import includes
- from v8_interface import constant_filters
- from v8_types import set_component_dirs
-@@ -43,6 +44,7 @@ TEMPLATES_DIR = os.path.normpath(
- # after path[0] == invoking script dir
- sys.path.insert(1, THIRD_PARTY_DIR)
- import jinja2
-+from jinja2.filters import make_attrgetter, environmentfilter
- 
- 
- def generate_indented_conditional(code, conditional):
-@@ -88,6 +90,13 @@ def runtime_enabled_if(code, name):
-     return generate_indented_conditional(code, function)
- 
- 
-+@environmentfilter
-+def do_stringify_key_group_by(environment, value, attribute):
-+    expr = make_attrgetter(environment, attribute)
-+    key = lambda item: '' if expr(item) is None else str(expr(item))
-+    return groupby(sorted(value, key=key), expr)
-+
-+
- def initialize_jinja_env(cache_dir):
-     jinja_env = jinja2.Environment(
-         loader=jinja2.FileSystemLoader(TEMPLATES_DIR),
-@@ -117,6 +126,7 @@ def initialize_jinja_env(cache_dir):
-     })
-     jinja_env.filters.update(constant_filters())
-     jinja_env.filters.update(method_filters())
-+    jinja_env.filters["stringifykeygroupby"] = do_stringify_key_group_by
-     return jinja_env
- 
- 
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py
-index 130004eae83..04c0fabcef2 100755
---- a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py
-@@ -80,7 +80,7 @@ def read_idl_file(reader, idl_filename):
-     assert len(interfaces) == 1, (
-         "Expected one interface in file %r, found %d" %
-         (idl_filename, len(interfaces)))
--    return (interfaces.values()[0], includes)
-+    return (list(interfaces.values())[0], includes)
- 
- 
- def interface_is_global(interface):
-@@ -281,7 +281,7 @@ def main():
- 
-     info_provider = create_component_info_provider(
-         os.path.normpath(options.info_dir), options.target_component)
--    idl_filenames = map(str.strip, open(options.idl_files_list))
-+    idl_filenames = list(map(str.strip, open(options.idl_files_list)))
- 
-     generate_origin_trial_features(info_provider, options, idl_filenames)
-     return 0
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py
-index 14e6e9d3f87..b027818aef2 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py
-@@ -394,7 +394,8 @@ class IdlInterface(object):
-             else:
-                 raise ValueError('Unrecognized node class: %s' % child_class)
- 
--        if len(filter(None, [self.iterable, self.maplike, self.setlike])) > 1:
-+        if len(list(filter(None,
-+                           [self.iterable, self.maplike, self.setlike]))) > 1:
-             raise ValueError(
-                 'Interface can only have one of iterable<>, maplike<> and setlike<>.'
-             )
-@@ -512,6 +513,9 @@ class IdlAttribute(TypedObject):
-     def accept(self, visitor):
-         visitor.visit_attribute(self)
- 
-+    def __lt__(self, other):
-+        return self.name < other.name
-+
- 
- ################################################################################
- # Constants
-@@ -852,7 +856,7 @@ class IdlIncludes(object):
- ################################################################################
- 
- 
--class Exposure:
-+class Exposure(object):
-     """An Exposure holds one Exposed or RuntimeEnabled condition.
-     Each exposure has two properties: exposed and runtime_enabled.
-     Exposure(e, r) corresponds to [Exposed(e r)]. Exposure(e) corresponds to
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py
-index 8d72865a6ca..b80eebdcd61 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py
-@@ -55,8 +55,8 @@ def validate_blink_idl_definitions(idl_filename, idl_file_basename,
-          definitions. There is no filename convention in this case.
-        - Otherwise, an IDL file is invalid.
-     """
--    targets = (
--        definitions.interfaces.values() + definitions.dictionaries.values())
-+    targets = (list(definitions.interfaces.values()) +
-+               list(definitions.dictionaries.values()))
-     number_of_targets = len(targets)
-     if number_of_targets > 1:
-         raise Exception(
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py
-index cd4f0c3513b..ab95e9c0b08 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py
-@@ -349,7 +349,7 @@ class IdlUnionType(IdlTypeBase):
-         return True
- 
-     def single_matching_member_type(self, predicate):
--        matching_types = filter(predicate, self.flattened_member_types)
-+        matching_types = list(filter(predicate, self.flattened_member_types))
-         if len(matching_types) > 1:
-             raise ValueError('%s is ambiguous.' % self.name)
-         return matching_types[0] if matching_types else None
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py
-index e1677ee7bd6..3c5006f064f 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py
-@@ -196,8 +196,9 @@ class ComponentInfoProviderModules(ComponentInfoProvider):
- 
-     @property
-     def callback_functions(self):
--        return dict(self._component_info_core['callback_functions'].items() +
--                    self._component_info_modules['callback_functions'].items())
-+        return dict(
-+            list(self._component_info_core['callback_functions'].items()) +
-+            list(self._component_info_modules['callback_functions'].items()))
- 
-     @property
-     def specifier_for_export(self):
-@@ -209,8 +210,8 @@ class ComponentInfoProviderModules(ComponentInfoProvider):
- 
- 
- def load_interfaces_info_overall_pickle(info_dir):
--    with open(os.path.join(info_dir,
--                           'interfaces_info.pickle')) as interface_info_file:
-+    with open(os.path.join(info_dir, 'interfaces_info.pickle'),
-+              mode='rb') as interface_info_file:
-         return pickle.load(interface_info_file)
- 
- 
-@@ -236,23 +237,20 @@ def merge_dict_recursively(target, diff):
- 
- def create_component_info_provider_core(info_dir):
-     interfaces_info = load_interfaces_info_overall_pickle(info_dir)
--    with open(
--            os.path.join(info_dir, 'core',
--                         'component_info_core.pickle')) as component_info_file:
-+    with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'),
-+              mode='rb') as component_info_file:
-         component_info = pickle.load(component_info_file)
-     return ComponentInfoProviderCore(interfaces_info, component_info)
- 
- 
- def create_component_info_provider_modules(info_dir):
-     interfaces_info = load_interfaces_info_overall_pickle(info_dir)
--    with open(
--            os.path.join(info_dir, 'core',
--                         'component_info_core.pickle')) as component_info_file:
-+    with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'),
-+              mode='rb') as component_info_file:
-         component_info_core = pickle.load(component_info_file)
--    with open(
--            os.path.join(
--                info_dir, 'modules',
--                'component_info_modules.pickle')) as component_info_file:
-+    with open(os.path.join(info_dir, 'modules',
-+                           'component_info_modules.pickle'),
-+              mode='rb') as component_info_file:
-         component_info_modules = pickle.load(component_info_file)
-     return ComponentInfoProviderModules(interfaces_info, component_info_core,
-                                         component_info_modules)
-@@ -356,7 +354,7 @@ def write_pickle_file(pickle_filename, data):
-     pickle_filename = abs(pickle_filename)
-     # If |data| is same with the file content, we skip updating.
-     if os.path.isfile(pickle_filename):
--        with open(pickle_filename) as pickle_file:
-+        with open(pickle_filename, 'rb') as pickle_file:
-             try:
-                 if pickle.load(pickle_file) == data:
-                     return
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py
-index a43260414db..a85b03abe75 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py
-@@ -189,7 +189,7 @@ def context_enabled_features(attributes):
-         return sorted([
-             member for member in members
-             if member.get(KEY) and not member.get('exposed_test')
--        ])
-+        ], key=lambda item: item['name'])
- 
-     def member_filter_by_name(members, name):
-         return [member for member in members if member[KEY] == name]
-@@ -612,7 +612,8 @@ def interface_context(interface, interfaces, component_info):
-         sorted(
-             origin_trial_features(interface, context['constants'],
-                                   context['attributes'], context['methods']) +
--            context_enabled_features(context['attributes'])),
-+            context_enabled_features(context['attributes']),
-+            key=lambda item: item['name']),
-     })
-     if context['optional_features']:
-         includes.add('platform/bindings/v8_per_context_data.h')
-@@ -1356,9 +1357,9 @@ def resolution_tests_methods(effective_overloads):
- 
-     # Extract argument and IDL type to simplify accessing these in each loop.
-     arguments = [method['arguments'][index] for method in methods]
--    arguments_methods = zip(arguments, methods)
-+    arguments_methods = list(zip(arguments, methods))
-     idl_types = [argument['idl_type_object'] for argument in arguments]
--    idl_types_methods = zip(idl_types, methods)
-+    idl_types_methods = list(zip(idl_types, methods))
- 
-     # We can’t do a single loop through all methods or simply sort them, because
-     # a method may be listed in multiple steps of the resolution algorithm, and
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py
-index 5f1f89a3def..6ee8a407798 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py
-@@ -46,6 +46,10 @@ import v8_types
- import v8_utilities
- from v8_utilities import (has_extended_attribute_value, is_unforgeable)
- 
-+# TODO: Remove this once Python2 is obsoleted.
-+if sys.version_info.major != 2:
-+    basestring = str
-+
- 
- def method_is_visible(method, interface_is_partial):
-     if 'overloads' in method:
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py
-index 2ecd6923320..fcfc48371b1 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py
-@@ -271,7 +271,7 @@ EXPOSED_WORKERS = set([
- ])
- 
- 
--class ExposureSet:
-+class ExposureSet(object):
-     """An ExposureSet is a collection of Exposure instructions."""
- 
-     def __init__(self, exposures=None):
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py
-index 13fb7c7068d..b73b7710687 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py
-@@ -91,11 +91,13 @@ class CallbackInterface(UserDefinedType, WithExtendedAttributes,
-             for operation_ir in ir.operations
-         ])
-         self._operation_groups = tuple([
--            OperationGroup(
--                operation_group_ir,
--                filter(lambda x: x.identifier == operation_group_ir.identifier,
--                       self._operations),
--                owner=self) for operation_group_ir in ir.operation_groups
-+            OperationGroup(operation_group_ir,
-+                           list(
-+                               filter(
-+                                   lambda x: x.identifier == operation_group_ir
-+                                   .identifier, self._operations)),
-+                           owner=self)
-+            for operation_group_ir in ir.operation_groups
-         ])
- 
-     @property
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py
-index c92cf48eb2a..f5d59129449 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py
-@@ -156,4 +156,4 @@ class Database(object):
-         return self._view_by_kind(Database._Kind.UNION)
- 
-     def _view_by_kind(self, kind):
--        return self._impl.find_by_kind(kind).values()
-+        return list(self._impl.find_by_kind(kind).values())
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py
-index abaeef39c30..e36cf7439ae 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py
-@@ -8,8 +8,11 @@ from .runtime_enabled_features import RuntimeEnabledFeatures
- class _Feature(str):
-     """Represents a runtime-enabled feature."""
- 
-+    def __new__(cls, value):
-+        return str.__new__(cls, value)
-+
-     def __init__(self, value):
--        str.__init__(self, value)
-+        str.__init__(self)
-         self._is_context_dependent = (
-             RuntimeEnabledFeatures.is_context_dependent(self))
- 
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py
-index 648c70d803d..1712f19c672 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py
-@@ -71,8 +71,9 @@ class FunctionLike(WithIdentifier):
-     def num_of_required_arguments(self):
-         """Returns the number of required arguments."""
-         return len(
--            filter(lambda arg: not (arg.is_optional or arg.is_variadic),
--                   self.arguments))
-+            list(
-+                filter(lambda arg: not (arg.is_optional or arg.is_variadic),
-+                       self.arguments)))
- 
- 
- class OverloadGroup(WithIdentifier):
-@@ -171,8 +172,7 @@ class OverloadGroup(WithIdentifier):
-         Returns the effective overload set.
-         https://heycam.github.io/webidl/#compute-the-effective-overload-set
-         """
--        assert argument_count is None or isinstance(argument_count,
--                                                    (int, long))
-+        assert argument_count is None or isinstance(argument_count, int)
- 
-         N = argument_count
-         S = []
-@@ -188,21 +188,21 @@ class OverloadGroup(WithIdentifier):
- 
-             S.append(
-                 OverloadGroup.EffectiveOverloadItem(
--                    X, map(lambda arg: arg.idl_type, X.arguments),
--                    map(lambda arg: arg.optionality, X.arguments)))
-+                    X, list(map(lambda arg: arg.idl_type, X.arguments)),
-+                    list(map(lambda arg: arg.optionality, X.arguments))))
- 
-             if X.is_variadic:
--                for i in xrange(n, max(maxarg, N)):
--                    t = map(lambda arg: arg.idl_type, X.arguments)
--                    o = map(lambda arg: arg.optionality, X.arguments)
--                    for _ in xrange(n, i + 1):
-+                for i in range(n, max(maxarg, N)):
-+                    t = list(map(lambda arg: arg.idl_type, X.arguments))
-+                    o = list(map(lambda arg: arg.optionality, X.arguments))
-+                    for _ in range(n, i + 1):
-                         t.append(X.arguments[-1].idl_type)
-                         o.append(X.arguments[-1].optionality)
-                     S.append(OverloadGroup.EffectiveOverloadItem(X, t, o))
- 
--            t = map(lambda arg: arg.idl_type, X.arguments)
--            o = map(lambda arg: arg.optionality, X.arguments)
--            for i in xrange(n - 1, -1, -1):
-+            t = list(map(lambda arg: arg.idl_type, X.arguments))
-+            o = list(map(lambda arg: arg.optionality, X.arguments))
-+            for i in range(n - 1, -1, -1):
-                 if X.arguments[i].optionality == IdlType.Optionality.REQUIRED:
-                     break
-                 S.append(OverloadGroup.EffectiveOverloadItem(X, t[:i], o[:i]))
-@@ -222,7 +222,7 @@ class OverloadGroup(WithIdentifier):
-             for item in items)
-         assert len(items) > 1
- 
--        for index in xrange(len(items[0].type_list)):
-+        for index in range(len(items[0].type_list)):
-             # Assume that the given items are valid, and we only need to test
-             # the two types.
-             if OverloadGroup.are_distinguishable_types(
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py
-index c5ee2bd8a3d..58315072480 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py
-@@ -149,8 +149,8 @@ class IdlCompiler(object):
-         for old_ir in old_irs:
-             new_ir = make_copy(old_ir)
-             self._ir_map.add(new_ir)
--            new_ir.attributes = filter(not_disabled, new_ir.attributes)
--            new_ir.operations = filter(not_disabled, new_ir.operations)
-+            new_ir.attributes = list(filter(not_disabled, new_ir.attributes))
-+            new_ir.operations = list(filter(not_disabled, new_ir.operations))
- 
-     def _record_defined_in_partial_and_mixin(self):
-         old_irs = self._ir_map.irs_of_kinds(
-@@ -231,7 +231,7 @@ class IdlCompiler(object):
-                       only_to_members_of_partial_or_mixin=False)
-             propagate_to_exposure(propagate)
- 
--            map(process_member_like, ir.iter_all_members())
-+            list(map(process_member_like, ir.iter_all_members()))
- 
-         def process_member_like(ir):
-             propagate = functools.partial(propagate_extattr, ir=ir)
-@@ -257,7 +257,7 @@ class IdlCompiler(object):
- 
-         self._ir_map.move_to_new_phase()
- 
--        map(process_interface_like, old_irs)
-+        list(map(process_interface_like, old_irs))
- 
-     def _determine_blink_headers(self):
-         irs = self._ir_map.irs_of_kinds(
-@@ -422,9 +422,9 @@ class IdlCompiler(object):
-             assert not new_interface.deriveds
-             derived_set = identifier_to_derived_set.get(
-                 new_interface.identifier, set())
--            new_interface.deriveds = map(
--                lambda id_: self._ref_to_idl_def_factory.create(id_),
--                sorted(derived_set))
-+            new_interface.deriveds = list(
-+                map(lambda id_: self._ref_to_idl_def_factory.create(id_),
-+                    sorted(derived_set)))
- 
-     def _supplement_missing_html_constructor_operation(self):
-         # Temporary mitigation of misuse of [HTMLConstructor]
-@@ -553,7 +553,8 @@ class IdlCompiler(object):
-             self._ir_map.add(new_ir)
- 
-             for group in new_ir.iter_all_overload_groups():
--                exposures = map(lambda overload: overload.exposure, group)
-+                exposures = list(map(lambda overload: overload.exposure,
-+                                     group))
- 
-                 # [Exposed]
-                 if any(not exposure.global_names_and_features
-@@ -653,8 +654,8 @@ class IdlCompiler(object):
-             constructs = set()
-             for global_name in global_names:
-                 constructs.update(exposed_map.get(global_name, []))
--            new_ir.exposed_constructs = map(
--                self._ref_to_idl_def_factory.create, sorted(constructs))
-+            new_ir.exposed_constructs = list(
-+                map(self._ref_to_idl_def_factory.create, sorted(constructs)))
- 
-             assert not new_ir.legacy_window_aliases
-             if new_ir.identifier != 'Window':
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py
-index 65d24e529d1..067ef2eb0b2 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py
-@@ -180,8 +180,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo,
-         self._constructor_groups = tuple([
-             ConstructorGroup(
-                 group_ir,
--                filter(lambda x: x.identifier == group_ir.identifier,
--                       self._constructors),
-+                list(
-+                    filter(lambda x: x.identifier == group_ir.identifier,
-+                           self._constructors)),
-                 owner=self) for group_ir in ir.constructor_groups
-         ])
-         assert len(self._constructor_groups) <= 1
-@@ -192,8 +193,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo,
-         self._named_constructor_groups = tuple([
-             ConstructorGroup(
-                 group_ir,
--                filter(lambda x: x.identifier == group_ir.identifier,
--                       self._named_constructors),
-+                list(
-+                    filter(lambda x: x.identifier == group_ir.identifier,
-+                           self._named_constructors)),
-                 owner=self) for group_ir in ir.named_constructor_groups
-         ])
-         self._operations = tuple([
-@@ -203,22 +205,23 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo,
-         self._operation_groups = tuple([
-             OperationGroup(
-                 group_ir,
--                filter(lambda x: x.identifier == group_ir.identifier,
--                       self._operations),
-+                list(
-+                    filter(lambda x: x.identifier == group_ir.identifier,
-+                           self._operations)),
-                 owner=self) for group_ir in ir.operation_groups
-         ])
-         self._exposed_constructs = tuple(ir.exposed_constructs)
-         self._legacy_window_aliases = tuple(ir.legacy_window_aliases)
-         self._indexed_and_named_properties = None
--        indexed_and_named_property_operations = filter(
--            lambda x: x.is_indexed_or_named_property_operation,
--            self._operations)
-+        indexed_and_named_property_operations = list(
-+            filter(lambda x: x.is_indexed_or_named_property_operation,
-+                   self._operations))
-         if indexed_and_named_property_operations:
-             self._indexed_and_named_properties = IndexedAndNamedProperties(
-                 indexed_and_named_property_operations, owner=self)
-         self._stringifier = None
--        stringifier_operation_irs = filter(lambda x: x.is_stringifier,
--                                           ir.operations)
-+        stringifier_operation_irs = list(
-+            filter(lambda x: x.is_stringifier, ir.operations))
-         if stringifier_operation_irs:
-             assert len(stringifier_operation_irs) == 1
-             op_ir = make_copy(stringifier_operation_irs[0])
-@@ -231,8 +234,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo,
-             attribute = None
-             if operation.stringifier_attribute:
-                 attr_id = operation.stringifier_attribute
--                attributes = filter(lambda x: x.identifier == attr_id,
--                                    self._attributes)
-+                attributes = list(
-+                    filter(lambda x: x.identifier == attr_id,
-+                           self._attributes))
-                 assert len(attributes) == 1
-                 attribute = attributes[0]
-             self._stringifier = Stringifier(operation, attribute, owner=self)
-@@ -578,8 +582,9 @@ class Iterable(WithDebugInfo):
-         self._operation_groups = tuple([
-             OperationGroup(
-                 group_ir,
--                filter(lambda x: x.identifier == group_ir.identifier,
--                       self._operations),
-+                list(
-+                    filter(lambda x: x.identifier == group_ir.identifier,
-+                           self._operations)),
-                 owner=owner) for group_ir in ir.operation_groups
-         ])
- 
-@@ -666,8 +671,9 @@ class Maplike(WithDebugInfo):
-         self._operation_groups = tuple([
-             OperationGroup(
-                 group_ir,
--                filter(lambda x: x.identifier == group_ir.identifier,
--                       self._operations),
-+                list(
-+                    filter(lambda x: x.identifier == group_ir.identifier,
-+                           self._operations)),
-                 owner=owner) for group_ir in ir.operation_groups
-         ])
- 
-@@ -755,8 +761,9 @@ class Setlike(WithDebugInfo):
-         self._operation_groups = tuple([
-             OperationGroup(
-                 group_ir,
--                filter(lambda x: x.identifier == group_ir.identifier,
--                       self._operations),
-+                list(
-+                    filter(lambda x: x.identifier == group_ir.identifier,
-+                           self._operations)),
-                 owner=owner) for group_ir in ir.operation_groups
-         ])
- 
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py
-index e9aeff4ab82..d80554d603e 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py
-@@ -2,6 +2,8 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
- 
-+import sys
-+
- from .argument import Argument
- from .ast_group import AstGroup
- from .attribute import Attribute
-@@ -30,6 +32,11 @@ from .operation import Operation
- from .typedef import Typedef
- 
- 
-+# TODO: Remove this once Python2 is obsoleted.
-+if sys.version_info.major != 2:
-+    long = int
-+
-+
- def load_and_register_idl_definitions(filepaths, register_ir,
-                                       create_ref_to_idl_def, idl_type_factory):
-     """
-@@ -160,7 +167,7 @@ class _IRBuilder(object):
-         child_nodes = list(node.GetChildren())
-         extended_attributes = self._take_extended_attributes(child_nodes)
- 
--        members = map(self._build_interface_member, child_nodes)
-+        members = list(map(self._build_interface_member, child_nodes))
-         attributes = []
-         constants = []
-         operations = []
-@@ -302,7 +309,7 @@ class _IRBuilder(object):
-         child_nodes = list(node.GetChildren())
-         inherited = self._take_inheritance(child_nodes)
-         extended_attributes = self._take_extended_attributes(child_nodes)
--        own_members = map(self._build_dictionary_member, child_nodes)
-+        own_members = list(map(self._build_dictionary_member, child_nodes))
- 
-         return Dictionary.IR(
-             identifier=Identifier(node.GetName()),
-@@ -336,7 +343,7 @@ class _IRBuilder(object):
- 
-         child_nodes = list(node.GetChildren())
-         extended_attributes = self._take_extended_attributes(child_nodes)
--        members = map(self._build_interface_member, child_nodes)
-+        members = list(map(self._build_interface_member, child_nodes))
-         constants = []
-         operations = []
-         for member in members:
-@@ -456,8 +463,8 @@ class _IRBuilder(object):
-                 assert len(child_nodes) == 1
-                 child = child_nodes[0]
-                 if child.GetClass() == 'Arguments':
--                    arguments = map(build_extattr_argument,
--                                    child.GetChildren())
-+                    arguments = list(
-+                        map(build_extattr_argument, child.GetChildren()))
-                 elif child.GetClass() == 'Call':
-                     assert len(child.GetChildren()) == 1
-                     grand_child = child.GetChildren()[0]
-@@ -486,7 +493,9 @@ class _IRBuilder(object):
- 
-         assert node.GetClass() == 'ExtAttributes'
-         return ExtendedAttributes(
--            filter(None, map(build_extended_attribute, node.GetChildren())))
-+            list(
-+                filter(None, map(build_extended_attribute,
-+                                 node.GetChildren()))))
- 
-     def _build_inheritance(self, node):
-         assert node.GetClass() == 'Inherit'
-@@ -506,7 +515,7 @@ class _IRBuilder(object):
- 
-     def _build_iterable(self, node):
-         assert node.GetClass() == 'Iterable'
--        types = map(self._build_type, node.GetChildren())
-+        types = list(map(self._build_type, node.GetChildren()))
-         assert len(types) == 1 or len(types) == 2
-         if len(types) == 1:  # value iterator
-             key_type, value_type = (None, types[0])
-@@ -584,7 +593,7 @@ class _IRBuilder(object):
-     def _build_maplike(self, node, interface_identifier):
-         assert node.GetClass() == 'Maplike'
-         assert isinstance(interface_identifier, Identifier)
--        types = map(self._build_type, node.GetChildren())
-+        types = list(map(self._build_type, node.GetChildren()))
-         assert len(types) == 2
-         key_type, value_type = types
-         is_readonly = bool(node.GetProperty('READONLY'))
-@@ -676,7 +685,7 @@ class _IRBuilder(object):
-     def _build_setlike(self, node, interface_identifier):
-         assert node.GetClass() == 'Setlike'
-         assert isinstance(interface_identifier, Identifier)
--        types = map(self._build_type, node.GetChildren())
-+        types = list(map(self._build_type, node.GetChildren()))
-         assert len(types) == 1
-         value_type = types[0]
-         is_readonly = bool(node.GetProperty('READONLY'))
-@@ -838,7 +847,7 @@ class _IRBuilder(object):
- 
-         def build_union_type(node, extended_attributes):
-             return self._idl_type_factory.union_type(
--                member_types=map(self._build_type, node.GetChildren()),
-+                member_types=list(map(self._build_type, node.GetChildren())),
-                 is_optional=is_optional,
-                 extended_attributes=extended_attributes,
-                 debug_info=self._build_debug_info(node))
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py
-index a7a2b11f3f0..2f6b61300ff 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py
-@@ -3,6 +3,13 @@
- # found in the LICENSE file.
- 
- 
-+import sys
-+
-+# TODO: Remove this once Python2 is obsoleted.
-+if sys.version_info.major != 2:
-+    long = int
-+    basestring = str
-+
- def make_copy(obj, memo=None):
-     """
-     Creates a copy of the given object, which should be an IR or part of IR.
-diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py
-index eeabef97cbe..bd7e98907f3 100644
---- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py
-+++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py
-@@ -107,11 +107,13 @@ class Namespace(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo,
-             for operation_ir in ir.operations
-         ])
-         self._operation_groups = tuple([
--            OperationGroup(
--                operation_group_ir,
--                filter(lambda x: x.identifier == operation_group_ir.identifier,
--                       self._operations),
--                owner=self) for operation_group_ir in ir.operation_groups
-+            OperationGroup(operation_group_ir,
-+                           list(
-+                               filter(
-+                                   lambda x: x.identifier == operation_group_ir
-+                                   .identifier, self._operations)),
-+                           owner=self)
-+            for operation_group_ir in ir.operation_groups
-         ])
- 
-     @property
-diff --git a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl
-index 0add9c45a38..dc910f6d227 100644
---- a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl
-+++ b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl
-@@ -59,9 +59,9 @@ void {{v8_class}}::ToImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8_value, {
-   DCHECK(executionContext);
-   {% endif %}{# has_origin_trial_members #}
-   {% endif %}{# members #}
--  {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %}
-+  {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %}
-   {% filter origin_trial_enabled(origin_trial_test, "executionContext") %}
--  {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %}
-+  {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %}
-   {% filter runtime_enabled(feature_name) %}
-   {% for member in member_list %}
-   v8::Local<v8::Value> {{member.v8_value}};
-@@ -147,9 +147,9 @@ bool toV8{{cpp_class}}(const {{cpp_class}}* impl, v8::Local<v8::Object> dictiona
-   DCHECK(executionContext);
-   {% endif %}{# has_origin_trial_members #}
-   {% endif %}{# members #}
--  {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %}
-+  {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %}
-   {% filter origin_trial_enabled(origin_trial_test, "executionContext") %}
--  {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %}
-+  {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %}
-   {% filter runtime_enabled(feature_name) %}
-   {% for member in member_list %}
-   v8::Local<v8::Value> {{member.v8_value}};
-diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py
-index 1799cd5a153..5f43ffabc26 100755
---- a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py
-+++ b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py
-@@ -71,7 +71,7 @@ class Expansion(object):
-     def enabled_longhands(self):
-         include = lambda longhand: not longhand[
-             'runtime_flag'] or self.is_enabled(longhand['runtime_flag'])
--        return filter(include, self._longhands)
-+        return list(filter(include, self._longhands))
- 
-     @property
-     def index(self):
-@@ -87,8 +87,9 @@ class Expansion(object):
- 
- def create_expansions(longhands):
-     flags = collect_runtime_flags(longhands)
--    expansions = map(lambda mask: Expansion(longhands, flags, mask),
--                     range(1 << len(flags)))
-+    expansions = list(
-+        map(lambda mask: Expansion(longhands, flags, mask),
-+            range(1 << len(flags))))
-     assert len(expansions) > 0
-     # We generate 2^N expansions for N flags, so enforce some limit.
-     assert len(flags) <= 4, 'Too many runtime flags for a single shorthand'
-@@ -114,14 +115,14 @@ class StylePropertyShorthandWriter(json5_generator.Writer):
- 
-         self._longhand_dictionary = defaultdict(list)
-         for property_ in json5_properties.shorthands:
--            property_['longhand_enum_keys'] = map(enum_key_for_css_property,
--                                                  property_['longhands'])
--            property_['longhand_property_ids'] = map(id_for_css_property,
--                                                     property_['longhands'])
--
--            longhands = map(
--                lambda name: json5_properties.properties_by_name[name],
--                property_['longhands'])
-+            property_['longhand_enum_keys'] = list(
-+                map(enum_key_for_css_property, property_['longhands']))
-+            property_['longhand_property_ids'] = list(
-+                map(id_for_css_property, property_['longhands']))
-+
-+            longhands = list(
-+                map(lambda name: json5_properties.properties_by_name[name],
-+                    property_['longhands']))
-             property_['expansions'] = create_expansions(longhands)
-             for longhand_enum_key in property_['longhand_enum_keys']:
-                 self._longhand_dictionary[longhand_enum_key].append(property_)
-diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py
-index 75030ac577e..f72aadee17d 100755
---- a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py
-+++ b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py
-@@ -42,8 +42,8 @@ class CSSPropertyInstancesWriter(json5_generator.Writer):
-         aliases = self._css_properties.aliases
- 
-         # Lists of PropertyClassData.
--        self._property_classes_by_id = map(self.get_class, properties)
--        self._alias_classes_by_id = map(self.get_class, aliases)
-+        self._property_classes_by_id = list(map(self.get_class, properties))
-+        self._alias_classes_by_id = list(map(self.get_class, aliases))
- 
-         # Sort by enum value.
-         self._property_classes_by_id.sort(key=lambda t: t.enum_value)
-diff --git a/chromium/third_party/blink/renderer/build/scripts/gperf.py b/chromium/third_party/blink/renderer/build/scripts/gperf.py
-index 5ee49056be4..db72660d471 100644
---- a/chromium/third_party/blink/renderer/build/scripts/gperf.py
-+++ b/chromium/third_party/blink/renderer/build/scripts/gperf.py
-@@ -95,7 +95,7 @@ def main():
- 
-     open(args.output_file, 'wb').write(
-         generate_gperf(gperf_path,
--                       open(infile).read(), gperf_args))
-+                       open(infile).read(), gperf_args).encode('utf-8'))
- 
- 
- if __name__ == '__main__':
-diff --git a/chromium/third_party/blink/renderer/build/scripts/in_file.py b/chromium/third_party/blink/renderer/build/scripts/in_file.py
-index 28adc050f1e..58113483e57 100644
---- a/chromium/third_party/blink/renderer/build/scripts/in_file.py
-+++ b/chromium/third_party/blink/renderer/build/scripts/in_file.py
-@@ -66,7 +66,7 @@ class InFile(object):
-         self._defaults = defaults
-         self._valid_values = copy.deepcopy(
-             valid_values if valid_values else {})
--        self._parse(map(str.strip, lines))
-+        self._parse(list(map(str.strip, lines)))
- 
-     @classmethod
-     def load_from_files(self, file_paths, defaults, valid_values,
-diff --git a/chromium/third_party/blink/renderer/build/scripts/in_generator.py b/chromium/third_party/blink/renderer/build/scripts/in_generator.py
-index e46740a2e85..ab1981ad1e3 100644
---- a/chromium/third_party/blink/renderer/build/scripts/in_generator.py
-+++ b/chromium/third_party/blink/renderer/build/scripts/in_generator.py
-@@ -32,10 +32,15 @@ import os
- import os.path
- import shlex
- import shutil
-+import sys
- import optparse
- 
- from in_file import InFile
- 
-+# TODO: Remove this once Python2 is obsoleted.
-+if sys.version_info.major != 2:
-+    basestring = str
-+
- 
- #########################################################
- # This is now deprecated - use json5_generator.py instead
-diff --git a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py
-index cafe8d94a8e..6925a4fa580 100755
---- a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py
-+++ b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py
-@@ -138,7 +138,7 @@ class RuntimeFeatureWriter(BaseRuntimeFeatureWriter):
-                 except Exception:
-                     # If trouble unpickling, overwrite
-                     pass
--        with open(os.path.abspath(file_name), 'w') as pickle_file:
-+        with open(os.path.abspath(file_name), 'wb') as pickle_file:
-             pickle.dump(features_map, pickle_file)
- 
-     def _template_inputs(self):
-diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl
-index dc3f44c5b10..3eefcf9f0ee 100644
---- a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl
-+++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl
-@@ -26,7 +26,7 @@ using {{namespace}}FunctionMap = HashMap<AtomicString, {{namespace}}ConstructorF
- 
- static {{namespace}}FunctionMap* g_{{namespace|lower}}_constructors = nullptr;
- 
--{% for tag in tags|sort if not tag.noConstructor %}
-+{% for tag in tags|sort(attribute='name') if not tag.noConstructor %}
- static {{namespace}}Element* {{namespace}}{{tag.name.to_upper_camel_case()}}Constructor(
-     Document& document, const CreateElementFlags flags) {
-   {% if tag.runtimeEnabled %}
-@@ -52,7 +52,7 @@ static void Create{{namespace}}FunctionMap() {
-   // Empty array initializer lists are illegal [dcl.init.aggr] and will not
-   // compile in MSVC. If tags list is empty, add check to skip this.
-   static const Create{{namespace}}FunctionMapData data[] = {
--  {% for tag in tags|sort if not tag.noConstructor %}
-+  {% for tag in tags|sort(attribute='name') if not tag.noConstructor %}
-     { {{cpp_namespace}}::{{tag|symbol}}Tag, {{namespace}}{{tag.name.to_upper_camel_case()}}Constructor },
-   {% endfor %}
-   };
-diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.cc.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.cc.tmpl
-index 9bfc489e048..5f86184e879 100644
---- a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.cc.tmpl
-+++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.cc.tmpl
-@@ -22,7 +22,7 @@ HTMLTypeMap CreateHTMLTypeMap() {
-     const char* name;
-     HTMLElementType type;
-   } kTags[] = {
--    {% for tag in tags|sort %}
-+    {% for tag in tags|sort(attribute='name') %}
-     { "{{tag.name}}", HTMLElementType::k{{tag.js_interface}} },
-     {% endfor %}
-   };
-@@ -42,7 +42,7 @@ HTMLElementType htmlElementTypeForTag(const AtomicString& tagName, const Documen
-   if (it == html_type_map.end())
-     return HTMLElementType::kHTMLUnknownElement;
- 
--  {% for tag in tags|sort %}
-+  {% for tag in tags|sort(attribute='name') %}
-   {% if tag.runtimeEnabled %}
-   if (tagName == "{{tag.name}}") {
-     if (!RuntimeEnabledFeatures::{{tag.runtimeEnabled}}Enabled(document->GetExecutionContext())) {
-diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl
-index 1b5297d52dc..edecc81d9d4 100644
---- a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl
-+++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl
-@@ -15,7 +15,7 @@ namespace blink {
- class Document;
- 
- // Type checking.
--{% for tag in tags|sort if not tag.multipleTagNames and not tag.noTypeHelpers %}
-+{% for tag in tags|sort(attribute='name') if not tag.multipleTagNames and not tag.noTypeHelpers %}
- class {{tag.interface}};
- template <>
- inline bool IsElementOfType<const {{tag.interface}}>(const Node& node) {
-diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl
-index 0244433af2e..dcdbb02a56c 100644
---- a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl
-+++ b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl
-@@ -25,7 +25,7 @@
- 
- 
- {% macro trie_leaf(index, object, return_macro, lowercase_data) %}
--{% set name, value = object.items()[0] %}
-+{% set name, value = (object.items()|list)[0] %}
- {% if name|length %}
- if (
-     {%- for c in name -%}
-@@ -45,7 +45,7 @@ return {{ return_macro(value) }};
- 
- 
- {% macro trie_switch(trie, index, return_macro, lowercase_data) %}
--{% if trie|length == 1 and trie.values()[0] is string %}
-+{% if trie|length == 1 and (trie.values()|list)[0] is string %}
- {{ trie_leaf(index, trie, return_macro, lowercase_data) -}}
- {% else %}
-     {% if lowercase_data %}
-diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl
-index cb05c6c4315..bd5566b03e7 100644
---- a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl
-+++ b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl
-@@ -24,12 +24,12 @@ namespace {{cpp_namespace}} {
- {{symbol_export}}extern const WTF::AtomicString& {{namespace_prefix}}NamespaceURI;
- 
- // Tags
--{% for tag in tags|sort %}
-+{% for tag in tags|sort(attribute='name') %}
- {{symbol_export}}extern const blink::{{namespace}}QualifiedName& {{tag|symbol}}Tag;
- {% endfor %}
- 
- // Attributes
--{% for attr in attrs|sort %}
-+{% for attr in attrs|sort(attribute='name') %}
- {{symbol_export}}extern const blink::QualifiedName& {{attr|symbol}}Attr;
- {% endfor %}
- 
-diff --git a/chromium/third_party/dawn/generator/generator_lib.py b/chromium/third_party/dawn/generator/generator_lib.py
-index 5e3734d7833..e3d46bd194f 100644
---- a/chromium/third_party/dawn/generator/generator_lib.py
-+++ b/chromium/third_party/dawn/generator/generator_lib.py
-@@ -201,6 +201,10 @@ def _compute_python_dependencies(root_dir=None):
- 
-     paths = set()
-     for path in module_paths:
-+        # Builtin/namespaced modules may return None for the file path.
-+        if not path:
-+            continue
-+
-         path = os.path.abspath(path)
- 
-         if not path.startswith(root_dir):
-diff --git a/chromium/third_party/devtools-frontend/src/BUILD.gn b/chromium/third_party/devtools-frontend/src/BUILD.gn
-index cd488e88b60..ea1dc3d9a79 100644
---- a/chromium/third_party/devtools-frontend/src/BUILD.gn
-+++ b/chromium/third_party/devtools-frontend/src/BUILD.gn
-@@ -2,6 +2,8 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
- 
-+import("//build/config/python.gni")
-+
- import("//third_party/blink/public/public_features.gni")
- import("./all_devtools_files.gni")
- import("./all_devtools_modules.gni")
-diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py
-index d6666e8b74f..0f7a661e632 100644
---- a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py
-+++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py
-@@ -45,7 +45,8 @@ def rollup(input_path, output_path, filename, max_size, rollup_plugin):
-         ['--format', 'iife', '-n', 'InspectorOverlay'] + ['--input', target] +
-         ['--plugin', rollup_plugin],
-         stdout=subprocess.PIPE,
--        stderr=subprocess.PIPE)
-+        stderr=subprocess.PIPE,
-+        text=True)
-     out, error = rollup_process.communicate()
-     if not out:
-         raise Exception("rollup failed: " + error)
-diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py
-index fa8e73d34af..7d0b84b2171 100644
---- a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py
-+++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py
-@@ -10,7 +10,7 @@ Builds applications in release mode:
- and the application loader into a single script.
- """
- 
--from cStringIO import StringIO
-+from io import StringIO
- from os import path
- from os.path import join
- import copy
-@@ -145,8 +145,7 @@ class ReleaseBuilder(object):
-             resource_content = read_file(path.join(self.application_dir, resource_name))
-             if not (resource_name.endswith('.html')
-                     or resource_name.endswith('md')):
--                resource_content += resource_source_url(resource_name).encode(
--                    'utf-8')
-+                resource_content += resource_source_url(resource_name)
-             resource_content = resource_content.replace('\\', '\\\\')
-             resource_content = resource_content.replace('\n', '\\n')
-             resource_content = resource_content.replace('"', '\\"')
-@@ -173,7 +172,9 @@ class ReleaseBuilder(object):
-     def _concatenate_application_script(self, output):
-         output.write('Root.allDescriptors.push(...%s);' % self._release_module_descriptors())
-         if self.descriptors.extends:
--            output.write('Root.applicationDescriptor.modules.push(...%s);' % json.dumps(self.descriptors.application.values()))
-+            output.write(
-+                'Root.applicationDescriptor.modules.push(...%s);' %
-+                json.dumps(list(self.descriptors.application.values())))
-         else:
-             output.write('Root.applicationDescriptor = %s;' % self.descriptors.application_json())
- 
-diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py
-index be510c48d76..c6a59c90298 100644
---- a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py
-+++ b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py
-@@ -123,7 +123,7 @@ def main(argv):
- 
-     try:
-         os.makedirs(path.join(output_directory, 'Images'))
--    except OSError, e:
-+    except OSError as e:
-         if e.errno != errno.EEXIST:
-             raise e
- 
-@@ -147,7 +147,7 @@ def main(argv):
-             shutil.copy(path.join(dirname, filename), path.join(output_directory, 'Images'))
-             add_file_to_grd(doc, path.join('Images', filename))
- 
--    with open(parsed_args.output_filename, 'w') as output_file:
-+    with open(parsed_args.output_filename, 'wb') as output_file:
-         output_file.write(doc.toxml(encoding='UTF-8'))
- 
- 
-diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py
-index 0ba695d3810..bb1da2f9f8d 100644
---- a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py
-+++ b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py
-@@ -7,6 +7,8 @@
- Utilities for the modular DevTools build.
- """
- 
-+from __future__ import print_function
-+
- import collections
- from os import path
- import os
-@@ -40,7 +42,7 @@ def load_and_parse_json(filename):
-     try:
-         return json.loads(read_file(filename))
-     except:
--        print 'ERROR: Failed to parse %s' % filename
-+        print('ERROR: Failed to parse %s' % filename)
-         raise
- 
- class Descriptors:
-@@ -57,7 +59,7 @@ class Descriptors:
- 
-     def application_json(self):
-         result = dict()
--        result['modules'] = self.application.values()
-+        result['modules'] = list(self.application.values())
-         return json.dumps(result)
- 
-     def all_compiled_files(self):
-diff --git a/chromium/third_party/jinja2/tests.py b/chromium/third_party/jinja2/tests.py
-index 0adc3d4dbcb..b14f85ff148 100644
---- a/chromium/third_party/jinja2/tests.py
-+++ b/chromium/third_party/jinja2/tests.py
-@@ -10,7 +10,7 @@
- """
- import operator
- import re
--from collections import Mapping
-+from collections.abc import Mapping
- from jinja2.runtime import Undefined
- from jinja2._compat import text_type, string_types, integer_types
- import decimal
-diff --git a/chromium/tools/metrics/ukm/gen_builders.py b/chromium/tools/metrics/ukm/gen_builders.py
-index f9f61d90a56..44e46fae8cc 100755
---- a/chromium/tools/metrics/ukm/gen_builders.py
-+++ b/chromium/tools/metrics/ukm/gen_builders.py
-@@ -48,9 +48,10 @@ def ReadFilteredData(path):
-     data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read())
-     event_tag = ukm_model._EVENT_TYPE.tag
-     metric_tag = ukm_model._METRIC_TYPE.tag
--    data[event_tag] = filter(ukm_model.IsNotObsolete, data[event_tag])
-+    data[event_tag] = list(filter(ukm_model.IsNotObsolete, data[event_tag]))
-     for event in data[event_tag]:
--      event[metric_tag] = filter(ukm_model.IsNotObsolete, event[metric_tag])
-+      event[metric_tag] = list(
-+          filter(ukm_model.IsNotObsolete, event[metric_tag]))
-     return data
- 
- 
-diff --git a/chromium/ui/ozone/generate_constructor_list.py b/chromium/ui/ozone/generate_constructor_list.py
-index 8d800636c97..04fa18e93df 100755
---- a/chromium/ui/ozone/generate_constructor_list.py
-+++ b/chromium/ui/ozone/generate_constructor_list.py
-@@ -45,12 +45,15 @@ Example Output: ./ui/ozone/generate_constructor_list.py \
-   }  // namespace ui
- """
- 
-+try:
-+    from StringIO import StringIO  # for Python 2
-+except ImportError:
-+    from io import StringIO  # for Python 3
- import optparse
- import os
- import collections
- import re
- import sys
--import string
- 
- 
- def GetTypedefName(typename):
-@@ -68,7 +71,7 @@ def GetConstructorName(typename, platform):
-   This is just "Create" + typename + platform.
-   """
- 
--  return 'Create' + typename + string.capitalize(platform)
-+  return 'Create' + typename + platform.capitalize()
- 
- 
- def GenerateConstructorList(out, namespace, export, typenames, platforms,
-@@ -163,12 +166,14 @@ def main(argv):
-     sys.exit(1)
- 
-   # Write to standard output or file specified by --output_cc.
--  out_cc = sys.stdout
-+  out_cc = getattr(sys.stdout, 'buffer', sys.stdout)
-   if options.output_cc:
-     out_cc = open(options.output_cc, 'wb')
- 
--  GenerateConstructorList(out_cc, options.namespace, options.export,
-+  out_cc_str = StringIO()
-+  GenerateConstructorList(out_cc_str, options.namespace, options.export,
-                           typenames, platforms, includes, usings)
-+  out_cc.write(out_cc_str.getvalue().encode('utf-8'))
- 
-   if options.output_cc:
-     out_cc.close()
-diff --git a/chromium/ui/ozone/generate_ozone_platform_list.py b/chromium/ui/ozone/generate_ozone_platform_list.py
-index d47c398259b..2702b68b9bd 100755
---- a/chromium/ui/ozone/generate_ozone_platform_list.py
-+++ b/chromium/ui/ozone/generate_ozone_platform_list.py
-@@ -49,12 +49,15 @@ Example Output: ./generate_ozone_platform_list.py --default wayland dri wayland
- 
- """
- 
-+try:
-+    from StringIO import StringIO  # for Python 2
-+except ImportError:
-+    from io import StringIO  # for Python 3
- import optparse
- import os
- import collections
- import re
- import sys
--import string
- 
- 
- def GetConstantName(name):
-@@ -63,7 +66,7 @@ def GetConstantName(name):
-   We just capitalize the platform name and prepend "CreateOzonePlatform".
-   """
- 
--  return 'kPlatform' + string.capitalize(name)
-+  return 'kPlatform' + name.capitalize()
- 
- 
- def GeneratePlatformListText(out, platforms):
-@@ -149,9 +152,9 @@ def main(argv):
-     platforms.insert(0, options.default)
- 
-   # Write to standard output or file specified by --output_{cc,h}.
--  out_cc = sys.stdout
--  out_h = sys.stdout
--  out_txt = sys.stdout
-+  out_cc = getattr(sys.stdout, 'buffer', sys.stdout)
-+  out_h = getattr(sys.stdout, 'buffer', sys.stdout)
-+  out_txt = getattr(sys.stdout, 'buffer', sys.stdout)
-   if options.output_cc:
-     out_cc = open(options.output_cc, 'wb')
-   if options.output_h:
-@@ -159,9 +162,16 @@ def main(argv):
-   if options.output_txt:
-     out_txt = open(options.output_txt, 'wb')
- 
--  GeneratePlatformListText(out_txt, platforms)
--  GeneratePlatformListHeader(out_h, platforms)
--  GeneratePlatformListSource(out_cc, platforms)
-+  out_txt_str = StringIO()
-+  out_h_str = StringIO()
-+  out_cc_str = StringIO()
-+
-+  GeneratePlatformListText(out_txt_str, platforms)
-+  out_txt.write(out_txt_str.getvalue().encode('utf-8'))
-+  GeneratePlatformListHeader(out_h_str, platforms)
-+  out_h.write(out_h_str.getvalue().encode('utf-8'))
-+  GeneratePlatformListSource(out_cc_str, platforms)
-+  out_cc.write(out_cc_str.getvalue().encode('utf-8'))
- 
-   if options.output_cc:
-     out_cc.close()
--- 
-2.25.1
-
diff --git a/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch b/package/qt5/qt5webengine-chromium/0001-Don-t-rebase-sysroot-path.patch
similarity index 100%
rename from package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch
rename to package/qt5/qt5webengine-chromium/0001-Don-t-rebase-sysroot-path.patch
diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash
index 103e27d889..052f04ac57 100644
--- a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash
+++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  14c0654d046fd1faf0204b79e33c091012a8f4df972777e5691875aa75d29a65  qtwebengine-chromium-0ad2814370799a2161057d92231fe3ee00e2fe98.tar.bz2
+sha256  ccb2dbd1ab36ee0955ec9eddfa1c9eea2c9d48638c50783e62964d734f67fd6e  qtwebengine-chromium-fdfef5b37af3bed8402d7c7e20a5487f2602b0a6.tar.bz2
 
 # Locally calculated with:
 # for i in $(find * -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*') ; do echo -n "sha256  " ; sha256sum $i ; done | sort --key=3
diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk
index 2b061815b5..27af843983 100644
--- a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk
+++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WEBENGINE_CHROMIUM_VERSION = 0ad2814370799a2161057d92231fe3ee00e2fe98
+QT5WEBENGINE_CHROMIUM_VERSION = fdfef5b37af3bed8402d7c7e20a5487f2602b0a6
 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
diff --git a/package/qt5/qt5webengine/0002-Add-python3-build-support.patch b/package/qt5/qt5webengine/0001-Add-python3-build-support.patch
similarity index 100%
rename from package/qt5/qt5webengine/0002-Add-python3-build-support.patch
rename to package/qt5/qt5webengine/0001-Add-python3-build-support.patch
diff --git a/package/qt5/qt5webengine/0002-Pass-cppflags-and-ldflags-to-build.patch b/package/qt5/qt5webengine/0002-Pass-cppflags-and-ldflags-to-build.patch
new file mode 100644
index 0000000000..4fd2105c66
--- /dev/null
+++ b/package/qt5/qt5webengine/0002-Pass-cppflags-and-ldflags-to-build.patch
@@ -0,0 +1,55 @@
+From d4ad0fb124c017bdabe72d3a5671bd26c6216470 Mon Sep 17 00:00:00 2001
+From: Stefan Mayrhofer <stefan.mayrhofer@ginzinger.com>
+Date: Tue, 23 Aug 2022 13:48:26 +0200
+Subject: [PATCH 1/1] Pass cppflags and ldflags to build
+
+This patch forwards cppflags and ldflags to the build. This fixes the following compilation error:
+
+[18497/21900] CXX v8_snapshot/obj/v8/gen-regexp-special-case/gen-regexp-special-case.o
+FAILED: v8_snapshot/obj/v8/gen-regexp-special-case/gen-regexp-special-case.o
+/usr/bin/g++ -MMD -MF v8_snapshot/obj/v8/gen-regexp-special-case/gen-regexp-special-case.o.d -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DV8_TYPED_ARRAY_MAX_SIZE_IN_HEAP=64 -DENABLE_MINOR_MC -DV8_INTL_SUPPORT -DV8_CONCURRENT_MARKING -DV8_ENABLE_LAZY_SOURCE_POSITIONS -DV8_WIN64_UNWINDING_INFO -DV8_ENABLE_REGEXP_INTERPRETER_THREADED_DISPATCH -DV8_SNAPSHOT_COMPRESSION -DV8_COMPRESS_POINTERS -DV8_31BIT_SMIS_ON_64BIT_ARCH -DV8_DEPRECATION_WARNINGS -DV8_REVERSE_JSARGS -DV8_TARGET_ARCH_ARM64 -DV8_HAVE_TARGET_OS -DV8_TARGET_OS_LINUX -DDISABLE_UNTRUSTED_CODE_MITIGATIONS -DV8_COMPRESS_POINTERS -DV8_31BIT_SMIS_ON_64BIT_ARCH -DV8_DEPRECATION_WARNINGS -DV8_REVERSE_JSARGS -DUSING_SYSTEM_ICU=1 -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC -DUCHAR_TYPE=uint16_t -Iv8_snapshot/gen -I../../3rdparty/chromium -I../../3rdparty/chromium/v8 -I../../3rdparty/chromium/v8/include -Iv8_snapshot/gen/v8 -Iv8_snapshot/gen -Iv8_snapshot/gen -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -fno-omit-frame-pointer -g0 -fvisibility=hidden -Wno-strict-overflow -Wno-return-type -O3 -fno-ident -fdata-sections -ffunction-sections -I/usr/include -I/usr/include -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -c ../../3rdparty/chromium/v8/src/regexp/gen-regexp-special-case.cc -o v8_snapshot/obj/v8/gen-regexp-special-case/gen-regexp-special-case.o
+In file included from ../../3rdparty/chromium/v8/src/regexp/gen-regexp-special-case.cc:10:
+../../3rdparty/chromium/v8/src/regexp/special-case.h:12:10: fatal error: unicode/uchar.h: No such file or directory
+   12 | #include "unicode/uchar.h"
+      |          ^~~~~~~~~~~~~~~~~
+compilation terminated.
+
+For the v8 build, extra_cppflags was not passed through.
+v8 and host build both were also missing extra_ldflags. These are needed to find libraries in the buildroot directory.
+
+---
+ src/buildtools/configure_host.pro | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
+index dd0d3e3..ceabda7 100644
+--- a/src/buildtools/configure_host.pro
++++ b/src/buildtools/configure_host.pro
+@@ -24,6 +24,7 @@ contains(GN_TARGET_CPU, "arm")|contains(GN_TARGET_CPU, "mipsel")|contains(GN_TAR
+ }
+ 
+ GN_HOST_EXTRA_CPPFLAGS = $$(GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS)
++GN_HOST_EXTRA_LDFLAGS = $$(GN_HOST_TOOLCHAIN_EXTRA_LDFLAGS)
+ 
+ # We always use the gcc_toolchain, because clang_toolchain is just
+ # a broken wrapper around it for Google's custom clang binaries.
+@@ -37,6 +38,7 @@ GN_CONTENTS = \
+ "  ar = \"$$which(ar)\" " \
+ "  nm = \"$$which(nm)\" " \
+ "  extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \
++"  extra_ldflags = \"$$GN_HOST_EXTRA_LDFLAGS\" " \
+ "  toolchain_args = { " \
+ "    current_os = \"$$GN_OS\" " \
+ "    current_cpu = \"$$GN_HOST_CPU\" " \
+@@ -50,6 +52,8 @@ GN_CONTENTS = \
+ "  ld = \"$$which($$QMAKE_LINK)\" " \
+ "  ar = \"$$which(ar)\" " \
+ "  nm = \"$$which(nm)\" " \
++"  extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \
++"  extra_ldflags = \"$$GN_HOST_EXTRA_LDFLAGS\" " \
+ "  toolchain_args = { " \
+ "    current_os = \"$$GN_OS\" " \
+ "    current_cpu = \"$$GN_V8_HOST_CPU\" " \
+-- 
+2.30.2
+
diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash
index e0447c70b1..fcd6d4d3d6 100644
--- a/package/qt5/qt5webengine/qt5webengine.hash
+++ b/package/qt5/qt5webengine/qt5webengine.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  e7c9534453472311c06605f2892e038e9920bf10ca3a0dad99b46955ea124618  qtwebengine-v5.15.11-lts.tar.bz2
+sha256  f760fbc14fec8fed3485cb757986e459f7b150cfc8484aced1116158f6b8a656  qtwebengine-v5.15.14-lts.tar.bz2
 
 # Locally calculated
 sha256  f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9  LICENSE.Chromium
diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash
index fa3cc48995..c7fe153f7c 100644
--- a/package/qt5/qt5websockets/qt5websockets.hash
+++ b/package/qt5/qt5websockets/qt5websockets.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  2e024a4c0706d58a9c846cc1d036f383906e392f3cd7c3051fc56915b7530eee  qtwebsockets-50f3853a83ffc80a978cfa0882bdc2859e8de71e.tar.bz2
+sha256  00c915dc0f909d91c13aae4fb39e83e7c4bb5b8c6ad98de9f4e1e44f699cc605  qtwebsockets-dbbdc64b804f7c4d0ed92198aaab49b07fa15e7f.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index bb96fefe82..565894e0ba 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WEBSOCKETS_VERSION = 50f3853a83ffc80a978cfa0882bdc2859e8de71e
+QT5WEBSOCKETS_VERSION = dbbdc64b804f7c4d0ed92198aaab49b07fa15e7f
 QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION)
 QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2
 QT5WEBSOCKETS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash
index 00525dbad2..55aedd54e6 100644
--- a/package/qt5/qt5webview/qt5webview.hash
+++ b/package/qt5/qt5webview/qt5webview.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  2427179da946d6df409e334c94ffe3f8589035a5d566caf52db2333cc9bfe47c  qtwebview-f078642eb9a440f6aa88f2beaf10f445de1e29bb.tar.bz2
+sha256  7b5bf69f3037f55a8ff7b9e153bfa5a42dcdecb322ce2749ace8f11562a0780d  qtwebview-bbb1891595aba23ff3c6d137aa74442f9e54479b.tar.bz2
 
 # Hashes for license files:
 sha256  ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d  LICENSE.FDL
diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk
index 01a377c27b..310bfbba42 100644
--- a/package/qt5/qt5webview/qt5webview.mk
+++ b/package/qt5/qt5webview/qt5webview.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WEBVIEW_VERSION = f078642eb9a440f6aa88f2beaf10f445de1e29bb
+QT5WEBVIEW_VERSION = bbb1891595aba23ff3c6d137aa74442f9e54479b
 QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION)
 QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2
 QT5WEBVIEW_DEPENDENCIES = qt5webengine
diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash
index 132c28dd96..a84df3f2e2 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.hash
+++ b/package/qt5/qt5x11extras/qt5x11extras.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  7d99fa4d900207c0ae1c7a514e7dc0b607c04e0232d2842a8d84f52534bd16e6  qtx11extras-5fb2e067a38d3583684310130f5d8aad064f512f.tar.bz2
+sha256  85943a927c6e07a2a7b2cdf2b6006b554cd9b52271d8892f6475fe9db67d16f3  qtx11extras-6c3605fcb3b34e55951f597e06c135d97dfa6cd7.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index a6fade0135..922730c4d7 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5X11EXTRAS_VERSION = 5fb2e067a38d3583684310130f5d8aad064f512f
+QT5X11EXTRAS_VERSION = 6c3605fcb3b34e55951f597e06c135d97dfa6cd7
 QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION)
 QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2
 QT5X11EXTRAS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
index 9be7bb7831..9531c02e53 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  7770b333f2c0079cf65aa19dafd9e7d80fe058baf8e924f1c0d6e75c0b6e7374  qtxmlpatterns-5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2.tar.bz2
+sha256  2dcac1941b2510ea6fd85fe700fead9443f737e93cc12bf9b90dc6b71ff8d844  qtxmlpatterns-087f6f35bd027f940818b1696d0aad822e034377.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 2126d3c915..d346d92f7b 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5XMLPATTERNS_VERSION = 5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2
+QT5XMLPATTERNS_VERSION = 087f6f35bd027f940818b1696d0aad822e034377
 QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION)
 QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2
 QT5XMLPATTERNS_INSTALL_STAGING = YES
-- 
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] package/qt5: bump packages to latest kde submodule versions
@ 2023-10-12 13:26 Sebastian Weyer
  2024-02-09  7:53 ` Arnout Vandecappelle via buildroot
  0 siblings, 1 reply; 10+ messages in thread
From: Sebastian Weyer @ 2023-10-12 13:26 UTC (permalink / raw)
  To: buildroot
  Cc: Sebastian Weyer, Joshua Henderson, Bartosz Bilas, Peter Seiderer,
	Julien Corjon, Giulio Benetti

Bump qt5 packages to latest submodule versions from:
https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15

Signed-off-by: Sebastian Weyer <sebastian.weyer@smile.fr>
---
The package qt53d was not updated with the rest as it fails with

qgltf.cpp:29:10: fatal error: assimp/Importer.hpp: No such file or directory
   29 | #include <assimp/Importer.hpp>

although assimp is installed and the header file is present in
host/aarch64-buildroot-linux-gnu/sysroot/usr/include/assimp/Importer.hpp

This package was also not updated in the last version bump to 5.15.10 in
6b23dff9e71786191797d3b41ce80afe659f0396. Starting from 5.15.9 it fails
with this error. I couldn't find out why this package wasn't updated to
5.15.10 to begin with but it seems like it could be this error? So I thought
it might be okay to leave it at 5.15.8 for now. What do you think?

Signed-off-by: Sebastian Weyer <sebastian.weyer@smile.fr>
---
 package/qt5/qt5.mk                                       | 2 +-
 package/qt5/qt5base/qt5base.hash                         | 2 +-
 package/qt5/qt5base/qt5base.mk                           | 2 +-
 package/qt5/qt5charts/qt5charts.hash                     | 2 +-
 package/qt5/qt5charts/qt5charts.mk                       | 2 +-
 package/qt5/qt5connectivity/qt5connectivity.hash         | 2 +-
 package/qt5/qt5connectivity/qt5connectivity.mk           | 2 +-
 package/qt5/qt5declarative/qt5declarative.hash           | 2 +-
 package/qt5/qt5declarative/qt5declarative.mk             | 2 +-
 package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash | 2 +-
 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk   | 2 +-
 package/qt5/qt5imageformats/qt5imageformats.hash         | 2 +-
 package/qt5/qt5imageformats/qt5imageformats.mk           | 2 +-
 package/qt5/qt5location/qt5location.hash                 | 2 +-
 package/qt5/qt5location/qt5location.mk                   | 2 +-
 package/qt5/qt5lottie/qt5lottie.hash                     | 2 +-
 package/qt5/qt5lottie/qt5lottie.mk                       | 2 +-
 package/qt5/qt5multimedia/qt5multimedia.hash             | 2 +-
 package/qt5/qt5multimedia/qt5multimedia.mk               | 2 +-
 package/qt5/qt5quickcontrols/qt5quickcontrols.hash       | 2 +-
 package/qt5/qt5quickcontrols/qt5quickcontrols.mk         | 2 +-
 package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash     | 2 +-
 package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk       | 2 +-
 package/qt5/qt5quicktimeline/qt5quicktimeline.hash       | 2 +-
 package/qt5/qt5quicktimeline/qt5quicktimeline.mk         | 2 +-
 package/qt5/qt5remoteobjects/qt5remoteobjects.hash       | 2 +-
 package/qt5/qt5remoteobjects/qt5remoteobjects.mk         | 2 +-
 package/qt5/qt5scxml/qt5scxml.hash                       | 2 +-
 package/qt5/qt5scxml/qt5scxml.mk                         | 2 +-
 package/qt5/qt5sensors/qt5sensors.hash                   | 2 +-
 package/qt5/qt5sensors/qt5sensors.mk                     | 2 +-
 package/qt5/qt5serialbus/qt5serialbus.hash               | 2 +-
 package/qt5/qt5serialbus/qt5serialbus.mk                 | 2 +-
 package/qt5/qt5serialport/qt5serialport.hash             | 2 +-
 package/qt5/qt5serialport/qt5serialport.mk               | 2 +-
 package/qt5/qt5speech/qt5speech.hash                     | 2 +-
 package/qt5/qt5speech/qt5speech.mk                       | 2 +-
 package/qt5/qt5svg/qt5svg.hash                           | 2 +-
 package/qt5/qt5svg/qt5svg.mk                             | 2 +-
 package/qt5/qt5tools/qt5tools.hash                       | 2 +-
 package/qt5/qt5tools/qt5tools.mk                         | 2 +-
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash   | 2 +-
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk     | 2 +-
 package/qt5/qt5wayland/qt5wayland.hash                   | 2 +-
 package/qt5/qt5wayland/qt5wayland.mk                     | 2 +-
 package/qt5/qt5webchannel/qt5webchannel.hash             | 2 +-
 package/qt5/qt5webchannel/qt5webchannel.mk               | 2 +-
 package/qt5/qt5webengine/qt5webengine.hash               | 2 +-
 package/qt5/qt5websockets/qt5websockets.hash             | 2 +-
 package/qt5/qt5websockets/qt5websockets.mk               | 2 +-
 package/qt5/qt5webview/qt5webview.hash                   | 2 +-
 package/qt5/qt5webview/qt5webview.mk                     | 2 +-
 package/qt5/qt5x11extras/qt5x11extras.hash               | 2 +-
 package/qt5/qt5x11extras/qt5x11extras.mk                 | 2 +-
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash           | 2 +-
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk             | 2 +-
 56 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index b55accacf1..a43b36dd51 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 QT5_VERSION_MAJOR = 5.15
-QT5_VERSION = $(QT5_VERSION_MAJOR).10
+QT5_VERSION = $(QT5_VERSION_MAJOR).11
 QT5_SITE = https://invent.kde.org/qt/qt
 
 include $(sort $(wildcard package/qt5/*/*.mk))
diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash
index 4efc8fa172..ffc474f49e 100644
--- a/package/qt5/qt5base/qt5base.hash
+++ b/package/qt5/qt5base/qt5base.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  5622a9053154af9a353b8e8be217104c6af068b5b5aba8b07ef4fea2dc79fded  qtbase-e44097b63d17ba3178a637df7fac51ddc51cb48b.tar.bz2
+sha256  935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d  qtbase-da6e958319e95fe564d3b30c931492dd666bfaff.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index cc29f5523f..7ee6124d4b 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5BASE_VERSION = e44097b63d17ba3178a637df7fac51ddc51cb48b
+QT5BASE_VERSION = da6e958319e95fe564d3b30c931492dd666bfaff
 QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION)
 QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2
 
diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash
index 0688f64615..fec54c86b1 100644
--- a/package/qt5/qt5charts/qt5charts.hash
+++ b/package/qt5/qt5charts/qt5charts.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  9d2ad94a054bd7df08e5d11bc77b6422ccecbf99ea8dd6f06908bafc72ea869d  qtcharts-841083c263f16f8acb81e4915bf24bbed0461c9a.tar.bz2
+sha256  66dae46a8bcb1dfc10dd3404296701c41e50658792e4a6a7317a182fad6f36c8  qtcharts-e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk
index fa69263be4..bfc6021289 100644
--- a/package/qt5/qt5charts/qt5charts.mk
+++ b/package/qt5/qt5charts/qt5charts.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5CHARTS_VERSION = 841083c263f16f8acb81e4915bf24bbed0461c9a
+QT5CHARTS_VERSION = e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826
 QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION)
 QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2
 QT5CHARTS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash
index 1252a73247..776448502b 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.hash
+++ b/package/qt5/qt5connectivity/qt5connectivity.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  ec1d91fc35d8b4a333209fb5fd85e00ab77345bff48b60b4e43b804a59f60979  qtconnectivity-c5f35f89e975c2ad58c83c6b606d40ba41057f15.tar.bz2
+sha256  7a44848e113e1d7232c077f9fa8021ab038f59765123920e11936e7d4b8e3c66  qtconnectivity-f0c98c39447894bba493aa91c65053d7f18d68cb.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index 72797de1a0..dc5e647e0b 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5CONNECTIVITY_VERSION = c5f35f89e975c2ad58c83c6b606d40ba41057f15
+QT5CONNECTIVITY_VERSION = f0c98c39447894bba493aa91c65053d7f18d68cb
 QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION)
 QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2
 QT5CONNECTIVITY_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash
index 0e7978dc58..3db5c94458 100644
--- a/package/qt5/qt5declarative/qt5declarative.hash
+++ b/package/qt5/qt5declarative/qt5declarative.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  dbe0cdf84767564a56abf9d0d867c9cfcc754827169357a0f8162309c11882b5  qtdeclarative-b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a.tar.bz2
+sha256  bebd1205aa087f529b8824f0284e127e08672ff7ce36a6b865cd921514ec1192  qtdeclarative-960a980dc885622cb84990c4da75d5060318302d.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 18c1608fca..99c88e7d06 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5DECLARATIVE_VERSION = b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a
+QT5DECLARATIVE_VERSION = 960a980dc885622cb84990c4da75d5060318302d
 QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION)
 QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2
 QT5DECLARATIVE_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
index 95567b2476..e5fdaf67bf 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  de41af344889d35252fec9a6b6c78e1f67b7a7be15a5d3986b2ec20e2fcafadc  qtgraphicaleffects-e6e1e58ec28fd0f2e6426e6962cc4ccddb493349.tar.bz2
+sha256  18afbc24b40420ce0fe6bfad8331f43a1d8c8ec22501b7987ecec9334b69e9a2  qtgraphicaleffects-cce7d784237cd2dd4af1abe2757d048e34e02685.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index f829c67122..ddf805303b 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5GRAPHICALEFFECTS_VERSION = e6e1e58ec28fd0f2e6426e6962cc4ccddb493349
+QT5GRAPHICALEFFECTS_VERSION = cce7d784237cd2dd4af1abe2757d048e34e02685
 QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION)
 QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2
 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash
index 9d821672b3..779db8d109 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.hash
+++ b/package/qt5/qt5imageformats/qt5imageformats.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  8bf646d4db7d0099dd49b7c049a64fb585a3e180d73fc2b6edf22a1384529d1d  qtimageformats-9044695f4b1acdd7ec24e7b01f6a6ca61f982a75.tar.bz2
+sha256  bac150b9c5eaf0132a39a0b2a75cfca5400c11f4b8bf60f7362a6e0307f5c19e  qtimageformats-6a1af670d52492ab0955933b830026b2a18ed6d6.tar.bz2
 
 # Hashes for license files:
 sha256  edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253  LICENSE.GPLv2
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index 0ce6e4ffb4..27ef05777d 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5IMAGEFORMATS_VERSION = 9044695f4b1acdd7ec24e7b01f6a6ca61f982a75
+QT5IMAGEFORMATS_VERSION = 6a1af670d52492ab0955933b830026b2a18ed6d6
 QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION)
 QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2
 QT5IMAGEFORMATS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash
index f73053f388..0188f51c83 100644
--- a/package/qt5/qt5location/qt5location.hash
+++ b/package/qt5/qt5location/qt5location.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  90b57a335d8c7311a86865a56b2b9cd944a8a1cafa6a7499de5b35a105c5b247  qt5location-ebdf5b38da6e3fe0a183702bcca395c589c459ed-br1.tar.gz
+sha256  133d28fc0071e419682b7ed736c17b39240545c8e9d6ff7e9905f365bb1eb693  qt5location-0ec8f5e82da7369a92824167c4d7331f6c502325-br1.tar.gz
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
index 904d31a983..88bf3d289c 100644
--- a/package/qt5/qt5location/qt5location.mk
+++ b/package/qt5/qt5location/qt5location.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5LOCATION_VERSION = ebdf5b38da6e3fe0a183702bcca395c589c459ed
+QT5LOCATION_VERSION = 0ec8f5e82da7369a92824167c4d7331f6c502325
 QT5LOCATION_SITE = $(QT5_SITE)/qtlocation
 QT5LOCATION_SITE_METHOD = git
 QT5LOCATION_GIT_SUBMODULES = YES
diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash
index cbd94fd111..642625753c 100644
--- a/package/qt5/qt5lottie/qt5lottie.hash
+++ b/package/qt5/qt5lottie/qt5lottie.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  82336dd063f8bedc28e9545cc8c0123053434d6c681e470434c80ad3908ca4b0  qtlottie-d40b67401afe7156b03c62c9a4d517b07555fe64.tar.bz2
+sha256  4d8a063687c25675b012821e252a1afd455bdb4ea43e6d79787f9991c68cb5c5  qtlottie-909b79f4810b8ac62baa3544837793cfb132593b.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk
index 42a920582a..d4ad3afc63 100644
--- a/package/qt5/qt5lottie/qt5lottie.mk
+++ b/package/qt5/qt5lottie/qt5lottie.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5LOTTIE_VERSION = d40b67401afe7156b03c62c9a4d517b07555fe64
+QT5LOTTIE_VERSION = 909b79f4810b8ac62baa3544837793cfb132593b
 QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION)
 QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2
 QT5LOTTIE_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash
index 4803ef9230..7925c4fe05 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.hash
+++ b/package/qt5/qt5multimedia/qt5multimedia.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  842c5be64dafe7a68d2b120e24faffd14af6e4d9d8e9c0aa8bbf4330b3491aa3  qtmultimedia-76f84c545429a1b988b79f971734ef4bc3e6643f.tar.bz2
+sha256  3f78ede5dcc231d0e92e9907d11fa1d7a7cf506eb73d3f035e8461b57dc692b4  qtmultimedia-b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 0d0f5dd53d..7a56d238f2 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5MULTIMEDIA_VERSION = 76f84c545429a1b988b79f971734ef4bc3e6643f
+QT5MULTIMEDIA_VERSION = b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4
 QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION)
 QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2
 QT5MULTIMEDIA_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
index 05a021e8b2..219dc8d588 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  e2c7bc6346a8eb4c21510f8fbf7e752648f68a0c5af8525a784e64503570f72c  qtquickcontrols-e62b8b6d2f45a79652238b33f4bbe23023004ae7.tar.bz2
+sha256  8c02691d3eb45b9f144bef64c9705e26e8a4c725a0731b18450d39a589965c49  qtquickcontrols-dcc90558d9c0cba41eec7df290943994289b0e87.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index 25c1a74f5c..86792ddd8e 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5QUICKCONTROLS_VERSION = e62b8b6d2f45a79652238b33f4bbe23023004ae7
+QT5QUICKCONTROLS_VERSION = dcc90558d9c0cba41eec7df290943994289b0e87
 QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION)
 QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2
 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
index 88777a5cc3..91fb31a7b7 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  53caea73e6bdf234cb445067be3bc4e07ed59af7da967638ac598188b719958e  qtquickcontrols2-74e8db97fdb9b55c4b4614b83f4bf17e00df55e9.tar.bz2
+sha256  481220682ce3127711465d6ade22c9ce0e4a4130dd9735344f7464f9147d8f0d  qtquickcontrols2-1ce461bd1dc713cd2f79fc16c5454d587b45eefa.tar.bz2
 
 # Hashes for license files:
 sha256  d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca  LICENSE.GPLv3
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
index 1732921203..a2503eb9a3 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5QUICKCONTROLS2_VERSION = 74e8db97fdb9b55c4b4614b83f4bf17e00df55e9
+QT5QUICKCONTROLS2_VERSION = 1ce461bd1dc713cd2f79fc16c5454d587b45eefa
 QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION)
 QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2
 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash
index a8acf3c5a2..1c9f436b1b 100644
--- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash
+++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  d22637609c4afcc7560d92c894eb55d4afa01706bb5c86499bf56f7c8723a605  qtquicktimeline-87ad61716a7cba5a070d8a7b1756c8b2b48d5d53.tar.bz2
+sha256  ee404943ef00dbac33928cf001b613ca517fdfdf2767b932a8def5f8c2b0797f  qtquicktimeline-b1b4b882dabaa036c3fb73c4a879ba8efbb02ded.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk
index de94bd0375..3a8542ab1b 100644
--- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk
+++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5QUICKTIMELINE_VERSION = 87ad61716a7cba5a070d8a7b1756c8b2b48d5d53
+QT5QUICKTIMELINE_VERSION = b1b4b882dabaa036c3fb73c4a879ba8efbb02ded
 QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION)
 QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2
 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash
index 1b41ab675f..a931ce09cb 100644
--- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash
+++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  ef8e1f64911f7e03da6306693031fdf953af00d453ec154497178bb7ceab1aa2  qtremoteobjects-aa705010da0f658b78c1155babce7091ae44529a.tar.bz2
+sha256  677b8ccb5c07673296c4fa01bcbc6bd9b8e3a534d332624f61fe0360a5649703  qtremoteobjects-bdc316aca82769b43cb7821c10d80a1ca02b846e.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk
index 3160d37ad7..5fea3487a5 100644
--- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk
+++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5REMOTEOBJECTS_VERSION = aa705010da0f658b78c1155babce7091ae44529a
+QT5REMOTEOBJECTS_VERSION = bdc316aca82769b43cb7821c10d80a1ca02b846e
 QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION)
 QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2
 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base
diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash
index f4d52b8a52..0f13743f45 100644
--- a/package/qt5/qt5scxml/qt5scxml.hash
+++ b/package/qt5/qt5scxml/qt5scxml.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  a0113f54d9df14ebae15dd85530f87f093a284372ee8237d1ccceb02e6a4607b  qtscxml-631fd7bcc34802b7650c2b1dc73691463954d982.tar.bz2
+sha256  d598238bfa3bbbe283a8bd2907a4e8e813e00c522f08297a856e6595bbd44099  qtscxml-e8727aabe55526956295407d27317ec15e12b283.tar.bz2
 
 # Hashes for license files:
 sha256  0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652  LICENSE.GPL3-EXCEPT
diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk
index f6ccb9298e..32ef425e97 100644
--- a/package/qt5/qt5scxml/qt5scxml.mk
+++ b/package/qt5/qt5scxml/qt5scxml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SCXML_VERSION = 631fd7bcc34802b7650c2b1dc73691463954d982
+QT5SCXML_VERSION = e8727aabe55526956295407d27317ec15e12b283
 QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION)
 QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2
 QT5SCXML_DEPENDENCIES = qt5declarative
diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash
index d43fa8ba65..37a23516df 100644
--- a/package/qt5/qt5sensors/qt5sensors.hash
+++ b/package/qt5/qt5sensors/qt5sensors.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  8325826a259189fc7dea66651df4022a92a73664e953f86bce5bf5946ebacdf5  qtsensors-35eb5ac7eaef4745a38958c3ca780d7baa2e4f30.tar.bz2
+sha256  f44148d1a21f3959d79f973d8aa233ddfacf37af6e27902fca8c885b91933fcc  qtsensors-a41492b23cde20d1e00427d31e4637d06aea3638.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
index 40bb72e038..29e257fdda 100644
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SENSORS_VERSION = 35eb5ac7eaef4745a38958c3ca780d7baa2e4f30
+QT5SENSORS_VERSION = a41492b23cde20d1e00427d31e4637d06aea3638
 QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION)
 QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2
 QT5SENSORS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash
index 01ffd7c215..1d1861a4a3 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.hash
+++ b/package/qt5/qt5serialbus/qt5serialbus.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  fe08415d2348797429dc09722478630ceee3d7477652a2712460e79127b7291b  qtserialbus-f9f7eee60adac72fcf6617d164e3bf61222bb5c5.tar.bz2
+sha256  952b145ae64e03208d7c2a0b0b2b94b928e8998eb72c6762b54e4d9760737dde  qtserialbus-c41785c9f36560722b917d373ee97eed8cc4089a.tar.bz2
 
 # Hashes for license files:
 sha256  edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253  LICENSE.GPLv2
diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
index c718414932..3315ef5be7 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.mk
+++ b/package/qt5/qt5serialbus/qt5serialbus.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SERIALBUS_VERSION = f9f7eee60adac72fcf6617d164e3bf61222bb5c5
+QT5SERIALBUS_VERSION = c41785c9f36560722b917d373ee97eed8cc4089a
 QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION)
 QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2
 QT5SERIALBUS_DEPENDENCIES = qt5serialport
diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash
index 58461430c7..e95392b880 100644
--- a/package/qt5/qt5serialport/qt5serialport.hash
+++ b/package/qt5/qt5serialport/qt5serialport.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  6d49d0da174632f51291b0190f6f1db2397a3b339cf293514252766f8a20c63b  qtserialport-c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694.tar.bz2
+sha256  2b7584de148f0b6ea2cf162609d44d7ad3bb893b1995427ceed72cb4562db6d7  qtserialport-3380465d5d4977326616c5e57789a81681be650e.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
index 7d00bd2ab7..462d1dd7b9 100644
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SERIALPORT_VERSION = c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694
+QT5SERIALPORT_VERSION = 3380465d5d4977326616c5e57789a81681be650e
 QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION)
 QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2
 QT5SERIALPORT_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5speech/qt5speech.hash b/package/qt5/qt5speech/qt5speech.hash
index 595aac9f22..3be66a77fe 100644
--- a/package/qt5/qt5speech/qt5speech.hash
+++ b/package/qt5/qt5speech/qt5speech.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  6d0794ab9d5286d04fbac2db44c00ed3306e569c876f84cfd91ac0e79c834b1e  qtspeech-d32f4a479d38a11f547598004b975f4356424a16.tar.bz2
+sha256  4be0161595806cfc5c9c3160a83d0379269a2813dd4b3ffe2e2a1328f23d8fbc  qtspeech-214dcefc7c408e11a3e9fe9d221e4a384e2eaca1.tar.bz2
 
 # Hashes for license files:
 sha256  6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde  LICENSE.GPLv2
diff --git a/package/qt5/qt5speech/qt5speech.mk b/package/qt5/qt5speech/qt5speech.mk
index 8cf6fe19c1..c8054431df 100644
--- a/package/qt5/qt5speech/qt5speech.mk
+++ b/package/qt5/qt5speech/qt5speech.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SPEECH_VERSION = d32f4a479d38a11f547598004b975f4356424a16
+QT5SPEECH_VERSION = 214dcefc7c408e11a3e9fe9d221e4a384e2eaca1
 QT5SPEECH_SITE = $(QT5_SITE)/qtspeech/-/archive/$(QT5SPEECH_VERSION)
 QT5SPEECH_SOURCE = qtspeech-$(QT5SPEECH_VERSION).tar.bz2
 QT5SPEECH_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash
index 4816206d64..f3e47da5de 100644
--- a/package/qt5/qt5svg/qt5svg.hash
+++ b/package/qt5/qt5svg/qt5svg.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  063ee53515b934c00a65838fe8521142e4a9161b07c8e19b5bb0ea26a0ce9ab3  qtsvg-a9752b00a03438de8e5b080073816e12409404b7.tar.bz2
+sha256  6a71029b46e71667f86c48923f0b292c3057ea56b2aedb8aeaa5af70e85e71c3  qtsvg-3385b64df939815e9df5955f991d270d47a5515b.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index 2a39ed18fe..c1d019000b 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5SVG_VERSION = a9752b00a03438de8e5b080073816e12409404b7
+QT5SVG_VERSION = 3385b64df939815e9df5955f991d270d47a5515b
 QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION)
 QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2
 QT5SVG_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash
index d603598257..d4ea0dc047 100644
--- a/package/qt5/qt5tools/qt5tools.hash
+++ b/package/qt5/qt5tools/qt5tools.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  b6eebbd61dcde981d63ce6de39b3c957bad8f11b0140585ba4d57d166c4dd79d  qttools-32912a06aadfc3dcbc34e0a668ce2c78351eee6e.tar.bz2
+sha256  7214584115d0b89a362c6b0e8586d6228ac138f3ed5e52c97962b8634edbbcfd  qttools-ddf6686e9bce7a3232af14a2966b4c895e654f02.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index a01a336584..98f3948d17 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5TOOLS_VERSION = 32912a06aadfc3dcbc34e0a668ce2c78351eee6e
+QT5TOOLS_VERSION = ddf6686e9bce7a3232af14a2966b4c895e654f02
 QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION)
 QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2
 
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
index 60d51fa5fe..89559b63f2 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  e1e356e81f3a3fb5da6f6739aa475c15aab15090e202de6704441a3bf41c335b  qtvirtualkeyboard-9fbb837b55887bec5d73fad142c853ef68db35b3.tar.bz2
+sha256  c8dfb16614a63e39c714673abe35a7c30107d359356695634af619e62e8ce6cd  qtvirtualkeyboard-817378aa10176fd26eed36542bc657e48d9dd42e.tar.bz2
 
 # Hashes for license files:
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENSE.GPL3
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
index 49ce71b75e..5657d78c30 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5VIRTUALKEYBOARD_VERSION = 9fbb837b55887bec5d73fad142c853ef68db35b3
+QT5VIRTUALKEYBOARD_VERSION = 817378aa10176fd26eed36542bc657e48d9dd42e
 QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION)
 QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2
 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg
diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash
index c9d7f3434c..f4a1663add 100644
--- a/package/qt5/qt5wayland/qt5wayland.hash
+++ b/package/qt5/qt5wayland/qt5wayland.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  c881745403a7c3639ee928f64ac9e7252d7a941cb62ef682a7ee83ccf3ae0a60  qtwayland-8faf74a7966b520f0ac3eb4d88235f8ec63b31b8.tar.bz2
+sha256  d45149cce43ad76f0c8ee43f0469728259d2ab341cf7e2c02ddab6163c5f1d13  qtwayland-b8f1882df7215b6e00f66b7a6a08afafe230de29.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk
index aeca1b0381..4ce89fc46a 100644
--- a/package/qt5/qt5wayland/qt5wayland.mk
+++ b/package/qt5/qt5wayland/qt5wayland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WAYLAND_VERSION = 8faf74a7966b520f0ac3eb4d88235f8ec63b31b8
+QT5WAYLAND_VERSION = b8f1882df7215b6e00f66b7a6a08afafe230de29
 QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION)
 QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2
 QT5WAYLAND_DEPENDENCIES = wayland
diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash
index b5e9f1a043..7f2a357dbb 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.hash
+++ b/package/qt5/qt5webchannel/qt5webchannel.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  a281a053471f5c480d7c2679caa0a759e8628f6eafc07c1781f1eb8bb97ee37d  qtwebchannel-8c842152da613f941892481d62267c73c4a4f006.tar.bz2
+sha256  7d482e5140d789b417c359f557da783ed2cc07e8148133971caeb5b48b418645  qtwebchannel-48a520c11a0ef57f2553746159acf739c7f3863d.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index 54e6a70ddb..8ba81383d1 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WEBCHANNEL_VERSION = 8c842152da613f941892481d62267c73c4a4f006
+QT5WEBCHANNEL_VERSION = 48a520c11a0ef57f2553746159acf739c7f3863d
 QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION)
 QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2
 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets
diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash
index 038446a9f4..e0447c70b1 100644
--- a/package/qt5/qt5webengine/qt5webengine.hash
+++ b/package/qt5/qt5webengine/qt5webengine.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  4a3456df42e1c1b859232b3ee1d58360e629d55daf6e5ad308871142c1b0c2fa  qtwebengine-v5.15.10-lts.tar.bz2
+sha256  e7c9534453472311c06605f2892e038e9920bf10ca3a0dad99b46955ea124618  qtwebengine-v5.15.11-lts.tar.bz2
 
 # Locally calculated
 sha256  f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9  LICENSE.Chromium
diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash
index 72fbb4a599..fa3cc48995 100644
--- a/package/qt5/qt5websockets/qt5websockets.hash
+++ b/package/qt5/qt5websockets/qt5websockets.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  00a6d312f2e0ec8c64c12f6a178681d5936ec65bc7f1b85948b58cdb5021a8b6  qtwebsockets-6a4991250793cd38efa5e8db858cd49c82439130.tar.bz2
+sha256  2e024a4c0706d58a9c846cc1d036f383906e392f3cd7c3051fc56915b7530eee  qtwebsockets-50f3853a83ffc80a978cfa0882bdc2859e8de71e.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index 4eafb0b212..bb96fefe82 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WEBSOCKETS_VERSION = 6a4991250793cd38efa5e8db858cd49c82439130
+QT5WEBSOCKETS_VERSION = 50f3853a83ffc80a978cfa0882bdc2859e8de71e
 QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION)
 QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2
 QT5WEBSOCKETS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash
index d928c7cdce..00525dbad2 100644
--- a/package/qt5/qt5webview/qt5webview.hash
+++ b/package/qt5/qt5webview/qt5webview.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  38f6c0a2863e9144632286b0ef43db506b8631eeff0f8facae14b0da86ca0491  qtwebview-87577dde04ed219bda776dabca86176149736331.tar.bz2
+sha256  2427179da946d6df409e334c94ffe3f8589035a5d566caf52db2333cc9bfe47c  qtwebview-f078642eb9a440f6aa88f2beaf10f445de1e29bb.tar.bz2
 
 # Hashes for license files:
 sha256  ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d  LICENSE.FDL
diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk
index a55fd8ae74..01a377c27b 100644
--- a/package/qt5/qt5webview/qt5webview.mk
+++ b/package/qt5/qt5webview/qt5webview.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WEBVIEW_VERSION = 87577dde04ed219bda776dabca86176149736331
+QT5WEBVIEW_VERSION = f078642eb9a440f6aa88f2beaf10f445de1e29bb
 QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION)
 QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2
 QT5WEBVIEW_DEPENDENCIES = qt5webengine
diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash
index 87dac8625e..132c28dd96 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.hash
+++ b/package/qt5/qt5x11extras/qt5x11extras.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  cf9124f3d35f1c8db4e9e47943cb1ec86834abf2be38d70412d0452e64462906  qtx11extras-982f20eb585d77e5b5c721e05a466d7161f7f2d1.tar.bz2
+sha256  7d99fa4d900207c0ae1c7a514e7dc0b607c04e0232d2842a8d84f52534bd16e6  qtx11extras-5fb2e067a38d3583684310130f5d8aad064f512f.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index 80c5498518..a6fade0135 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5X11EXTRAS_VERSION = 982f20eb585d77e5b5c721e05a466d7161f7f2d1
+QT5X11EXTRAS_VERSION = 5fb2e067a38d3583684310130f5d8aad064f512f
 QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION)
 QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2
 QT5X11EXTRAS_INSTALL_STAGING = YES
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
index 353dfc8485..9be7bb7831 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  067b801049f6fada8e7ebcfbce0530db6217a1a94b8ed34c99c530be4129889d  qtxmlpatterns-30e6c84fe2752cde8b53aff9d38c2095cd7c8761.tar.bz2
+sha256  7770b333f2c0079cf65aa19dafd9e7d80fe058baf8e924f1c0d6e75c0b6e7374  qtxmlpatterns-5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 803c36cf04..2126d3c915 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5XMLPATTERNS_VERSION = 30e6c84fe2752cde8b53aff9d38c2095cd7c8761
+QT5XMLPATTERNS_VERSION = 5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2
 QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION)
 QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2
 QT5XMLPATTERNS_INSTALL_STAGING = YES
-- 
2.42.0


_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] package/qt5: bump packages to latest kde submodule versions
@ 2022-01-13  0:09 James Hilliard
  0 siblings, 0 replies; 10+ messages in thread
From: James Hilliard @ 2022-01-13  0:09 UTC (permalink / raw)
  To: buildroot
  Cc: Naumann Andreas, Joshua Henderson, Angelo Compagnucci,
	Bartosz Bilas, Peter Seiderer, Julien Corjon, Thomas Petazzoni,
	James Hilliard, Gaël Portay

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_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 which don't have
proper version tags.

Create a .git file so to trigger headers sync during configure.

Hold back updating qt5webengine for now since the latest version
requires significant changes to build, just tweak existing version
to be compatible with latest kde versions for now.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
Changes v4 -> v5:
  - leave qt5webengine on current version
  - add minimal tweaks to qt5webengine to build with updated kde deps

Changes v2 -> v3:
  - add kconfig entry for qt5location-mapboxgl

Changes v1 -> v2:
  - fix headers sync and update MODULE_VERSION
---
 package/pkg-qmake.mk                          |  4 +-
 package/qt5/Config.in                         |  1 +
 package/qt5/qt5.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 +-
 package/qt5/qt5location-mapboxgl/Config.in    |  4 +
 .../qt5location-mapboxgl.hash                 | 16 ++++
 .../qt5location-mapboxgl.mk                   | 14 ++++
 ...ix-compilation-for-no-opengl-builds.patch} |  0
 package/qt5/qt5location/Config.in             |  1 +
 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 +-
 ...m-breakpad-fix-build-with-glibc-2.34.patch | 76 +++++++++++++++++++
 package/qt5/qt5webengine/qt5webengine.mk      |  9 ++-
 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 +-
 76 files changed, 306 insertions(+), 390 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/Config.in
 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%)
 create mode 100644 package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch

diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk
index 4dcaf6dd62..fdaddf08df 100644
--- a/package/pkg-qmake.mk
+++ b/package/pkg-qmake.mk
@@ -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
 
 ################################################################################
diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 5751d6cb70..3e498f6a28 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -48,6 +48,7 @@ source "package/qt5/qt5graphicaleffects/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5knx/Config.in"
 source "package/qt5/qt5location/Config.in"
+source "package/qt5/qt5location-mapboxgl/Config.in"
 source "package/qt5/qt5lottie/Config.in"
 source "package/qt5/qt5mqtt/Config.in"
 source "package/qt5/qt5multimedia/Config.in"
diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index 3ffb7b0063..656e3067dc 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -5,9 +5,9 @@
 ################################################################################
 
 QT5_VERSION_MAJOR = 5.15
-QT5_VERSION = $(QT5_VERSION_MAJOR).2
+QT5_VERSION = $(QT5_VERSION_MAJOR).8
 QT5_SOURCE_TARBALL_PREFIX = everywhere-src
-QT5_SITE = https://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
+QT5_SITE = https://invent.kde.org/qt/qt
 
 include $(sort $(wildcard package/qt5/*/*.mk))
 
diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash
index 43b2132cc7..32d3675619 100644
--- a/package/qt5/qt53d/qt53d.hash
+++ b/package/qt5/qt53d/qt53d.hash
@@ -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
diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk
index f3eff9edf0..9a07d189bd 100644
--- a/package/qt5/qt53d/qt53d.mk
+++ b/package/qt5/qt53d/qt53d.mk
@@ -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
diff --git a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch b/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch
deleted file mode 100644
index f014a160d5..0000000000
--- a/package/qt5/qt5base/0006-Fix-build-with-GCC-11-include-limits.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9c56d4da2ff631a8c1c30475bd792f6c86bda53c Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-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 <edward.welbourne@qt.io>
-
-[Retrieved (and backported) from:
-https://github.com/qt/qtbase/commit/9c56d4da2ff631a8c1c30475bd792f6c86bda53c]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- 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__)
diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
deleted file mode 100644
index d20600c6ce..0000000000
--- a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001
-From: Ville Voutilainen <ville.voutilainen@qt.io>
-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 <lars.knoll@qt.io>
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-[Retrieved (and backported) from:
-https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9]
-Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
----
- 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
-
diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch
deleted file mode 100644
index e489f2e551..0000000000
--- a/package/qt5/qt5base/0008-Add-missing-limits-include.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@kdab.com>
-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 <giuseppe.dangelo@kdab.com>
-
-[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b]
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- 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
-
diff --git a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch
deleted file mode 100644
index 98c7210551..0000000000
--- a/package/qt5/qt5base/0009-Fix-build-on-riscv32.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-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 <thiago.macieira@intel.com>
-[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
-
diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash
index a824890e3c..a4ffd6b9a2 100644
--- a/package/qt5/qt5base/qt5base.hash
+++ b/package/qt5/qt5base/qt5base.hash
@@ -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  13d3f871973033b24cd0b4a563812277153835897c61152aaebb6e468b3f8233  qtbase-7ec73b4e75eb4359f49e5dd2be291d459a685ace.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index bcdf036f00..a3206f67bb 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -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 = 7ec73b4e75eb4359f49e5dd2be291d459a685ace
+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
diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash
index b52be714b7..021d4ea19f 100644
--- a/package/qt5/qt5charts/qt5charts.hash
+++ b/package/qt5/qt5charts/qt5charts.hash
@@ -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
diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk
index 2c40ac1c89..24e635b93b 100644
--- a/package/qt5/qt5charts/qt5charts.mk
+++ b/package/qt5/qt5charts/qt5charts.mk
@@ -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
diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk
index 24de869120..a50f19d7f2 100644
--- a/package/qt5/qt5coap/qt5coap.mk
+++ b/package/qt5/qt5coap/qt5coap.mk
@@ -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
diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash
index 3edc2d666a..12e9d637b2 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.hash
+++ b/package/qt5/qt5connectivity/qt5connectivity.hash
@@ -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
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index 6402b505bf..a4c79be10b 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -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
diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch
deleted file mode 100644
index 0e6da652f9..0000000000
--- a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-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 <ps.report@gmx.net>
----
- 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
-
diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash
index ab83b71814..f9dc08a6e0 100644
--- a/package/qt5/qt5declarative/qt5declarative.hash
+++ b/package/qt5/qt5declarative/qt5declarative.hash
@@ -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
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 3318cd24c8..036baed444 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -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
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
index 9d7a837b8b..e755f0848b 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
@@ -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
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index a9ddff454e..542eb4de90 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -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
diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash
index b4281e712d..49690de3bb 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.hash
+++ b/package/qt5/qt5imageformats/qt5imageformats.hash
@@ -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
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index ffb094d566..506cd123a8 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -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
diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk
index 9fc121111c..412e31c652 100644
--- a/package/qt5/qt5knx/qt5knx.mk
+++ b/package/qt5/qt5knx/qt5knx.mk
@@ -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
diff --git a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch
similarity index 81%
rename from package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch
rename to package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch
index 0894af9ce5..0f56a488e3 100644
--- a/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch
+++ b/package/qt5/qt5location-mapboxgl/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch
@@ -24,13 +24,13 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net>
 [yann.morin.1998@free.fr: add uClibc]
 Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
 ---
- 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() {
diff --git a/package/qt5/qt5location-mapboxgl/Config.in b/package/qt5/qt5location-mapboxgl/Config.in
new file mode 100644
index 0000000000..4f62a110fb
--- /dev/null
+++ b/package/qt5/qt5location-mapboxgl/Config.in
@@ -0,0 +1,4 @@
+# Not user-selectable, it is only needed to be copied
+# into the qt5location source tree.
+config BR2_PACKAGE_QT5LOCATION_MAPBOXGL
+	bool
diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash
new file mode 100644
index 0000000000..e44081c465
--- /dev/null
+++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.hash
@@ -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
diff --git a/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk
new file mode 100644
index 0000000000..38ba10e579
--- /dev/null
+++ b/package/qt5/qt5location-mapboxgl/qt5location-mapboxgl.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# 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
+QT5LOCATION_MAPBOXGL_INSTALL_TARGET = NO
+
+$(eval $(generic-package))
diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch
similarity index 100%
rename from package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch
rename to package/qt5/qt5location/0001-fix-compilation-for-no-opengl-builds.patch
diff --git a/package/qt5/qt5location/Config.in b/package/qt5/qt5location/Config.in
index 3d91adaf1f..b811f9a590 100644
--- a/package/qt5/qt5location/Config.in
+++ b/package/qt5/qt5location/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_QT5LOCATION
 	bool "qt5location"
 	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5LOCATION_MAPBOXGL
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash
index 0bb293305c..52649897b1 100644
--- a/package/qt5/qt5location/qt5location.hash
+++ b/package/qt5/qt5location/qt5location.hash
@@ -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
diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
index ea741d0df6..98af8b233b 100644
--- a/package/qt5/qt5location/qt5location.mk
+++ b/package/qt5/qt5location/qt5location.mk
@@ -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))
diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash
index 740f9072f2..46ab3f60df 100644
--- a/package/qt5/qt5lottie/qt5lottie.hash
+++ b/package/qt5/qt5lottie/qt5lottie.hash
@@ -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
diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk
index 1423a629b9..e9614fbecf 100644
--- a/package/qt5/qt5lottie/qt5lottie.mk
+++ b/package/qt5/qt5lottie/qt5lottie.mk
@@ -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
diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk
index 54cc1de632..0b62cf1bed 100644
--- a/package/qt5/qt5mqtt/qt5mqtt.mk
+++ b/package/qt5/qt5mqtt/qt5mqtt.mk
@@ -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
diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash
index b70a4ecf51..1c4d930248 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.hash
+++ b/package/qt5/qt5multimedia/qt5multimedia.hash
@@ -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
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 39eddc3afc..6695369063 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -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
diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk
index a58c4c5e14..ef51abddf8 100644
--- a/package/qt5/qt5opcua/qt5opcua.mk
+++ b/package/qt5/qt5opcua/qt5opcua.mk
@@ -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
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
index 1fa0d6430a..2138b3e313 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
@@ -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
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index 1ac8689d6e..c2b5ae182e 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -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
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
index f66a1186ee..fd616b74a6 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
@@ -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  9237818f2202d9473b035750b2aa598b9c31ea19abf8ae898957d33da03d0553  qtquickcontrols2-0129dd7bfe7abb01a3eea5be2424789e1b5fbd3a.tar.bz2
 
 # Hashes for license files:
 sha256  d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca  LICENSE.GPLv3
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
index 2f6dcd1f2f..4be6cd9117 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
@@ -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 = 0129dd7bfe7abb01a3eea5be2424789e1b5fbd3a
+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
diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash
index ac97fc319c..c2d0b11f2b 100644
--- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash
+++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash
@@ -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
diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk
index ef6927f928..49d0cb330b 100644
--- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk
+++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk
@@ -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
diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash
index 30c5bfc51d..a2573a018a 100644
--- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash
+++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash
@@ -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
diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk
index a6b5f0954c..b7dee4f2f3 100644
--- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk
+++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk
@@ -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
diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash
index 783598047b..0b34ff3e8f 100644
--- a/package/qt5/qt5script/qt5script.hash
+++ b/package/qt5/qt5script/qt5script.hash
@@ -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
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index 77254fec0f..4e51eacfc3 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -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
diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash
index 6f816548e6..85e72f5378 100644
--- a/package/qt5/qt5scxml/qt5scxml.hash
+++ b/package/qt5/qt5scxml/qt5scxml.hash
@@ -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
diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk
index 186a2d381b..d5d26536a3 100644
--- a/package/qt5/qt5scxml/qt5scxml.mk
+++ b/package/qt5/qt5scxml/qt5scxml.mk
@@ -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
diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash
index 179c9833e0..6be87e8cf9 100644
--- a/package/qt5/qt5sensors/qt5sensors.hash
+++ b/package/qt5/qt5sensors/qt5sensors.hash
@@ -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
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
index f928aad1c1..eebda912a9 100644
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -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
diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash
index 4f05049b99..8b560a8a83 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.hash
+++ b/package/qt5/qt5serialbus/qt5serialbus.hash
@@ -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
diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
index 412a255612..fc62c85318 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.mk
+++ b/package/qt5/qt5serialbus/qt5serialbus.mk
@@ -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
diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash
index 37bc8401f8..6d821c387f 100644
--- a/package/qt5/qt5serialport/qt5serialport.hash
+++ b/package/qt5/qt5serialport/qt5serialport.hash
@@ -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
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
index 902967c757..370093f6f8 100644
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -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))
diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash
index 7773a940bb..1e4dc54c67 100644
--- a/package/qt5/qt5svg/qt5svg.hash
+++ b/package/qt5/qt5svg/qt5svg.hash
@@ -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  7f45cc161ede4e918a4f3236af7e81d63404199529460cf74b620565dfce6d9e  qtsvg-728012f7762ecd5762d493f8796907c6456f31e7.tar.bz2
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index d4b31c231e..849a2b7f1b 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -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 = 728012f7762ecd5762d493f8796907c6456f31e7
+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))
diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash
index e52d8e6df7..a563801997 100644
--- a/package/qt5/qt5tools/qt5tools.hash
+++ b/package/qt5/qt5tools/qt5tools.hash
@@ -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
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index 0543afd8f7..e2385080ce 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -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
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
index 82f132378e..1e2c658109 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
@@ -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
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
index 3984c9866e..db0884fd18 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
@@ -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
diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash
index b17dbdd10d..35708ec077 100644
--- a/package/qt5/qt5wayland/qt5wayland.hash
+++ b/package/qt5/qt5wayland/qt5wayland.hash
@@ -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
diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk
index 0076bbfe73..70e5b2655e 100644
--- a/package/qt5/qt5wayland/qt5wayland.mk
+++ b/package/qt5/qt5wayland/qt5wayland.mk
@@ -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
diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash
index 47c7da3365..af195b32b3 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.hash
+++ b/package/qt5/qt5webchannel/qt5webchannel.hash
@@ -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
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index 176c0fd7a3..042a28fca9 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -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)
diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch
new file mode 100644
index 0000000000..44a6424c7d
--- /dev/null
+++ b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch
@@ -0,0 +1,76 @@
+From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 4 Aug 2021 19:11:06 +0200
+Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34
+
+* fixes:
+[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o
+FAILED: obj/third_party/breakpad/client/exception_handler.o
+/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o
+../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()':
+../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)'
+  141 |   static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+      |                                         ~~~~~~~~^~~~~~~~~~~~~~~~~
+In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
+                 from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
+                 from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
+                 from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)'
+  254 |     max(const _Tp& __a, const _Tp& __b)
+      |     ^~~
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note:   template argument deduction/substitution failed:
+../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note:   deduced conflicting types for parameter 'const _Tp' ('int' and 'long int')
+  141 |   static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+      |                                         ~~~~~~~~^~~~~~~~~~~~~~~~~
+In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
+                 from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
+                 from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
+                 from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)'
+  300 |     max(const _Tp& __a, const _Tp& __b, _Compare __comp)
+      |     ^~~
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note:   template argument deduction/substitution failed:
+../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note:   deduced conflicting types for parameter 'const _Tp' ('int' and 'long int')
+  141 |   static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+      |                                         ~~~~~~~~^~~~~~~~~~~~~~~~~
+In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
+                 from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)'
+ 3461 |     max(initializer_list<_Tp> __l)
+      |     ^~~
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note:   template argument deduction/substitution failed:
+../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note:   mismatched types 'std::initializer_list<_Tp>' and 'int'
+  141 |   static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+      |                                         ~~~~~~~~^~~~~~~~~~~~~~~~~
+In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
+                 from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)'
+ 3467 |     max(initializer_list<_Tp> __l, _Compare __comp)
+      |     ^~~
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note:   template argument deduction/substitution failed:
+../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note:   mismatched types 'std::initializer_list<_Tp>' and 'int'
+  141 |   static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+      |                                         ~~~~~~~~^~~~~~~~~~~~~~~~~
+
+Adapted from:
+https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
+---
+ .../breakpad/src/client/linux/handler/exception_handler.cc      | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+index ca353c40997..2e43ba6fc04 100644
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
+   // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
+   // the alternative stack. Ensure that the size of the alternative stack is
+   // large enough.
+-  static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
++  static const unsigned kSigStackSize = std::max<size_t>(16384, SIGSTKSZ);
+ 
+   // Only set an alternative stack if there isn't already one, or if the current
+   // one is too small.
diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
index 64c9c96cc2..cebd6d0fe2 100644
--- a/package/qt5/qt5webengine/qt5webengine.mk
+++ b/package/qt5/qt5webengine/qt5webengine.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-QT5WEBENGINE_VERSION = $(QT5_VERSION)
-QT5WEBENGINE_SITE = $(QT5_SITE)
+QT5WEBENGINE_VERSION_MAJOR = 5.15
+QT5WEBENGINE_VERSION = $(QT5WEBENGINE_VERSION_MAJOR).2
+QT5WEBENGINE_SITE = https://download.qt.io/archive/qt/$(QT5WEBENGINE_VERSION_MAJOR)/$(QT5WEBENGINE_VERSION)/submodules
 QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz
 QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \
 	qt5declarative qt5webchannel host-bison host-flex host-gperf \
@@ -44,7 +45,9 @@ endif
 # QtWebengine's build system uses python, but only supports python2. We work
 # around this by forcing python2 early in the PATH, via a python->python2
 # symlink.
-QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
+QT5WEBENGINE_ENV = \
+	PATH=$(@D)/host-bin:$(BR_PATH) \
+	PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig
 define QT5WEBENGINE_PYTHON2_SYMLINK
 	mkdir -p $(@D)/host-bin
 	ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python
diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash
index 29a9ebe439..3cc87865dc 100644
--- a/package/qt5/qt5websockets/qt5websockets.hash
+++ b/package/qt5/qt5websockets/qt5websockets.hash
@@ -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
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index a35cdc5799..d222f025ee 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -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)
diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash
index c1cee9cf85..51d0fb0d7a 100644
--- a/package/qt5/qt5webview/qt5webview.hash
+++ b/package/qt5/qt5webview/qt5webview.hash
@@ -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
diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk
index 0f37f3eb85..ed1cfe5065 100644
--- a/package/qt5/qt5webview/qt5webview.mk
+++ b/package/qt5/qt5webview/qt5webview.mk
@@ -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)
diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash
index 08e6753f21..b854cedcb6 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.hash
+++ b/package/qt5/qt5x11extras/qt5x11extras.hash
@@ -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
diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index 075d36dcd8..7b1e32df17 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -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))
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
index 682e114a7f..c0e3caa407 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
@@ -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
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 6845483327..27818ecb78 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -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

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2024-07-23 10:45 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-18  1:34 [Buildroot] [PATCH 1/1] package/qt5: bump packages to latest kde submodule versions James Hilliard
2022-07-26 21:11 ` Thomas Petazzoni via buildroot
2022-07-27  7:58 ` Arnout Vandecappelle
2022-07-27 18:08   ` James Hilliard
  -- strict thread matches above, loose matches on Subject: below --
2024-07-12  8:48 Simon Ruepp via buildroot
2024-07-12 14:32 ` Thomas Petazzoni via buildroot
2024-07-23 10:44   ` Simon Ruepp via buildroot
2023-10-12 13:26 Sebastian Weyer
2024-02-09  7:53 ` Arnout Vandecappelle via buildroot
2022-01-13  0:09 James Hilliard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox