From 48da0529c59c245c53f982ebcc674750669b5979 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 25 Sep 2017 10:29:24 +0300 Subject: qt5: update submodules Update submodules to first 5.9.2 branch snapshot Change-Id: If1a6cff5a23bfa1e72b65b5d1f679a3ff64f7c6c Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- .../0001-Make-mapbox-gl-build-configurable.patch | 27 ---------------------- recipes-qt/qt5/qtlocation_git.bb | 9 ++------ recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- ...qtbug-61521.cpp-use-free-instead-of-cfree.patch | 25 -------------------- recipes-qt/qt5/qtwebengine_git.bb | 5 ++-- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 33 files changed, 33 insertions(+), 91 deletions(-) delete mode 100644 recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 57e6093d..98690370 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -197,4 +197,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "0f11fab6f75dec78d3721280971448cc2edd6e72" +SRCREV = "807fa90b32466fd936704459884c12214d8a254f" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 7ffc6a49..48820c16 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -37,6 +37,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "595b4add0ce6f32bb8ffc56b3a59e6e5bf0b000a" +SRCREV = "72e80520d36802672eca1e93bc6c6019e6f5ffc3" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 4ff86522..04e63068 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -114,4 +114,4 @@ do_install() { install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} } -SRCREV = "0f11fab6f75dec78d3721280971448cc2edd6e72" +SRCREV = "807fa90b32466fd936704459884c12214d8a254f" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 89e1b4ca..d8aeca89 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -222,4 +222,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "0f11fab6f75dec78d3721280971448cc2edd6e72" +SRCREV = "807fa90b32466fd936704459884c12214d8a254f" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index f46cbc2c..17479e2f 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "25447e889dc43c0831100bee1625a6f667d364cf" +SRCREV = "a1aee8ecbefb74cd5eae380ced56bb43ff3cc40b" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index d90b9f62..da6e999f 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "5261307d061a2b925faffb6ea21aa3dbca1e50a9" +SRCREV = "e3af14e9169207e0e73f7e50191106895c29ddc4" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 9e91a1d4..030a40f3 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4" +SRCREV = "ae21b2574c0000aac6e3b10f7e11ebd1da567ffd" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 3737e107..7c8eda76 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f" +SRCREV = "8329a8fb287094012989b965604ff9c9426f022a" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index c409ae6c..c00895be 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -33,6 +33,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "2c45bdb0e2433b2246d985b61348f8caa6e5926b" +SRCREV = "960bebd61f70c39e2fbce9f67b889cd64f48cea7" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index a771d9da..7e6cb1b2 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "1fc40deed6993265c436783cc367285bf9a2266a" +SRCREV = "167566d228792c0f763b84a39ff5dc52fda046dd" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 6c6f3aef..f2b7d2e9 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "b6ff12df5496f3d296bb438ae343d5f771e93fec" +SRCREV = "8c4488a77d5fe4fed26b22dbc91b746a77cd0562" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 1e022f4a..a0d6a0dd 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "144a3535db9f95e60972d3c3b6eaceb65a604577" +SRCREV = "0d42a2e44491980e6803d6aee6c7d2e83acadec4" diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch deleted file mode 100644 index 5ed06f3b..00000000 --- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a7e5dcb12a7fad02206b89ba20a99726df7d6f4b Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Wed, 7 Jun 2017 13:29:29 +0300 -Subject: [PATCH] Make mapbox-gl build configurable - -mapbox-gl-native won't compile for ARMv5 or older, so disable the -build by default. - -Task-number: QTBUG-61289 -Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b ---- - src/plugins/geoservices/geoservices.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro -index 07c3479..55d0040 100644 ---- a/src/plugins/geoservices/geoservices.pro -+++ b/src/plugins/geoservices/geoservices.pro -@@ -6,7 +6,7 @@ qtConfig(concurrent) { - SUBDIRS += osm - } - --qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { -+mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx { - !exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) { - warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") - } else { diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 268bea1d..cce66017 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -13,17 +13,12 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" -SRC_URI += " \ - file://0001-Make-mapbox-gl-build-configurable.patch \ -" - PACKAGECONFIG ??= "" # older geoclue 0.12.99 is needed PACKAGECONFIG[geoclue] = ",,geoclue" PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" -PACKAGECONFIG[mapboxgl] = "" +PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl" -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'mapboxgl', 'CONFIG+=mapboxgl', '', d)}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" # The same issue as in qtbase: @@ -34,7 +29,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "d22e6d09f1607e694694d2ae5b2f447605a8782e" +SRCREV_qtlocation = "d919f47308b209c798e50d8ca1b9abd48ba94718" SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 729b3ffd..f42bdc27 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -35,4 +35,4 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "343e281f0e7cc7fd9e1558e4d92f5019fa565181" +SRCREV = "1e2702e86dbd2b3de69c58438bcfcf6276124547" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 0655b425..e5ca4dfd 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "3d93f6436596e349e43c3798b675af66db71df8a" +SRCREV = "47b80ecae6fe0b9a2c74f0b0feb243145695995e" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 4b2924b0..64cfbdf7 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -SRCREV = "63f2f55462f2f040cfe175ada8aa1e01168597fc" +SRCREV = "871d8e8e2faca0be870930d83f755a2ad484d30b" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index fd6d5954..aa9a9f09 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -31,4 +31,4 @@ SRC_URI += " \ file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " -SRCREV = "633c5642611234cf204569471598c3d3c083b84c" +SRCREV = "8476f8fff7dc5b6f140074d280828cc0f9590088" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 9061c3c7..50d2190f 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -29,4 +29,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "86ee61734e0331459f9cfeb1ad56f773b7e994be" +SRCREV = "08b74f4f30c304b80249a593a572808bc1892f66" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 36ca665d..3e8599a2 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "a1dff1a11ad303a1f82f181e6386194de90ec08f" +SRCREV = "16956a965817311fbc9d80ffbee74eb5d9ea00e0" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 # 5.9.meta-qt5.2 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 6b2c28e3..014b68f7 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "1673dbed00ba68209b6de95981f1e3b4a2a24682" +SRCREV = "c273f2e5c82a3ef8e55e360988b8cf31362e2ba9" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 0b30043c..8df89137 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "1d37c357c843a2622d2af7e1684576e19a8c7c30" +SRCREV = "ce5a3ced5eeefe05675736d3279d4d45bbb6df90" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 23f03cea..9530eea0 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "93b539140c06da07d330c9ecad67ab5ed3f9b0c8" +SRCREV = "f9f02db5fc6ca4da97be63a67c469af49f97ab3b" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 4becdbb6..2a4f256d 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -30,7 +30,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "28b1b88a0b85f4ce7765ed5cc5f3780f97e5ea4f" +SRCREV = "ad18484063a41328d0e72c75cda151128977e0d8" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 122d0681..5b544555 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -SRCREV = "dd8c39ea9312ec1441b3fdd830f9d42fe3258b58" +SRCREV = "87218c4e68c4ebde8f5765f0dfe9a70a359ae05f" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 04de8292..979969ba 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "a97b4f8504cd4bccebed60934e5b842610454b39" +SRCREV = "d483ed2927cb8d4685d5d3c7ea1c71246381910b" # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 # 5.9.meta-qt5.2 diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 7e12a337..1e0796ab 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "b5229df6a08a902b11a2fc9529af6385f4d985d5" +SRCREV = "61a638663c9061d7211849d3a9316661733a5ad9" diff --git a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch b/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch deleted file mode 100644 index d8d89b8e..00000000 --- a/recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 331de4be615b8552e498ac2f3deff4b49b4b0fc0 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 20 Aug 2017 20:37:38 +0200 -Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree - -* as cfree man says: - This function should never be used. Use free(3) instead. - Starting with version 2.26, it has been removed from glibc. ---- - src/core/api/qtbug-61521.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp -index 86d5998e..1dcc4cfa 100644 ---- a/src/core/api/qtbug-61521.cpp -+++ b/src/core/api/qtbug-61521.cpp -@@ -100,7 +100,7 @@ SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) { - } - - SHIM_HIDDEN void ShimCFree(void* ptr) { -- cfree(ptr); -+ free(ptr); - } - - SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) { diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 6e5a34cc..6f32aaee 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -136,7 +136,6 @@ SRC_URI += " \ file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ file://0003-Include-dependency-to-QCoreApplication-translate.patch \ file://0004-Force-host-toolchain-configuration.patch \ - file://0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based @@ -163,8 +162,8 @@ SRC_URI_append_libc-musl = "\ file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "0f6908b5f9eca09cf086410344a862b9d59ef727" -SRCREV_chromium = "21508b5b5421f10ba8627c3c66c5281efb39b2f9" +SRCREV_qtwebengine = "fb639faa8898ce6b8fbcc8870ec316114a79f975" +SRCREV_chromium = "02fb09feaed516d49c50f51172d687adf382e49e" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 3bb690b4..cb68b46c 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "fb71c823a7ae823345518ca33ccfe273fcf76494" +SRCREV = "0f32f4efc5a9a8b33369013c2ba6c27c78498cf2" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 0bbb09ea..2823c8b1 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "e4016a67bbffefed71a407494e249e978d212b3d" +SRCREV = "01ff5c0d5f937577cfd2391a43af4180f2a484bb" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index ed1440c1..1988fe38 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8" +SRCREV = "90d5d612bc7b3450a7a9d5c37c2de1d150f95182" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 7c18079a..d4fccafe 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "fcfa824402bb4edaf644fad786dac3560c743ebe" +SRCREV = "8d7e1e0ec06724a4d332c050e9260530c708e773" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3