diff --git a/.checkpackageignore b/.checkpackageignore index 019a92fdb0..ca622d4d92 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -794,11 +794,7 @@ package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch lib_ package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch lib_patch.Upstream package/qt5/qt5base/0001-qtbase-Fix-build-error-when-using-EGL.patch lib_patch.Upstream package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch lib_patch.Upstream -package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch lib_patch.Upstream -package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch lib_patch.Upstream package/qt5/qt5base/0005-eglfs-avoid-breaking-compilation-for-obscure-EGLNativeDisplayType-types.patch lib_patch.Upstream -package/qt5/qt5base/0006-Fix-build-on-riscv32.patch lib_patch.Upstream -package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch lib_patch.Upstream package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch lib_patch.Upstream package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch lib_patch.Upstream package/qt5/qt5declarative/0002-qv4regexp_p-needs-c-limits-include-instead-of-plain-.patch lib_patch.Upstream @@ -806,10 +802,8 @@ package/qt5/qt5enginio/0001-Do-not-use-deprecated-QLinkedList.patch lib_patch.Up package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch lib_patch.Upstream package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch lib_patch.Upstream package/qt5/qt5tools/0001-Disable-designer-tool-fixes-configure-error.patch lib_patch.Upstream -package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch lib_patch.Upstream -package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch lib_patch.Upstream +package/qt5/qt5webengine-chromium/0001-Don-t-rebase-sysroot-path.patch lib_patch.Upstream package/qt5/qt5webengine/0001-gn.pro-don-t-link-statically-with-libstc.patch lib_patch.Upstream -package/qt5/qt5webengine/0002-Add-python3-build-support.patch lib_patch.Upstream package/qt5/qt5webkit/0001-WinCairo-PlayStation-ICU-68.1-no-longer-exposes-FALS.patch lib_patch.Upstream package/qt5/qt5webkit/0002-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch lib_patch.Upstream package/qt5/qt5webkit/0003-Let-Bison-generate-the-header-directly-to-fix-build-.patch lib_patch.Upstream diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 21f6a8bc73..9895f337f0 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).14 +QT5_VERSION = $(QT5_VERSION_MAJOR).18 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 65e6e8e380..966da7d3e5 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 31b3e52fb0b28f1e99dd25342a0204d239f7f42bcb25fb56393956904ef412ea qt3d-9bf4d03e2515f7c454647d54542330b6e90f8191.tar.bz2 +sha256 a7bab355f0a1d7b17b0e41179f21af8d30d0d1075af5876e9a9fb0a6a12ac982 qt3d-208f5835e6c2415c9dc5cbe92bba83aa28bab7ea.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 8d9babd704..7be0793e1f 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT53D_VERSION = 9bf4d03e2515f7c454647d54542330b6e90f8191 +QT53D_VERSION = 208f5835e6c2415c9dc5cbe92bba83aa28bab7ea QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch b/package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch index 79e276b17f..e7b04d2258 100644 --- a/package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch +++ b/package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch @@ -3,17 +3,17 @@ From: Peter Seiderer Date: Sun, 8 Mar 2020 18:08:26 +0100 Subject: [PATCH] double-conversion: enable for nios2 -[Upstream: https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa] +Upstream: https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa Signed-off-by: Peter Seiderer --- src/3rdparty/double-conversion/include/double-conversion/utils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index d29de950..55ca5bf5 100644 +index 2bb8e389a5b..89ab1a3102a 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/utils.h +++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -87,6 +87,7 @@ int main(int argc, char** argv) { +@@ -94,6 +94,7 @@ int main(int argc, char** argv) { defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ defined(__hppa__) || defined(__ia64__) || \ defined(__mips__) || \ diff --git a/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch b/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch index e2ead9bd2c..7e59a0a011 100644 --- a/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch +++ b/package/qt5/qt5base/0004-double-conversion-enable-for-xtensa.patch @@ -3,7 +3,7 @@ From: Peter Seiderer Date: Tue, 10 Mar 2020 09:01:31 +0100 Subject: [PATCH] double-conversion: enable for xtensa -[Upstream: https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa] +Upstream: https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa Signed-off-by: Peter Seiderer [Rebased for qtbase-everywhere-src-5.14.0] Signed-off-by: Peter Seiderer diff --git a/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch index ff24fbff83..2feda15da0 100644 --- a/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch +++ b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch @@ -18,8 +18,7 @@ Pick-to: 6.1 6.2 Fixes: QTBUG-96067 Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5 Reviewed-by: Thiago Macieira -[Retrieved from: -https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] +Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f Signed-off-by: Fabrice Fontaine [Dario: make the patch to be applied with fuzz factor 0] Signed-off-by: Dario Binacchi @@ -28,10 +27,10 @@ Signed-off-by: Dario Binacchi 1 file changed, 5 insertions(+) diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index f287b752d75f..fd7d09ac8572 100644 +index e294537787e..6bf59d51df3 100644 --- a/src/corelib/thread/qfutex_p.h +++ b/src/corelib/thread/qfutex_p.h -@@ -81,6 +81,11 @@ QT_END_NAMESPACE +@@ -82,6 +82,11 @@ QT_END_NAMESPACE // if not defined in linux/futex.h # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 diff --git a/package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch index 5f0f81a4bd..63c9473137 100644 --- a/package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch +++ b/package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch @@ -23,8 +23,7 @@ Fixes: - http://autobuild.buildroot.org/results/5a20e984a5536165056b3fbd93b8712e8ddbeed4 Signed-off-by: Fabrice Fontaine -[Upstream status: -https://invent.kde.org/qt/qt/qtbase/-/merge_requests/138] +Upstream: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/138 --- src/corelib/configure.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 14e0c9b602..def257b2b4 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2d6ede564444b617a7fe6e8fa65b3d81df3a3308641cf7c35aef6aa471a21269 qt5base-2b9835f5c9bcfe3105b60a8dd33c1db7d8611378-git4.tar.gz +sha256 3b4bfbd1844aba3b753146ca7d008177010ebb819fcb224c6c0afd8496d8abff qt5base-bebdfd54917e25d1c100e6bd9f5dd53c2e645fd8-git4.tar.gz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index e465969f64..159d411de8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,13 +4,13 @@ # ################################################################################ -QT5BASE_VERSION = 2b9835f5c9bcfe3105b60a8dd33c1db7d8611378 +QT5BASE_VERSION = bebdfd54917e25d1c100e6bd9f5dd53c2e645fd8 QT5BASE_SITE = $(QT5_SITE)/qtbase QT5BASE_SITE_METHOD = git QT5BASE_CPE_ID_VENDOR = qt QT5BASE_CPE_ID_PRODUCT = qt # Closest upstream version -QT5BASE_CPE_ID_VERSION = 5.15.14 +QT5BASE_CPE_ID_VERSION = 5.15.18 QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index 009edbd240..468b77b3ab 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c66fec01fedf753bee860aedc365730367026c28a2418a6819b0b2550336293c qtcharts-7315c48bcec88014e78165bbda54abfcd557e0af.tar.bz2 +sha256 e7421098d79b6c030392e6679a5a91c594bd2075e545555a67d05665c79ecb44 qtcharts-1093fb53ced126100d14af30a8adffd29b7ef855.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 25da7f8ed7..348f3643d4 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5CHARTS_VERSION = 7315c48bcec88014e78165bbda54abfcd557e0af +QT5CHARTS_VERSION = 1093fb53ced126100d14af30a8adffd29b7ef855 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 8185a272ea..6dc9eda4bb 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3f7ed280d234a50d21937aecaf5494bbd570fb80e71f49598e082cefe81d41fe qtconnectivity-99f30db37c63447c59d5fac15bc8feb832a7fd04.tar.bz2 +sha256 321b3a484e4c488156dd018ee38a5b869cc0ee1fcd676a59b4e026eebc5021d8 qtconnectivity-f1be05c8efeb65b77a8bfd21763ab55bb5c04906.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 e1592e80bb..8af36ad90c 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = 99f30db37c63447c59d5fac15bc8feb832a7fd04 +QT5CONNECTIVITY_VERSION = f1be05c8efeb65b77a8bfd21763ab55bb5c04906 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 3a5fc44356..e8ed01341b 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9a84a707411c0daa6b3292ebe264ac7e979639d9f6d5fd45bb18799b42ca0c33 qtdeclarative-50c8def854806485d66aabcf6918e8b987032e55.tar.bz2 +sha256 fe9a13d56162c09d37bdf6677074b7f8dd3cf529b19c255327cef0bd37ff710b qtdeclarative-f78bc0b2c6884fd730bf34a931870d67936cf01d.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 0dbb69f2e0..7f274d6653 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = 50c8def854806485d66aabcf6918e8b987032e55 +QT5DECLARATIVE_VERSION = f78bc0b2c6884fd730bf34a931870d67936cf01d QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES diff --git a/package/qt5/qt5doc/qt5doc.hash b/package/qt5/qt5doc/qt5doc.hash index 8139bfddc9..9d2c8c1cad 100644 --- a/package/qt5/qt5doc/qt5doc.hash +++ b/package/qt5/qt5doc/qt5doc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2fd5e9d12067e67c1e1cf77862e6e351ce7300a9eb9b3f089627114f40d45165 qtdoc-bc4503b8b70f4cd435d6e64a9e6c623ca44b9fcd.tar.bz2 +sha256 f70449c1c55f18993733d0aa9af9c84a3ed43215be88316e6f4b87dc248944a4 qtdoc-ddb2afda6f713259fc8d95fb22a1c96bb448c36a.tar.bz2 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5doc/qt5doc.mk b/package/qt5/qt5doc/qt5doc.mk index 597bc965ad..8de814657b 100644 --- a/package/qt5/qt5doc/qt5doc.mk +++ b/package/qt5/qt5doc/qt5doc.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DOC_VERSION = bc4503b8b70f4cd435d6e64a9e6c623ca44b9fcd +QT5DOC_VERSION = ddb2afda6f713259fc8d95fb22a1c96bb448c36a QT5DOC_SITE = $(QT5_SITE)/qtdoc/-/archive/$(QT5DOC_VERSION) QT5DOC_SOURCE = qtdoc-$(QT5DOC_VERSION).tar.bz2 QT5DOC_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 900edaee05..a6d799f32b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 dca1697c8dd21e53999df67f0ac59c1c26531ef3a693bfc066408047ea511e7a qtgraphicaleffects-2c39e673d6c15a84dcc7882d3772fa04cc79f9ed.tar.bz2 +sha256 9e0809574fc3fae648d505528cfdfa681edb6b41e29a69e2e7e633fb48621f28 qtgraphicaleffects-dfb2e7b2c98a9b7185c300d0b92b4048f5d89ba5.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 341f4a70ac..8aae5ccae8 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = 2c39e673d6c15a84dcc7882d3772fa04cc79f9ed +QT5GRAPHICALEFFECTS_VERSION = dfb2e7b2c98a9b7185c300d0b92b4048f5d89ba5 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 5da2563187..cb65976822 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 d4805fadfd33243c4a1c9f81083f75b5162e25b92a39a56d87558ba03a2fb8a3 qtimageformats-4e4f5fc6bdac96f5281a3ebeb0fee78df7b1a498.tar.bz2 +sha256 6c49db8c44cda8559692427ec5c32429efe406cc66c88afdc70fdd23993ae511 qtimageformats-c91e4c63c1eaf1e23806d9df10e3d5a9ae353c1d.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 1f51e002e9..4e83eb9cb3 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = 4e4f5fc6bdac96f5281a3ebeb0fee78df7b1a498 +QT5IMAGEFORMATS_VERSION = c91e4c63c1eaf1e23806d9df10e3d5a9ae353c1d 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 0b44f09cbb..ee65c7fa84 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 fe3b037f9291352d11714a4c1101299d83e561c11b867d77273fb3f5c44384a3 qt5location-3beb9c810611337fde61d89aa981e9f177a9ede9-git4.tar.gz +sha256 40dbee28e205482d8fb2345cde648d38c64910847463ccb05065e2fe7cc373a2 qt5location-ba48a8b5cedd157d972c08d371ac2581db166bf7-git4.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 01bb4f747b..451dd953ed 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5LOCATION_VERSION = 3beb9c810611337fde61d89aa981e9f177a9ede9 +QT5LOCATION_VERSION = ba48a8b5cedd157d972c08d371ac2581db166bf7 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 304b92de86..a81fe5ea6e 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 514e4a8e334e69eb345e9ae7186f6254854077ebf5ca30f0ae216df3ea78bacd qtlottie-b8c1fa109dce6f8bff9f55738d2f1e21ff677796.tar.bz2 +sha256 d872dfeb3b1b812165506e7e7cef5039b2fd441187f0ca30e6a93a968e9392a7 qtlottie-27ed5a3c95a0810a96fac2a8661ea94d8ea3c44e.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 a364f2e10a..7b3bfe6ffd 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5LOTTIE_VERSION = b8c1fa109dce6f8bff9f55738d2f1e21ff677796 +QT5LOTTIE_VERSION = 27ed5a3c95a0810a96fac2a8661ea94d8ea3c44e 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 d6aca5c74d..1a4f889de6 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 62d9ab403bae05d3ca1335324143c371a33089ceed6f4124be74a1518b85906e qtmultimedia-53069c9c6eb52b744333812f42aed36c3db6e752.tar.bz2 +sha256 a160196093ee0bcd30383104da9143f0ed09e2074e3025a2b1d987946b2d1a53 qtmultimedia-ff83d119c75cd8406f73ccc08958fe36747e7390.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 07314b3de3..c18561d1aa 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = 53069c9c6eb52b744333812f42aed36c3db6e752 +QT5MULTIMEDIA_VERSION = ff83d119c75cd8406f73ccc08958fe36747e7390 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 fda3198571..44a68b4d56 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0f2244f4425b8886bbeef77c92b807ef4749ace18d31e02ca88183e5af088c18 qtquickcontrols-9325659ec390eda5b160736a926ba58ccb445cce.tar.bz2 +sha256 11dd2a55a9c877f8766cc0dab04908cf3acd6fa933895c0ed64828be79babb9c qtquickcontrols-0c3c18bf8bdac1ef1afdb8aade903edb5c2bc041.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 ab7b49f0b8..f0949ca253 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = 9325659ec390eda5b160736a926ba58ccb445cce +QT5QUICKCONTROLS_VERSION = 0c3c18bf8bdac1ef1afdb8aade903edb5c2bc041 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 9c401c00e3..2102a7320c 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 90fb0d1b578af622b98a291f7bc1069695c180040b18e9cd8423fe86e325c290 qtquickcontrols2-69fea340f8f4c483a9b2889e4e24a4b1b52ebc87.tar.bz2 +sha256 3922c0f1de88aca778a0835e4f9928f13acecebec4abca2cb47fbdebc4b69de9 qtquickcontrols2-e464888c53a641ee44a34ff2350cfb156c8ed59f.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 34c27b7cb7..48a56d399f 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = 69fea340f8f4c483a9b2889e4e24a4b1b52ebc87 +QT5QUICKCONTROLS2_VERSION = e464888c53a641ee44a34ff2350cfb156c8ed59f 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 602127d769..31405675d6 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 72b1e95f7d4235b03c0d3ffcbc67ab3e7fbe4c96a4d9631cb8c9024a2b9d4f50 qtquicktimeline-bf6c73064c82b07fcb1f7e72c263b249e137e224.tar.bz2 +sha256 dbd5d9acafc73825c8f6565f2933642c3c786765867badeeced72bacde2ed9cf qtquicktimeline-43130f2681b76a8d743a04704465b716b6b2faee.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 4307c9b123..7e4efc318e 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = bf6c73064c82b07fcb1f7e72c263b249e137e224 +QT5QUICKTIMELINE_VERSION = 43130f2681b76a8d743a04704465b716b6b2faee 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 943ecb268e..db164e60db 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 347c89c24480b1f20f12d7415706aba6536ff7277862d3450e34c40cc711016e qtremoteobjects-3873bdc809ca8d58d91968cb0de34da26646bc79.tar.bz2 +sha256 222c2754d0921dceff0697e95cc0d117d69957ce2b59605ecaa62b172bd259fa qtremoteobjects-b2740a7c7f5b6ac810240404a947ca5cff9de5f7.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 8848af3c81..ba0cf6f4b3 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = 3873bdc809ca8d58d91968cb0de34da26646bc79 +QT5REMOTEOBJECTS_VERSION = b2740a7c7f5b6ac810240404a947ca5cff9de5f7 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 655b772595..f98809e809 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6462533cb1749d76c890cb3c325524835a6ee7f12682d425a2cf19628806b284 qtscript-572daa83e990ce88cca27909470c5404657ec9de.tar.bz2 +sha256 9e4d59ccf83d9479a4fc49115044ce93e1e61a890adcbe715d3296f7a498a488 qtscript-bcd7cae6215df8f1c8b45a338f3327da51edeaff.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 4c8a7e1676..64f010b8ec 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SCRIPT_VERSION = 572daa83e990ce88cca27909470c5404657ec9de +QT5SCRIPT_VERSION = bcd7cae6215df8f1c8b45a338f3327da51edeaff 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 60e64feb88..6681328e4b 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 92191932423bdbb11e3005bf4c8bc43faa623d7b16558ecf884f20564ad8dbff qtscxml-6834b183966d08d9f061642ee7ea2d482cbbf073.tar.bz2 +sha256 867db30640540f08506446191a7a963d17055778e6c2f570a9e873386571923b qtscxml-57491f554bc53bd020978b5744437b7ac7e56a27.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 f92bfdf645..2e5a12a6be 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SCXML_VERSION = 6834b183966d08d9f061642ee7ea2d482cbbf073 +QT5SCXML_VERSION = 57491f554bc53bd020978b5744437b7ac7e56a27 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 2955e651e7..6ba9d7ae07 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 d01ee718ae1c00329a6b3cdadb190a2159e7d1e1e76d7345815cb17a42d48113 qtsensors-bf0b718cd0b6c7823e9d2037d3bdece44185f444.tar.bz2 +sha256 a9c64bbec1eb0275fd8a65aad3266d7699a8456e95adfcab75bffcaa2eb0d0a7 qtsensors-50a61b360877e7c1300df76b5aabf8d75554a398.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 b99440e21e..cddfbaf588 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SENSORS_VERSION = bf0b718cd0b6c7823e9d2037d3bdece44185f444 +QT5SENSORS_VERSION = 50a61b360877e7c1300df76b5aabf8d75554a398 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 64a518734c..7ec310cd81 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 45bf8a97ef2f2e85c023f4e7ce761b64f98ac6a9c3af2a8f232f2cc778762736 qtserialbus-616bc5b962cdcacb1c1ba985d7236392e9cadb8c.tar.bz2 +sha256 f7adf196dca88859b1d2962cd37c638b4d7f7ee261849cc43bea88db86569cef qtserialbus-c23069351ec31563c9ea9fcdce42ccdba95ea518.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 ca22a0ca1c..87a3ef639e 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SERIALBUS_VERSION = 616bc5b962cdcacb1c1ba985d7236392e9cadb8c +QT5SERIALBUS_VERSION = c23069351ec31563c9ea9fcdce42ccdba95ea518 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 b18d0d05b4..b867abd4af 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c8eea27d6fc031088fc84cf08cdfffda3b72b6fdd279144a0de7a1bcb9f19d91 qtserialport-34c19c6441cd440dc65b59ae7670eadf099d51f8.tar.bz2 +sha256 e444f67762ca7641e7e9288c6f7a7f877a149bff3c84abc07bf06ef3bf55e173 qtserialport-b64a7eeda9b6a65b5ed01b1b40b07177f0aa4c0f.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 592de6f0a9..729ac10be6 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SERIALPORT_VERSION = 34c19c6441cd440dc65b59ae7670eadf099d51f8 +QT5SERIALPORT_VERSION = b64a7eeda9b6a65b5ed01b1b40b07177f0aa4c0f 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 a222b16292..04001e6256 100644 --- a/package/qt5/qt5speech/qt5speech.hash +++ b/package/qt5/qt5speech/qt5speech.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8414b8e9cedc8bdd7bc70f5a1c5b83dda2147fba22c7c6fa6498ea4c1451d6df qtspeech-8ad0f08ad7e2a8d27dc5e69806812c6a3f298946.tar.bz2 +sha256 460f33a11110e0a730543799b7946ed92d286b1f6dc6f4681575434a5a71fd86 qtspeech-aa2376f9b1302222edcd16b4641bbd7004318c00.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 22f9d8c9d3..e5336e64d0 100644 --- a/package/qt5/qt5speech/qt5speech.mk +++ b/package/qt5/qt5speech/qt5speech.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SPEECH_VERSION = 8ad0f08ad7e2a8d27dc5e69806812c6a3f298946 +QT5SPEECH_VERSION = aa2376f9b1302222edcd16b4641bbd7004318c00 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 654016d94c..01c8c828ca 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8e4d0fbfdd8bd33ec23036af932b12f838974ac322a5d53f487190477b2be286 qtsvg-690128b2b8fb6d6fbdc43b2b2633f0f1de3f0638.tar.bz2 +sha256 3df1f47c5f9ac9af9cc505b8aca71b40cd142d7ce79bac3570f8456bf6ba3e38 qtsvg-b74f7291f343dcbcb487b020868f042d8fe83098.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 1221dedcc9..34e74cb629 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SVG_VERSION = 690128b2b8fb6d6fbdc43b2b2633f0f1de3f0638 +QT5SVG_VERSION = b74f7291f343dcbcb487b020868f042d8fe83098 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 c19eb41e5b..d8e684b8d5 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 46bd221011a6b4b1b9da6ce13099e10d09548af325a8b2082b8bc2f692a0d95d qttools-f82ed367d1b80b69d738cfcde534b75854a45476.tar.bz2 +sha256 f53f515c1b00ded46ca7437bbdb0a0db4cab86d7ff5bc1dfa98b6d842a16845d qttools-fa40a2d3373b89be0cd0a43fe0c1d047e3d34058.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 c03d5d6e38..26742d1566 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5TOOLS_VERSION = f82ed367d1b80b69d738cfcde534b75854a45476 +QT5TOOLS_VERSION = fa40a2d3373b89be0cd0a43fe0c1d047e3d34058 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 d091df1b94..e748f328d6 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 264d7fb33bc7cf1e9a387c7220c997f96e64a2659738a419d558e7c518718bd0 qtvirtualkeyboard-7389450a5de5fdd210f1459abcf73621ec0496bd.tar.bz2 +sha256 356f2edd84b626191b15e76d71a484ebe9daf64d8156554ecde09403971539d7 qtvirtualkeyboard-859d2a6ee329cc08414410b2ef8c0af77a6853d3.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 b4673f7fd4..a2e86e6499 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = 7389450a5de5fdd210f1459abcf73621ec0496bd +QT5VIRTUALKEYBOARD_VERSION = 859d2a6ee329cc08414410b2ef8c0af77a6853d3 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 3e1aebb5de..e1fb1b3b18 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 49fa530747c14e6dbe17f6c683e3292340db8bbaf4f17f7699467d3004b45b5b qtwayland-11e099c6b7fbec0e198bffaf8016676ef430cfba.tar.bz2 +sha256 81a250da038d7270c06d66463c6dbab665e1eb7bad84b1f9796f5d23f39faf0b qtwayland-df49b9f3badce793a0a9ea850cf1a02cc5bafef6.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 41f99801fa..8e21ec6da3 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WAYLAND_VERSION = 11e099c6b7fbec0e198bffaf8016676ef430cfba +QT5WAYLAND_VERSION = df49b9f3badce793a0a9ea850cf1a02cc5bafef6 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 bf613d0785..f668b76cf8 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 fef1e1180d479293b23569190ddfaff5643737f3da065f8954c24b3a1030ea71 qtwebchannel-fca83088ef430f96257d2014e77d08bd350259af.tar.bz2 +sha256 d5215daf4c023f1ae256230155e42e8b8806d0166d8c9609251de5e0a93911c9 qtwebchannel-2a157921861e651f43456cb7941b250c89feb736.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 fe509045b9..e72ff03944 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = fca83088ef430f96257d2014e77d08bd350259af +QT5WEBCHANNEL_VERSION = 2a157921861e651f43456cb7941b250c89feb736 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 -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 ---- - .../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();\ - "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();\ - "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({}),".format(name)), -- filter(None, callback_names)) -+ entry_nodes = list( -+ map( -+ lambda name: TextNode("reinterpret_cast({}),".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, { - 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 {{member.v8_value}}; -@@ -147,9 +147,9 @@ bool toV8{{cpp_class}}(const {{cpp_class}}* impl, v8::Local 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 {{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 = HashMapGetExecutionContext())) { -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 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/0003-Remove-unused-python-import.patch b/package/qt5/qt5webengine-chromium/0002-Remove-unused-python-import.patch similarity index 100% rename from package/qt5/qt5webengine-chromium/0003-Remove-unused-python-import.patch rename to package/qt5/qt5webengine-chromium/0002-Remove-unused-python-import.patch diff --git a/package/qt5/qt5webengine-chromium/0003-Migrate-presubmit-to-python3.patch b/package/qt5/qt5webengine-chromium/0003-Migrate-presubmit-to-python3.patch new file mode 100644 index 0000000000..809fc71ec9 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0003-Migrate-presubmit-to-python3.patch @@ -0,0 +1,49 @@ +From 71d96b9be632b5231b28277d9e72f6a6c5308e24 Mon Sep 17 00:00:00 2001 +From: Dan Harrington +Date: Fri, 4 Jun 2021 16:46:25 +0000 +Subject: [PATCH] Migrate presubmit to python3 + +Fixed a couple warnings I found when running the unit +tests in python3. + +Bug: 1212110 +Change-Id: I3d1b5859b5c517ad5eea30cb816fad0389715f73 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2934203 +Reviewed-by: Jesse Doherty +Commit-Queue: Dan H +Cr-Commit-Position: refs/heads/master@{#889331} +Upstream: https://github.com/chromium/chromium/commit/f90f49df8db04dcb72f7ce0c4d0b2fe329bab00c +Signed-off-by: Thomas Petazzoni +--- + chromium/tools/metrics/ukm/PRESUBMIT.py | 2 ++ + chromium/tools/metrics/ukm/gen_builders_test.py | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/chromium/tools/metrics/ukm/PRESUBMIT.py b/chromium/tools/metrics/ukm/PRESUBMIT.py +index 28fab1cffb7..99b13be681b 100644 +--- a/chromium/tools/metrics/ukm/PRESUBMIT.py ++++ b/chromium/tools/metrics/ukm/PRESUBMIT.py +@@ -8,6 +8,8 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts + for more details on the presubmit API built into gcl. + """ + ++USE_PYTHON3 = True ++ + UKM_XML = 'ukm.xml' + + +diff --git a/chromium/tools/metrics/ukm/gen_builders_test.py b/chromium/tools/metrics/ukm/gen_builders_test.py +index 1ca15e52c9a..0015320a524 100755 +--- a/chromium/tools/metrics/ukm/gen_builders_test.py ++++ b/chromium/tools/metrics/ukm/gen_builders_test.py +@@ -25,8 +25,8 @@ class GenBuildersTest(unittest.TestCase): + + def testGenerateCode(self): + relpath = '.' +- data = ukm_model.UKM_XML_TYPE.Parse( +- open('../../tools/metrics/ukm/ukm.xml').read()) ++ with open('../../tools/metrics/ukm/ukm.xml') as f: ++ data = ukm_model.UKM_XML_TYPE.Parse(f.read()) + event = data[ukm_model._EVENT_TYPE.tag][0] + metric = event[ukm_model._METRIC_TYPE.tag][0] + self.assertIsNotNone(event) diff --git a/package/qt5/qt5webengine-chromium/0004-Migrate-presubmit-to-python3.patch b/package/qt5/qt5webengine-chromium/0004-Migrate-presubmit-to-python3.patch deleted file mode 100644 index 9314e30c5c..0000000000 --- a/package/qt5/qt5webengine-chromium/0004-Migrate-presubmit-to-python3.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 71d96b9be632b5231b28277d9e72f6a6c5308e24 Mon Sep 17 00:00:00 2001 -From: Dan Harrington -Date: Fri, 4 Jun 2021 16:46:25 +0000 -Subject: [PATCH] Migrate presubmit to python3 - -Fixed a couple warnings I found when running the unit -tests in python3. - -Bug: 1212110 -Change-Id: I3d1b5859b5c517ad5eea30cb816fad0389715f73 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2934203 -Reviewed-by: Jesse Doherty -Commit-Queue: Dan H -Cr-Commit-Position: refs/heads/master@{#889331} -Upstream: https://github.com/chromium/chromium/commit/f90f49df8db04dcb72f7ce0c4d0b2fe329bab00c -Signed-off-by: Thomas Petazzoni ---- - chromium/tools/metrics/ukm/PRESUBMIT.py | 2 + - .../tools/metrics/ukm/gen_builders_test.py | 4 +- - chromium/tools/metrics/ukm/ukm_model.py | 56 +++++++++++-------- - 3 files changed, 37 insertions(+), 25 deletions(-) - -diff --git a/chromium/tools/metrics/ukm/PRESUBMIT.py b/chromium/tools/metrics/ukm/PRESUBMIT.py -index 28fab1cffb7..99b13be681b 100644 ---- a/chromium/tools/metrics/ukm/PRESUBMIT.py -+++ b/chromium/tools/metrics/ukm/PRESUBMIT.py -@@ -8,6 +8,8 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts - for more details on the presubmit API built into gcl. - """ - -+USE_PYTHON3 = True -+ - UKM_XML = 'ukm.xml' - - -diff --git a/chromium/tools/metrics/ukm/gen_builders_test.py b/chromium/tools/metrics/ukm/gen_builders_test.py -index 1ca15e52c9a..0015320a524 100755 ---- a/chromium/tools/metrics/ukm/gen_builders_test.py -+++ b/chromium/tools/metrics/ukm/gen_builders_test.py -@@ -25,8 +25,8 @@ class GenBuildersTest(unittest.TestCase): - - def testGenerateCode(self): - relpath = '.' -- data = ukm_model.UKM_XML_TYPE.Parse( -- open('../../tools/metrics/ukm/ukm.xml').read()) -+ with open('../../tools/metrics/ukm/ukm.xml') as f: -+ data = ukm_model.UKM_XML_TYPE.Parse(f.read()) - event = data[ukm_model._EVENT_TYPE.tag][0] - metric = event[ukm_model._METRIC_TYPE.tag][0] - self.assertIsNotNone(event) -diff --git a/chromium/tools/metrics/ukm/ukm_model.py b/chromium/tools/metrics/ukm/ukm_model.py -index ec24dd57360..b36899db189 100644 ---- a/chromium/tools/metrics/ukm/ukm_model.py -+++ b/chromium/tools/metrics/ukm/ukm_model.py -@@ -39,15 +39,16 @@ _INDEX_TYPE = models.ObjectNodeType( - ], - single_line=True) - --_STATISTICS_TYPE = models.ObjectNodeType( -+_STATISTICS_TYPE = models.ObjectNodeType( - 'statistics', - attributes=[ -- ('export', str, r'^(?i)(|true|false)$'), -+ ('export', str, r'(?i)^(|true|false)$'), - ], - children=[ - models.ChildType(_QUANTILES_TYPE.tag, _QUANTILES_TYPE, multiple=False), -- models.ChildType( -- _ENUMERATION_TYPE.tag, _ENUMERATION_TYPE, multiple=False), -+ models.ChildType(_ENUMERATION_TYPE.tag, -+ _ENUMERATION_TYPE, -+ multiple=False), - ]) - - _HISTORY_TYPE = models.ObjectNodeType( -@@ -90,25 +91,34 @@ _METRIC_TYPE = models.ObjectNodeType( - _AGGREGATION_TYPE.tag, _AGGREGATION_TYPE, multiple=True), - ]) - --_EVENT_TYPE = models.ObjectNodeType( -- 'event', -- attributes=[ -- ('name', str, r'^[A-Za-z0-9.]+$'), -- ('singular', str, r'^(?i)(|true|false)$'), -- ], -- alphabetization=[ -- (_OBSOLETE_TYPE.tag, _KEEP_ORDER), -- (_OWNER_TYPE.tag, _KEEP_ORDER), -- (_SUMMARY_TYPE.tag, _KEEP_ORDER), -- (_METRIC_TYPE.tag, _LOWERCASE_FN('name')), -- ], -- extra_newlines=(1, 1, 1), -- children=[ -- models.ChildType(_OBSOLETE_TYPE.tag, _OBSOLETE_TYPE, multiple=False), -- models.ChildType(_OWNER_TYPE.tag, _OWNER_TYPE, multiple=True), -- models.ChildType(_SUMMARY_TYPE.tag, _SUMMARY_TYPE, multiple=False), -- models.ChildType(_METRIC_TYPE.tag, _METRIC_TYPE, multiple=True), -- ]) -+_EVENT_TYPE = models.ObjectNodeType('event', -+ attributes=[ -+ ('name', str, r'^[A-Za-z0-9.]+$'), -+ ('singular', str, -+ r'(?i)^(|true|false)$'), -+ ], -+ alphabetization=[ -+ (_OBSOLETE_TYPE.tag, _KEEP_ORDER), -+ (_OWNER_TYPE.tag, _KEEP_ORDER), -+ (_SUMMARY_TYPE.tag, _KEEP_ORDER), -+ (_METRIC_TYPE.tag, -+ _LOWERCASE_FN('name')), -+ ], -+ extra_newlines=(1, 1, 1), -+ children=[ -+ models.ChildType(_OBSOLETE_TYPE.tag, -+ _OBSOLETE_TYPE, -+ multiple=False), -+ models.ChildType(_OWNER_TYPE.tag, -+ _OWNER_TYPE, -+ multiple=True), -+ models.ChildType(_SUMMARY_TYPE.tag, -+ _SUMMARY_TYPE, -+ multiple=False), -+ models.ChildType(_METRIC_TYPE.tag, -+ _METRIC_TYPE, -+ multiple=True), -+ ]) - - _UKM_CONFIGURATION_TYPE = models.ObjectNodeType( - 'ukm-configuration', --- -2.25.1 - diff --git a/package/qt5/qt5webengine-chromium/0005-tools-grit-grit-util.py-fix-Python-3.12-build-issue.patch b/package/qt5/qt5webengine-chromium/0004-tools-grit-grit-util.py-fix-Python-3.12-build-issue.patch similarity index 100% rename from package/qt5/qt5webengine-chromium/0005-tools-grit-grit-util.py-fix-Python-3.12-build-issue.patch rename to package/qt5/qt5webengine-chromium/0004-tools-grit-grit-util.py-fix-Python-3.12-build-issue.patch diff --git a/package/qt5/qt5webengine-chromium/0006-Fix-build-in-Python-3.11-invalid-mode-rU.patch b/package/qt5/qt5webengine-chromium/0005-Fix-build-in-Python-3.11-invalid-mode-rU.patch similarity index 75% rename from package/qt5/qt5webengine-chromium/0006-Fix-build-in-Python-3.11-invalid-mode-rU.patch rename to package/qt5/qt5webengine-chromium/0005-Fix-build-in-Python-3.11-invalid-mode-rU.patch index 61d45b1876..a2f838fa56 100644 --- a/package/qt5/qt5webengine-chromium/0006-Fix-build-in-Python-3.11-invalid-mode-rU.patch +++ b/package/qt5/qt5webengine-chromium/0005-Fix-build-in-Python-3.11-invalid-mode-rU.patch @@ -21,8 +21,7 @@ Upstream: https://github.com/chromium/chromium/commit/0991fc6acd3c85472000f2055a Signed-off-by: Thomas Petazzoni --- chromium/PRESUBMIT_test_mocks.py | 2 +- - chromium/tools/grit/grit/util.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/PRESUBMIT_test_mocks.py b/chromium/PRESUBMIT_test_mocks.py index 0a9e5a54ecd..6b0eca1e1c2 100644 @@ -37,19 +36,3 @@ index 0a9e5a54ecd..6b0eca1e1c2 100644 if hasattr(filename, 'AbsoluteLocalPath'): filename = filename.AbsoluteLocalPath() for file_ in self.files: -diff --git a/chromium/tools/grit/grit/util.py b/chromium/tools/grit/grit/util.py -index 77db06adffb..27f9aba5aa3 100644 ---- a/chromium/tools/grit/grit/util.py -+++ b/chromium/tools/grit/grit/util.py -@@ -210,7 +210,7 @@ def ReadFile(filename, encoding): - mode = 'rb' - encoding = None - else: -- mode = 'rU' -+ mode = 'r' - - with io.open(abs(filename), mode, encoding=encoding) as f: - return f.read() --- -2.25.1 - diff --git a/package/qt5/qt5webengine-chromium/0008-protobuf-python-google-protobuf-internal-python_mess.patch b/package/qt5/qt5webengine-chromium/0006-protobuf-python-google-protobuf-internal-python_mess.patch similarity index 100% rename from package/qt5/qt5webengine-chromium/0008-protobuf-python-google-protobuf-internal-python_mess.patch rename to package/qt5/qt5webengine-chromium/0006-protobuf-python-google-protobuf-internal-python_mess.patch diff --git a/package/qt5/qt5webengine-chromium/0007-Replace-imp.load_source-with-importlib-equivalent.patch b/package/qt5/qt5webengine-chromium/0007-Replace-imp.load_source-with-importlib-equivalent.patch deleted file mode 100644 index d001a887fa..0000000000 --- a/package/qt5/qt5webengine-chromium/0007-Replace-imp.load_source-with-importlib-equivalent.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d08221f81f35f2755088c2a174cfdc230eb1dcc4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= -Date: Wed, 25 Oct 2023 06:20:54 +0000 -Subject: [PATCH] Replace imp.load_source with importlib equivalent. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The imp module has been deprecated for years and the function -load_source was even removed from the documentation long ago. - -It will be removed in Python 3.12, which will be part of Fedora -version 39, due in late October 2023. - -Bug: 1487454 -Change-Id: If06a2f139225b62c7bdc70c3eaef6e5acb8972d2 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4894238 -Reviewed-by: Mustafa Emre Acer -Commit-Queue: Jacobo Aragunde Pérez -Cr-Commit-Position: refs/heads/main@{#1214660} -Upstream: https://github.com/chromium/chromium/commit/9e0c89a3b5638ba2b9b107fea34a01c774aa7805 -Signed-off-by: Thomas Petazzoni ---- - .../resources/protobufs/binary_proto_generator.py | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/chromium/components/resources/protobufs/binary_proto_generator.py b/chromium/components/resources/protobufs/binary_proto_generator.py -index 16365515f26..c8b11f1071a 100755 ---- a/chromium/components/resources/protobufs/binary_proto_generator.py -+++ b/chromium/components/resources/protobufs/binary_proto_generator.py -@@ -9,7 +9,7 @@ - """ - from __future__ import print_function - import abc --import imp -+from importlib import util as imp_util - import optparse - import os - import re -@@ -68,7 +68,11 @@ class GoogleProtobufModuleImporter: - raise ImportError(fullname) - - filepath = self._fullname_to_filepath(fullname) -- return imp.load_source(fullname, filepath) -+ spec = imp_util.spec_from_file_location(fullname, filepath) -+ loaded = imp_util.module_from_spec(spec) -+ spec.loader.exec_module(loaded) -+ -+ return loaded - - class BinaryProtoGenerator: - --- -2.25.1 - diff --git a/package/qt5/qt5webengine-chromium/0009-chromium-gpu-command_buffer-service-program_manager..patch b/package/qt5/qt5webengine-chromium/0007-chromium-gpu-command_buffer-service-program_manager..patch similarity index 100% rename from package/qt5/qt5webengine-chromium/0009-chromium-gpu-command_buffer-service-program_manager..patch rename to package/qt5/qt5webengine-chromium/0007-chromium-gpu-command_buffer-service-program_manager..patch diff --git a/package/qt5/qt5webengine-chromium/0011-Shorted-printed-cmd-when-long-commands-fail.patch b/package/qt5/qt5webengine-chromium/0008-Shorted-printed-cmd-when-long-commands-fail.patch similarity index 100% rename from package/qt5/qt5webengine-chromium/0011-Shorted-printed-cmd-when-long-commands-fail.patch rename to package/qt5/qt5webengine-chromium/0008-Shorted-printed-cmd-when-long-commands-fail.patch diff --git a/package/qt5/qt5webengine-chromium/0009-Include-cstdint-for-uintptr_t-uint8_t-etc.patch b/package/qt5/qt5webengine-chromium/0009-Include-cstdint-for-uintptr_t-uint8_t-etc.patch new file mode 100644 index 0000000000..1715d425df --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0009-Include-cstdint-for-uintptr_t-uint8_t-etc.patch @@ -0,0 +1,297 @@ +From 80ddc04dd2398611afd8eafd89f5a6cd81b82363 Mon Sep 17 00:00:00 2001 +From: Arnout Vandecappelle +Date: Sun, 18 May 2025 09:59:24 +0200 +Subject: [PATCH] Include for uintptr_t, uint8_t, etc. + +GCC 15 adheres more strictly to the standard about which type is defined +in which header. As such, uintptr_t, uint8_t, etc. are no longer +available unless cstdint is included. + +Add #include in the files that gave errors with GCC 15 + +Most (all?) of these fixes are already upstream, but spread out over +various commits that don't necessarily apply to our version. Fixing it +ourselves is simpler. + +Signed-off-by: Arnout Vandecappelle +Upstream: N/A, already fixed and we're very far behind +[added additional cstdint imports for qt5.15.18 bump] +Signed-off-by: Quentin Schulz +--- + chromium/base/task/thread_pool.h | 1 + + chromium/gpu/command_buffer/common/skia_utils.h | 1 + + chromium/gpu/command_buffer/service/gpu_fence_manager.h | 1 + + chromium/net/tools/huffman_trie/trie_entry.h | 1 + + .../transport_security_state_entry.h | 1 + + chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h | 1 + + .../pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h | 1 + + chromium/third_party/pdfium/core/fxcodec/jbig2/jbig2_decoder.h | 1 + + chromium/third_party/pdfium/third_party/base/span.h | 1 + + .../perfetto/include/perfetto/ext/tracing/core/slice.h | 1 + + .../perfetto/include/perfetto/tracing/tracing_backend.h | 1 + + .../perfetto/src/trace_processor/importers/gzip/gzip_utils.h | 1 + + chromium/third_party/webrtc/api/fec_controller.h | 1 + + chromium/third_party/webrtc/api/network_state_predictor.h | 1 + + chromium/third_party/webrtc/api/task_queue/task_queue_base.h | 1 + + chromium/third_party/webrtc/common_video/h264/pps_parser.h | 2 ++ + chromium/third_party/webrtc/common_video/h264/sps_parser.h | 2 ++ + .../webrtc/modules/include/module_common_types_public.h | 1 + + .../third_party/webrtc/modules/video_coding/timestamp_map.h | 1 + + chromium/third_party/webrtc/video/stats_counter.h | 1 + + chromium/third_party/woff2/include/woff2/output.h | 1 + + 21 files changed, 23 insertions(+) + +diff --git a/chromium/base/task/thread_pool.h b/chromium/base/task/thread_pool.h +index 085c249ba58..afc674ca7f6 100644 +--- a/chromium/base/task/thread_pool.h ++++ b/chromium/base/task/thread_pool.h +@@ -5,6 +5,7 @@ + #ifndef BASE_TASK_THREAD_POOL_H_ + #define BASE_TASK_THREAD_POOL_H_ + ++#include + #include + #include + +diff --git a/chromium/gpu/command_buffer/common/skia_utils.h b/chromium/gpu/command_buffer/common/skia_utils.h +index 6508d79a1d4..a9f9528f133 100644 +--- a/chromium/gpu/command_buffer/common/skia_utils.h ++++ b/chromium/gpu/command_buffer/common/skia_utils.h +@@ -5,6 +5,7 @@ + #ifndef GPU_COMMAND_BUFFER_COMMON_SKIA_UTILS_H_ + #define GPU_COMMAND_BUFFER_COMMON_SKIA_UTILS_H_ + ++#include + #include + + #include "base/optional.h" +diff --git a/chromium/gpu/command_buffer/service/gpu_fence_manager.h b/chromium/gpu/command_buffer/service/gpu_fence_manager.h +index ee50d6fddd1..576f6e3bc8a 100644 +--- a/chromium/gpu/command_buffer/service/gpu_fence_manager.h ++++ b/chromium/gpu/command_buffer/service/gpu_fence_manager.h +@@ -5,6 +5,7 @@ + #ifndef GPU_COMMAND_BUFFER_SERVICE_GPU_FENCE_MANAGER_H_ + #define GPU_COMMAND_BUFFER_SERVICE_GPU_FENCE_MANAGER_H_ + ++#include + #include + #include + +diff --git a/chromium/net/tools/huffman_trie/trie_entry.h b/chromium/net/tools/huffman_trie/trie_entry.h +index fe70260f981..eac6a7fc249 100644 +--- a/chromium/net/tools/huffman_trie/trie_entry.h ++++ b/chromium/net/tools/huffman_trie/trie_entry.h +@@ -5,6 +5,7 @@ + #ifndef NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_ + #define NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_ + ++#include + #include + #include + #include +diff --git a/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h b/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h +index 59059d88f6d..fe15bb7429f 100644 +--- a/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h ++++ b/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h +@@ -5,6 +5,7 @@ + #ifndef NET_TOOLS_TRANSPORT_SECURITY_STATE_GENERATOR_TRANSPORT_SECURITY_STATE_ENTRY_H_ + #define NET_TOOLS_TRANSPORT_SECURITY_STATE_GENERATOR_TRANSPORT_SECURITY_STATE_ENTRY_H_ + ++#include + #include + #include + #include +diff --git a/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h b/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h +index fd68b6b49d3..dc7c015d56c 100644 +--- a/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h ++++ b/chromium/third_party/pdfium/core/fpdfapi/page/cpdf_function.h +@@ -7,6 +7,7 @@ + #ifndef CORE_FPDFAPI_PAGE_CPDF_FUNCTION_H_ + #define CORE_FPDFAPI_PAGE_CPDF_FUNCTION_H_ + ++#include + #include + #include + #include +diff --git a/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h b/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h +index 9bcdd371e79..5921794f1f3 100644 +--- a/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h ++++ b/chromium/third_party/pdfium/core/fxcodec/jbig2/JBig2_DocumentContext.h +@@ -7,6 +7,7 @@ + #ifndef CORE_FXCODEC_JBIG2_JBIG2_DOCUMENTCONTEXT_H_ + #define CORE_FXCODEC_JBIG2_JBIG2_DOCUMENTCONTEXT_H_ + ++#include + #include + #include + #include +diff --git a/chromium/third_party/pdfium/core/fxcodec/jbig2/jbig2_decoder.h b/chromium/third_party/pdfium/core/fxcodec/jbig2/jbig2_decoder.h +index 97867ca851c..a0ac6bd4ba5 100644 +--- a/chromium/third_party/pdfium/core/fxcodec/jbig2/jbig2_decoder.h ++++ b/chromium/third_party/pdfium/core/fxcodec/jbig2/jbig2_decoder.h +@@ -7,6 +7,7 @@ + #ifndef CORE_FXCODEC_JBIG2_JBIG2_DECODER_H_ + #define CORE_FXCODEC_JBIG2_JBIG2_DECODER_H_ + ++#include + #include + + #include "core/fxcodec/fx_codec_def.h" +diff --git a/chromium/third_party/pdfium/third_party/base/span.h b/chromium/third_party/pdfium/third_party/base/span.h +index bb07f43a021..c06dfb87348 100644 +--- a/chromium/third_party/pdfium/third_party/base/span.h ++++ b/chromium/third_party/pdfium/third_party/base/span.h +@@ -5,6 +5,7 @@ + #ifndef THIRD_PARTY_BASE_SPAN_H_ + #define THIRD_PARTY_BASE_SPAN_H_ + ++#include + #include + + #include +diff --git a/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h b/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h +index 4ce66fdeadc..3f3932b2287 100644 +--- a/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h ++++ b/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h +@@ -20,6 +20,7 @@ + #include + #include + ++#include + #include + #include + #include +diff --git a/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h b/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h +index 67b0d2eb51e..3c2462de588 100644 +--- a/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h ++++ b/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h +@@ -17,6 +17,7 @@ + #ifndef INCLUDE_PERFETTO_TRACING_TRACING_BACKEND_H_ + #define INCLUDE_PERFETTO_TRACING_TRACING_BACKEND_H_ + ++#include + #include + #include + +diff --git a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h +index 624363ff66f..68783e879c8 100644 +--- a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h ++++ b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h +@@ -18,6 +18,7 @@ + #define SRC_TRACE_PROCESSOR_IMPORTERS_GZIP_GZIP_UTILS_H_ + + #include ++#include + + struct z_stream_s; + +diff --git a/chromium/third_party/webrtc/api/fec_controller.h b/chromium/third_party/webrtc/api/fec_controller.h +index 3e5f7bb2168..87777a53f1c 100644 +--- a/chromium/third_party/webrtc/api/fec_controller.h ++++ b/chromium/third_party/webrtc/api/fec_controller.h +@@ -11,6 +11,7 @@ + #ifndef API_FEC_CONTROLLER_H_ + #define API_FEC_CONTROLLER_H_ + ++#include + #include + #include + +diff --git a/chromium/third_party/webrtc/api/network_state_predictor.h b/chromium/third_party/webrtc/api/network_state_predictor.h +index 9cf5ab6f022..2d165baa5da 100644 +--- a/chromium/third_party/webrtc/api/network_state_predictor.h ++++ b/chromium/third_party/webrtc/api/network_state_predictor.h +@@ -11,6 +11,7 @@ + #ifndef API_NETWORK_STATE_PREDICTOR_H_ + #define API_NETWORK_STATE_PREDICTOR_H_ + ++#include + #include + #include + +diff --git a/chromium/third_party/webrtc/api/task_queue/task_queue_base.h b/chromium/third_party/webrtc/api/task_queue/task_queue_base.h +index 90b1efd31eb..63526a7383b 100644 +--- a/chromium/third_party/webrtc/api/task_queue/task_queue_base.h ++++ b/chromium/third_party/webrtc/api/task_queue/task_queue_base.h +@@ -10,6 +10,7 @@ + #ifndef API_TASK_QUEUE_TASK_QUEUE_BASE_H_ + #define API_TASK_QUEUE_TASK_QUEUE_BASE_H_ + ++#include + #include + + #include "api/task_queue/queued_task.h" +diff --git a/chromium/third_party/webrtc/common_video/h264/pps_parser.h b/chromium/third_party/webrtc/common_video/h264/pps_parser.h +index d6c31b06887..d02f544eecc 100644 +--- a/chromium/third_party/webrtc/common_video/h264/pps_parser.h ++++ b/chromium/third_party/webrtc/common_video/h264/pps_parser.h +@@ -11,6 +11,8 @@ + #ifndef COMMON_VIDEO_H264_PPS_PARSER_H_ + #define COMMON_VIDEO_H264_PPS_PARSER_H_ + ++#include ++ + #include "absl/types/optional.h" + + namespace rtc { +diff --git a/chromium/third_party/webrtc/common_video/h264/sps_parser.h b/chromium/third_party/webrtc/common_video/h264/sps_parser.h +index 76e627d27a3..0c0937eb227 100644 +--- a/chromium/third_party/webrtc/common_video/h264/sps_parser.h ++++ b/chromium/third_party/webrtc/common_video/h264/sps_parser.h +@@ -11,6 +11,8 @@ + #ifndef COMMON_VIDEO_H264_SPS_PARSER_H_ + #define COMMON_VIDEO_H264_SPS_PARSER_H_ + ++#include ++ + #include "absl/types/optional.h" + + namespace rtc { +diff --git a/chromium/third_party/webrtc/modules/include/module_common_types_public.h b/chromium/third_party/webrtc/modules/include/module_common_types_public.h +index 345e45ce127..8338a514624 100644 +--- a/chromium/third_party/webrtc/modules/include/module_common_types_public.h ++++ b/chromium/third_party/webrtc/modules/include/module_common_types_public.h +@@ -11,6 +11,7 @@ + #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ + #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ + ++#include + #include + + #include "absl/types/optional.h" +diff --git a/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h b/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h +index c85666c9aa0..dfb90e447d8 100644 +--- a/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h ++++ b/chromium/third_party/webrtc/modules/video_coding/timestamp_map.h +@@ -11,6 +11,7 @@ + #ifndef MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_ + #define MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_ + ++#include + #include + + namespace webrtc { +diff --git a/chromium/third_party/webrtc/video/stats_counter.h b/chromium/third_party/webrtc/video/stats_counter.h +index fb6017f415f..ed5530ca0f7 100644 +--- a/chromium/third_party/webrtc/video/stats_counter.h ++++ b/chromium/third_party/webrtc/video/stats_counter.h +@@ -11,6 +11,7 @@ + #ifndef VIDEO_STATS_COUNTER_H_ + #define VIDEO_STATS_COUNTER_H_ + ++#include + #include + #include + +diff --git a/chromium/third_party/woff2/include/woff2/output.h b/chromium/third_party/woff2/include/woff2/output.h +index c325f67be72..5c4dc4d1850 100644 +--- a/chromium/third_party/woff2/include/woff2/output.h ++++ b/chromium/third_party/woff2/include/woff2/output.h +@@ -10,6 +10,7 @@ + #define WOFF2_WOFF2_OUT_H_ + + #include ++#include + #include + #include + #include diff --git a/package/qt5/qt5webengine-chromium/0010-Fix-building-with-system-libxml2.patch b/package/qt5/qt5webengine-chromium/0010-Fix-building-with-system-libxml2.patch deleted file mode 100644 index 4a4dade203..0000000000 --- a/package/qt5/qt5webengine-chromium/0010-Fix-building-with-system-libxml2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 67ceca4b097a2d3de28020c9461641d9670009cc Mon Sep 17 00:00:00 2001 -From: Martin Negyokru -Date: Thu, 7 Dec 2023 15:37:53 +0100 -Subject: [PATCH] Fix building with system libxml2 - -Libxml2 2.12.0 has changed the const-ness of the -xmlError pointers, which results in a build error. - -Change-Id: Id86fcfbfe004f89109808b9bdb11c01133553884 -Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/523633 -Reviewed-by: Allan Sandfeld Jensen -(cherry picked from commit 159dff274a7f32f9b53711df6a5b6fbae8c64b4a) -Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/525714 -Reviewed-by: Qt Cherry-pick Bot -Upstream: https://github.com/qt/qtwebengine-chromium/commit/c98d28f2f0f23721 -Signed-off-by: Thomas Petazzoni ---- - .../third_party/blink/renderer/core/xml/xslt_processor.h | 5 +++++ - .../blink/renderer/core/xml/xslt_processor_libxslt.cc | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git a/chromium/third_party/blink/renderer/core/xml/xslt_processor.h b/chromium/third_party/blink/renderer/core/xml/xslt_processor.h -index e501cf17c37..e4550ec5009 100644 ---- a/chromium/third_party/blink/renderer/core/xml/xslt_processor.h -+++ b/chromium/third_party/blink/renderer/core/xml/xslt_processor.h -@@ -79,7 +79,12 @@ class XSLTProcessor final : public ScriptWrappable { - - void reset(); - -+#if LIBXML_VERSION >= 21200 -+ static void ParseErrorFunc(void* user_data, const xmlError*); -+#else - static void ParseErrorFunc(void* user_data, xmlError*); -+#endif -+ - static void GenericErrorFunc(void* user_data, const char* msg, ...); - - // Only for libXSLT callbacks -diff --git a/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc b/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -index b3ce345f320..2174d1df1da 100644 ---- a/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -+++ b/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -@@ -60,7 +60,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) { - // It would be nice to do something with this error message. - } - -+#if LIBXML_VERSION >= 21200 -+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { -+#else - void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { -+#endif - FrameConsole* console = static_cast(user_data); - if (!console) - return; --- -2.25.1 - diff --git a/package/qt5/qt5webengine-chromium/0012-Include-cstdint-for-uintptr_t-uint8_t-etc.patch b/package/qt5/qt5webengine-chromium/0012-Include-cstdint-for-uintptr_t-uint8_t-etc.patch deleted file mode 100644 index f68f266e39..0000000000 --- a/package/qt5/qt5webengine-chromium/0012-Include-cstdint-for-uintptr_t-uint8_t-etc.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 80ddc04dd2398611afd8eafd89f5a6cd81b82363 Mon Sep 17 00:00:00 2001 -From: Arnout Vandecappelle -Date: Sun, 18 May 2025 09:59:24 +0200 -Subject: [PATCH] Include for uintptr_t, uint8_t, etc. - -GCC 15 adheres more strictly to the standard about which type is defined -in which header. As such, uintptr_t, uint8_t, etc. are no longer -available unless cstdint is included. - -Add #include in the files that gave errors with GCC 15 - -Most (all?) of these fixes are already upstream, but spread out over -various commits that don't necessarily apply to our version. Fixing it -ourselves is simpler. - -Signed-off-by: Arnout Vandecappelle -Upstream: N/A, already fixed and we're very far behind ---- - chromium/base/task/thread_pool.h | 1 + - chromium/net/tools/huffman_trie/trie_entry.h | 1 + - .../transport_security_state_entry.h | 1 + - .../perfetto/include/perfetto/ext/tracing/core/slice.h | 1 + - .../perfetto/include/perfetto/tracing/tracing_backend.h | 1 + - .../perfetto/src/trace_processor/importers/gzip/gzip_utils.h | 1 + - 6 files changed, 6 insertions(+) - -diff --git a/chromium/base/task/thread_pool.h b/chromium/base/task/thread_pool.h -index 085c249ba58e6..afc674ca7f6fb 100644 ---- a/chromium/base/task/thread_pool.h -+++ b/chromium/base/task/thread_pool.h -@@ -5,6 +5,7 @@ - #ifndef BASE_TASK_THREAD_POOL_H_ - #define BASE_TASK_THREAD_POOL_H_ - -+#include - #include - #include - -diff --git a/chromium/net/tools/huffman_trie/trie_entry.h b/chromium/net/tools/huffman_trie/trie_entry.h -index fe70260f981f2..eac6a7fc2499d 100644 ---- a/chromium/net/tools/huffman_trie/trie_entry.h -+++ b/chromium/net/tools/huffman_trie/trie_entry.h -@@ -5,6 +5,7 @@ - #ifndef NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_ - #define NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_ - -+#include - #include - #include - #include -diff --git a/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h b/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h -index 59059d88f6df2..fe15bb7429f6d 100644 ---- a/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h -+++ b/chromium/net/tools/transport_security_state_generator/transport_security_state_entry.h -@@ -5,6 +5,7 @@ - #ifndef NET_TOOLS_TRANSPORT_SECURITY_STATE_GENERATOR_TRANSPORT_SECURITY_STATE_ENTRY_H_ - #define NET_TOOLS_TRANSPORT_SECURITY_STATE_GENERATOR_TRANSPORT_SECURITY_STATE_ENTRY_H_ - -+#include - #include - #include - #include -diff --git a/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h b/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h -index 4ce66fdeadc3a..3f3932b228737 100644 ---- a/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h -+++ b/chromium/third_party/perfetto/include/perfetto/ext/tracing/core/slice.h -@@ -20,6 +20,7 @@ - #include - #include - -+#include - #include - #include - #include -diff --git a/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h b/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h -index 67b0d2eb51e0d..3c2462de588dd 100644 ---- a/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h -+++ b/chromium/third_party/perfetto/include/perfetto/tracing/tracing_backend.h -@@ -17,6 +17,7 @@ - #ifndef INCLUDE_PERFETTO_TRACING_TRACING_BACKEND_H_ - #define INCLUDE_PERFETTO_TRACING_TRACING_BACKEND_H_ - -+#include - #include - #include - -diff --git a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h -index 624363ff66f90..68783e879c8e0 100644 ---- a/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h -+++ b/chromium/third_party/perfetto/src/trace_processor/importers/gzip/gzip_utils.h -@@ -18,6 +18,7 @@ - #define SRC_TRACE_PROCESSOR_IMPORTERS_GZIP_GZIP_UTILS_H_ - - #include -+#include - - struct z_stream_s; - --- -2.49.0 - diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash index 270da153c6..f5cbd4d1df 100644 --- a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 fb0953b0cc7b980f128d5f66b8345eb4fbf2e05b70db3926958fb657953b64dc qtwebengine-chromium-18c9261dc5b8aa57a0bdd5b62ce6f648cca1ef5e.tar.bz2 +sha256 c1c73b6b72a90bb345e0d4365b9e69ce05e898d1c4480a4e9444e39a1c2801da qtwebengine-chromium-85337c28bae7d7d2c79282c4f4c92435cd7649b8.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 fc48945e0d..ce1f204b3d 100644 --- a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBENGINE_CHROMIUM_VERSION = 18c9261dc5b8aa57a0bdd5b62ce6f648cca1ef5e +QT5WEBENGINE_CHROMIUM_VERSION = 85337c28bae7d7d2c79282c4f4c92435cd7649b8 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/0002-Add-python3-build-support.patch deleted file mode 100644 index 18fc1c1de0..0000000000 --- a/package/qt5/qt5webengine/0002-Add-python3-build-support.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 1e299a6c9eeb08555208b76623e453d8ab96b6e3 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Fri, 4 Feb 2022 16:16:35 -0700 -Subject: [PATCH] Add python3 build support - -Adapted from: -https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-python3.patch - -Signed-off-by: James Hilliard ---- - configure.pri | 13 ++++++------- - mkspecs/features/functions.prf | 6 +++--- - src/buildtools/config/support.pri | 10 +++++----- - src/buildtools/configure.json | 18 +++++++++--------- - 4 files changed, 23 insertions(+), 24 deletions(-) - -diff --git a/configure.pri b/configure.pri -index e072961f..6fec7b20 100644 ---- a/configure.pri -+++ b/configure.pri -@@ -13,8 +13,7 @@ defineTest(isPythonVersionSupported) { - python_version = $$split(python_version, ',') - python_major_version = $$first(python_version) - greaterThan(python_major_version, 2) { -- qtLog("Python version 3 is not supported by Chromium.") -- return(false) -+ return(true) - } - python_minor_version = $$member(python_version, 1) - python_patch_version = $$member(python_version, 2) -@@ -52,10 +51,10 @@ defineTest(qtConfReport_jumboBuild) { - qtConfReportPadded($${1}, $$mergeLimit) - } - --defineTest(qtConfTest_detectPython2) { -- python = $$qtConfFindInPath("python2$$EXE_SUFFIX") -+defineTest(qtConfTest_detectPython) { -+ python = $$qtConfFindInPath("python$$EXE_SUFFIX") - isEmpty(python) { -- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") -+ qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") - python = $$qtConfFindInPath("python$$EXE_SUFFIX") - } - isEmpty(python) { -@@ -63,11 +62,11 @@ defineTest(qtConfTest_detectPython2) { - return(false) - } - !isPythonVersionSupported($$python) { -- qtLog("A suitable Python 2 executable could not be located.") -+ qtLog("A suitable Python executable could not be located.") - return(false) - } - -- # Make tests.python2.location available in configure.json. -+ # Make tests.python.location available in configure.json. - $${1}.location = $$clean_path($$python) - export($${1}.location) - $${1}.cache += location -diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf -index 2750d707..9fda13d0 100644 ---- a/mkspecs/features/functions.prf -+++ b/mkspecs/features/functions.prf -@@ -39,11 +39,11 @@ defineReplace(which) { - - # Returns the unquoted path to the python executable. - defineReplace(pythonPath) { -- isEmpty(QMAKE_PYTHON2) { -+ isEmpty(QMAKE_PYTHON) { - # Fallback for building QtWebEngine with Qt < 5.8 -- QMAKE_PYTHON2 = python -+ QMAKE_PYTHON = python - } -- return($$QMAKE_PYTHON2) -+ return($$QMAKE_PYTHON) - } - - # Returns the python executable for use with shell / make targets. -diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri -index e7f869a1..1bf2c5d7 100644 ---- a/src/buildtools/config/support.pri -+++ b/src/buildtools/config/support.pri -@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { - !qtwebengine_checkForGperf(QtWebEngine):return(false) - !qtwebengine_checkForBison(QtWebEngine):return(false) - !qtwebengine_checkForFlex(QtWebEngine):return(false) -- !qtwebengine_checkForPython2(QtWebEngine):return(false) -+ !qtwebengine_checkForPython(QtWebEngine):return(false) - !qtwebengine_checkForNodejs(QtWebEngine):return(false) - !qtwebengine_checkForSanitizer(QtWebEngine):return(false) - linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) -@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError) { - !qtwebengine_checkForGperf(QtPdf):return(false) - !qtwebengine_checkForBison(QtPdf):return(false) - !qtwebengine_checkForFlex(QtPdf):return(false) -- !qtwebengine_checkForPython2(QtPdf):return(false) -+ !qtwebengine_checkForPython(QtPdf):return(false) - !qtwebengine_checkForSanitizer(QtPdf):return(false) - linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) - linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) -@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) { - return(true) - } - --defineTest(qtwebengine_checkForPython2) { -+defineTest(qtwebengine_checkForPython) { - module = $$1 -- !qtConfig(webengine-python2) { -- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.") -+ !qtConfig(webengine-python) { -+ qtwebengine_skipBuild("Python is required to build $${module}.") - return(false) - } - return(true) -diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json -index 88d1790c..032aa665 100644 ---- a/src/buildtools/configure.json -+++ b/src/buildtools/configure.json -@@ -295,9 +295,9 @@ - "label": "system ninja", - "type": "detectNinja" - }, -- "webengine-python2": { -- "label": "python2", -- "type": "detectPython2", -+ "webengine-python": { -+ "label": "python", -+ "type": "detectPython", - "log": "location" - }, - "webengine-winversion": { -@@ -374,7 +374,7 @@ - && features.webengine-gperf - && features.webengine-bison - && features.webengine-flex -- && features.webengine-python2 -+ && features.webengine-python - && features.webengine-nodejs - && (!config.sanitizer || features.webengine-sanitizer) - && (!config.linux || features.pkg-config) -@@ -400,7 +400,7 @@ - && features.webengine-gperf - && features.webengine-bison - && features.webengine-flex -- && features.webengine-python2 -+ && features.webengine-python - && (!config.sanitizer || features.webengine-sanitizer) - && (!config.linux || features.pkg-config) - && (!config.linux || features.webengine-host-pkg-config) -@@ -423,12 +423,12 @@ - "autoDetect": "features.private_tests", - "output": [ "privateFeature" ] - }, -- "webengine-python2": { -- "label": "python2", -- "condition": "tests.webengine-python2", -+ "webengine-python": { -+ "label": "python", -+ "condition": "tests.webengine-python", - "output": [ - "privateFeature", -- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } -+ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" } - ] - }, - "webengine-gperf": { --- -2.25.1 - diff --git a/package/qt5/qt5webengine/0003-configure.pri-remove-some-of-the-thumb-detection-log.patch b/package/qt5/qt5webengine/0002-configure.pri-remove-some-of-the-thumb-detection-log.patch similarity index 96% rename from package/qt5/qt5webengine/0003-configure.pri-remove-some-of-the-thumb-detection-log.patch rename to package/qt5/qt5webengine/0002-configure.pri-remove-some-of-the-thumb-detection-log.patch index 57ed3558bc..1ad103cd0e 100644 --- a/package/qt5/qt5webengine/0003-configure.pri-remove-some-of-the-thumb-detection-log.patch +++ b/package/qt5/qt5webengine/0002-configure.pri-remove-some-of-the-thumb-detection-log.patch @@ -46,10 +46,10 @@ upstream, so not sent. 1 file changed, 8 deletions(-) diff --git a/configure.pri b/configure.pri -index 8da334c83..3ff298e9f 100644 +index cb53c93b0..73a0e7a2a 100644 --- a/configure.pri +++ b/configure.pri -@@ -370,14 +370,6 @@ defineTest(qtConfTest_hasThumbFlag) { +@@ -384,14 +384,6 @@ defineTest(qtConfTest_hasThumbFlag) { !isEmpty(FLAG): return(true) FLAG = $$qtwebengine_extractCFlag("-marm") !isEmpty(FLAG): return(false) diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index fcd6d4d3d6..fe140df9ae 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 f760fbc14fec8fed3485cb757986e459f7b150cfc8484aced1116158f6b8a656 qtwebengine-v5.15.14-lts.tar.bz2 +sha256 8fa9d026fe0d04cb436ab7a66cdf249d189a91b61c565a1564a9bf05c7c73f7a qtwebengine-v5.15.18-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index c7fe153f7c..212b6829b5 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 00c915dc0f909d91c13aae4fb39e83e7c4bb5b8c6ad98de9f4e1e44f699cc605 qtwebsockets-dbbdc64b804f7c4d0ed92198aaab49b07fa15e7f.tar.bz2 +sha256 565f37e5d4c497c0b60a3411afe64d11f254c7fbc1e558c39b77b41cabb39ebf qtwebsockets-0f910acb737cefc889ce1088fc60d15bc18efe9c.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 565894e0ba..c3a97adbe0 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = dbbdc64b804f7c4d0ed92198aaab49b07fa15e7f +QT5WEBSOCKETS_VERSION = 0f910acb737cefc889ce1088fc60d15bc18efe9c 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 55aedd54e6..dbaa068d20 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7b5bf69f3037f55a8ff7b9e153bfa5a42dcdecb322ce2749ace8f11562a0780d qtwebview-bbb1891595aba23ff3c6d137aa74442f9e54479b.tar.bz2 +sha256 efcc711f71fdccd58ea3d43c5ca259a38b99222882459de545e81614963baaba qtwebview-34342073a59f3a27ef3de02f6b21337c4f8db6cf.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 310bfbba42..2b3e554ac3 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBVIEW_VERSION = bbb1891595aba23ff3c6d137aa74442f9e54479b +QT5WEBVIEW_VERSION = 34342073a59f3a27ef3de02f6b21337c4f8db6cf 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 a84df3f2e2..07cda343b6 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 85943a927c6e07a2a7b2cdf2b6006b554cd9b52271d8892f6475fe9db67d16f3 qtx11extras-6c3605fcb3b34e55951f597e06c135d97dfa6cd7.tar.bz2 +sha256 b10784b71e6ed9451d4b52c74e512f4bb61f1fed1a1da6c263210935bdbbbd3a qtx11extras-c44c4fa86fa0794c25baef4ee1f6272aca8c511a.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 922730c4d7..93e61677de 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = 6c3605fcb3b34e55951f597e06c135d97dfa6cd7 +QT5X11EXTRAS_VERSION = c44c4fa86fa0794c25baef4ee1f6272aca8c511a 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 9531c02e53..e97ad378e7 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2dcac1941b2510ea6fd85fe700fead9443f737e93cc12bf9b90dc6b71ff8d844 qtxmlpatterns-087f6f35bd027f940818b1696d0aad822e034377.tar.bz2 +sha256 ef029d2ce7ce5226d777640783b2d953bf57b23e9d3be3c08149b838e45d0a31 qtxmlpatterns-0b644263abca66503db1ce8a4e126cf358a34685.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 d346d92f7b..b098cb8034 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = 087f6f35bd027f940818b1696d0aad822e034377 +QT5XMLPATTERNS_VERSION = 0b644263abca66503db1ce8a4e126cf358a34685 QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES