From 72459ce0639eb3ce408558a7abede945e1f8ddc9 Mon Sep 17 00:00:00 2001 From: Jani Suonpera Date: Tue, 3 Nov 2020 12:43:11 +0200 Subject: Submodule update for 5.15 Modify patches for removing "Fuzz detected". Remove patches which already merged to upstream branch. Add depends jpeg-native and freetype-native. Task-number: QTBUG-86641 Change-Id: I40c6fed9b47d6a7749069554ea080db3e017f724 Reviewed-by: Jani Heikkinen --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-git.inc | 6 +-- recipes-qt/qt5/qtbase-native_git.bb | 2 +- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 8 ++-- ...ump-path-length-from-256-to-512-character.patch | 6 +-- ...08-Replace-pthread_yield-with-sched_yield.patch | 8 ++-- ...r-FE_-macros-are-not-defined-for-every-pl.patch | 18 ++++---- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtcoap_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 +- recipes-qt/qt5/qtknx_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 4 +- recipes-qt/qt5/qtlottie_git.bb | 2 +- recipes-qt/qt5/qtmqtt_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtopcua_git.bb | 2 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquick3d_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtquicktimeline_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_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/qtsvg_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- ...um-workaround-for-too-long-.rps-file-name.patch | 2 +- .../0002-chromium-stack-pointer-clobber.patch | 10 ++-- .../0003-chromium-fix-build-with-clang.patch | 18 ++++---- ...0004-chromium-Exclude-CRC32-for-32bit-arm.patch | 6 +-- ...-not-try-to-set-the-guessed-values-for-ma.patch | 38 --------------- ...-Do-not-try-to-set-the-guessed-values-for.patch | 41 ++++++++++++++++ .../0006-chromium-aarch64-skia-build-fix.patch | 4 +- ...um-fix-build-after-y2038-changes-in-glibc.patch | 4 +- ...x-build-on-32bit-arches-with-64bit-time_t.patch | 54 ++++------------------ ...ium-Include-cstddef-for-size_t-definition.patch | 6 +-- ...ve-CharAllocator-definition-to-a-header-f.patch | 2 +- ...0011-chromium-Include-cstddef-and-cstdint.patch | 2 +- ...12-chromium-Link-v8-with-libatomic-on-x86.patch | 6 +-- ...sl-Use-correct-member-name-__si_fields-fr.patch | 24 ---------- ...sl-Define-res_ninit-and-res_nclose-for-no.patch | 4 +- ...hromium-musl-Do-not-define-__sbrk-on-musl.patch | 2 +- ...um-musl-Adjust-default-pthread-stack-size.patch | 18 ++++---- ...sl-Use-_fpstate-instead-of-_libc_fpstate-.patch | 2 +- ...sl-elf_reader.cc-include-sys-reg.h-to-get.patch | 2 +- .../chromium/0025-chromium-musl-pread-pwrite.patch | 6 +-- ...sl-initialize-msghdr-in-a-compatible-mann.patch | 6 +-- recipes-qt/qt5/qtwebengine_git.bb | 13 +++--- recipes-qt/qt5/qtwebglplugin_git.bb | 2 +- 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 +- 68 files changed, 171 insertions(+), 229 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch create mode 100644 recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch delete mode 100644 recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index e31f8018..60cabe66 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -194,4 +194,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "e4961b35deb202525d4711dbb14f8c2bb0bf5c26" +SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 817bb2c4..294cffb4 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "dc26105a3abe6fe420151fd3f1b228835d2088ed" +SRCREV = "34171b1d99f55fde1627df3c57eed50480ab2ae7" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 862eeb18..f1d724dd 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -2,8 +2,8 @@ # Copyright (C) 2013-2020 Martin Jansa QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.15" -QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" +QT_MODULE_BRANCH ?= "5.15.2" +QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" # each module needs to define valid SRCREV SRC_URI = " \ @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.15.1+git${SRCPV}" +PV = "5.15.2+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 23f0ad7c..bfd1a805 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -141,4 +141,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "e4961b35deb202525d4711dbb14f8c2bb0bf5c26" +SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index a8d85346..37e0a6a9 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 8442f94819458c79a88ad6177207c0e922a007bd Mon Sep 17 00:00:00 2001 +From c97da220d95091386724e1eadc360ed16ed52dfe Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -65,10 +65,10 @@ index 934a18a924..0f5b1b6333 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 99b7fe6562..1ddfddb2bd 100644 +index 69d1954306..37f7c9c4a2 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) { +@@ -151,7 +151,7 @@ import_plugins:qtConfig(static) { plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) isEmpty(plug_path): \ @@ -77,7 +77,7 @@ index 99b7fe6562..1ddfddb2bd 100644 LIBS += $$plug_path/$$plug_type/$$plug_name } else { LIBS += -l$${plug}$$qtPlatformTargetSuffix() -@@ -271,8 +271,8 @@ for(ever) { +@@ -274,8 +274,8 @@ for(ever) { # static builds: link qml import plugins into the target. contains(all_qt_module_deps, qml): \ qtConfig(static):import_plugins:!host_build:!no_import_scan { diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch index f91792c0..751e59d7 100644 --- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch @@ -1,4 +1,4 @@ -From 56eb22b1063d9bbdcf6ec39828e4c3498b72c99c Mon Sep 17 00:00:00 2001 +From 44e37eab48ff04bd20815fd4ae0b5d79d493aabc Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 25 Aug 2015 10:05:15 -0400 Subject: [PATCH] configure: bump path length from 256 to 512 characters @@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.pri b/configure.pri -index e775bf046e..a20eded987 100644 +index 49755f7abf..f84862d1ca 100644 --- a/configure.pri +++ b/configure.pri -@@ -876,10 +876,10 @@ defineTest(qtConfOutput_preparePaths) { +@@ -883,10 +883,10 @@ defineTest(qtConfOutput_preparePaths) { $${currentConfig}.output.qconfigSource = \ "/* Installation Info */" \ diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch index 4353d43e..08a79898 100644 --- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch +++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch @@ -1,4 +1,4 @@ -From c4393e037ebfc6bfa1a58ceab29fdb78389cd47e Mon Sep 17 00:00:00 2001 +From 18904a169397f343e75bee5f29fa9ae1444a295f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 27 Jul 2017 08:02:51 -0700 Subject: [PATCH] Replace pthread_yield with sched_yield @@ -36,7 +36,7 @@ index 19b3289390..4d0cdf8b5f 100644 QMetaType info(tp); if (!info.isValid()) { diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -index 6dd390ccbd..43b92606d9 100644 +index e397e80fe0..cdb7893e56 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -78,6 +78,7 @@ @@ -46,8 +46,8 @@ index 6dd390ccbd..43b92606d9 100644 +#include #endif - #include "private/qhostinfo_p.h" -@@ -2199,8 +2200,8 @@ public slots: + #include +@@ -2200,8 +2201,8 @@ public slots: #if defined(Q_OS_MAC) pthread_yield_np(); diff --git a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch index c032ec03..69063457 100644 --- a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch +++ b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch @@ -1,4 +1,4 @@ -From 557aa4d5584525cca4efcf20d6a86ad3ae99e36b Mon Sep 17 00:00:00 2001 +From 6c9e68cffb15cc1e848ca57ea12d4e5905d46507 Mon Sep 17 00:00:00 2001 From: Nicola Lunghi Date: Wed, 5 Feb 2020 15:32:25 +0000 Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform @@ -13,10 +13,10 @@ Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/2894 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -index 45798cc527..de3f156cae 100644 +index 42e98ce363..0ca9b87f04 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -@@ -2894,19 +2894,43 @@ void tst_QPainter::monoImages() +@@ -2931,19 +2931,43 @@ void tst_QPainter::monoImages() #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__) #include @@ -67,7 +67,7 @@ index 45798cc527..de3f156cae 100644 return QLatin1String("Invalid operation"); return QLatin1String("No exception"); } -@@ -2932,7 +2956,7 @@ private: +@@ -2969,7 +2993,7 @@ private: void fpe_rasterizeLine_task232012() { @@ -76,7 +76,7 @@ index 45798cc527..de3f156cae 100644 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); img.fill(0x0); QPainter p(&img); -@@ -2944,7 +2968,7 @@ void fpe_rasterizeLine_task232012() +@@ -2981,7 +3005,7 @@ void fpe_rasterizeLine_task232012() void fpe_pixmapTransform() { @@ -85,7 +85,7 @@ index 45798cc527..de3f156cae 100644 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); -@@ -2972,7 +2996,7 @@ void fpe_pixmapTransform() +@@ -3009,7 +3033,7 @@ void fpe_pixmapTransform() void fpe_zeroLengthLines() { @@ -94,7 +94,7 @@ index 45798cc527..de3f156cae 100644 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); -@@ -2984,7 +3008,7 @@ void fpe_zeroLengthLines() +@@ -3021,7 +3045,7 @@ void fpe_zeroLengthLines() void fpe_divByZero() { @@ -103,7 +103,7 @@ index 45798cc527..de3f156cae 100644 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); -@@ -3007,7 +3031,7 @@ void fpe_divByZero() +@@ -3044,7 +3068,7 @@ void fpe_divByZero() void fpe_steepSlopes() { @@ -112,7 +112,7 @@ index 45798cc527..de3f156cae 100644 QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied); -@@ -3026,7 +3050,7 @@ void fpe_steepSlopes() +@@ -3063,7 +3087,7 @@ void fpe_steepSlopes() void fpe_radialGradients() { diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 50817084..989e5abb 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -294,4 +294,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "e4961b35deb202525d4711dbb14f8c2bb0bf5c26" +SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index d43c9266..1a5238f1 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "68a2a439898f154279ef41dcc6e7164030d20d54" +SRCREV = "a67f812548b008e3eedcd2bb9313828a195fd23b" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb index 65c45cd3..83ee40b7 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb @@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" DEPENDS += "qtbase" -SRCREV = "bd047261570166b593071212fa4749262e6c5caa" +SRCREV = "628d3b8abd47ffde45252cf6591ed10ec2fa28ac" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 79dd0850..948f59a5 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,bluez5" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "6fe502ad842c322981b45632e4f59182be1908d2" +SRCREV = "ca6cc606d9fc0947ea6c27738a1ca8f12f3258ea" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 30438bf7..70e14f06 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 = "09801264493e1b2ceb4918be59a13dde1a24d882" +SRCREV = "1168c788a117e4556e6cd0ba1e267a86ef62b0c4" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 6d9b884a..6eae8173 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -30,6 +30,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "02c499996bc70eae5472a0290ca09f1f1741e5cb" +SRCREV = "104eae5b17b0ec700391e9539ee3a4f638588194" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 56ef1ef1..076f25a6 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 = "7bf40625ab31685a827f5b6dc13922ae685e8a4f" +SRCREV = "ff933a4e72826a77c81c4153f1adcf765ead35f0" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 6a98362b..9657a5ef 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 = "c343d7746b0331af722d69f3b5b47840f57a4cca" +SRCREV = "66b7fbaca4b323dce337e87e3093c8836577c561" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 643a2498..43db80ff 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "2cacdd5d5c8feab792126b99d0384092683c551b" +SRCREV = "74a5bc4a45195b876454e596e76cb23aeb365410" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 50e0e5ab..9891eefb 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "d6148a65aeff1cb2060f0e3e462541bb1ff5219b" +SRCREV = "0d2ce613010c0cc9c69f6821c06a34b6721482b4" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 7337b157..89d42813 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -35,7 +35,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "bae290d25a37fddf88f3a6e2e94c3ee68b2cc038" -SRCREV_qtlocation-mapboxgl = "d7e368c42f2ac7971e81f60b981e566352f1e4fa" +SRCREV_qtlocation = "02a21217a9706402802f38c646797be8eccb86e4" +SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index cd355177..b4a93300 100644 --- a/recipes-qt/qt5/qtlottie_git.bb +++ b/recipes-qt/qt5/qtlottie_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "2245b587f162f8d7a152049832739af9700e7c2d" +SRCREV = "b182dcd78a35b4667b2568857b7719d555c7fddb" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 4361890b..b3db343e 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "0da764d8fec459ee28b70f68028ada81ed31abf7" +SRCREV = "cade213f562049400da81e60762400df68d7c56b" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 7ff7ea39..fdbebd6d 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -38,7 +38,7 @@ 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 = "73d9affb0c44dc21d83e9aeec5e4d83bc57d189b" +SRCREV = "fd30913d4601d12437404e1d20113a1ed6364ccc" # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory do_install_append() { diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 8e0147b7..79d00544 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 = "eacb61f5b180c676b53881a1fbd73339c3e5f303" +SRCREV = "fb2d6d47a0c961278d63309789a1141c3734818b" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 7c5209f4..7b3ae682 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "f993294b068a70e93b248f556da6ff31245bf2d2" +SRCREV = "6d45793cae6f9e744c7bba82f905e431978ce3d0" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 57a12057..554bb8f7 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "cf85bd1d88dd9a25b9a2b1210ab9d9668159b871" +SRCREV = "ddfa4d16243128d2871a51c513e025d518151b17" diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index 1d92e5a1..a56e26db 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb @@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ " -SRCREV_qtquick3d = "c2201f055ed723cf56afd1a7e05e81785b592534" +SRCREV_qtquick3d = "2e05e6d6546635a8f25882c5140fb17697be0062" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" SRCREV_FORMAT = "qtquick3d_assimp" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index cd1cd12a..fed17dad 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "c0daab494a58ff881afc0252872359e5291a1478" +SRCREV = "16f27dfa3588c2bf377568ce00bf534af48c9558" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index d645153b..c2960096 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "e22f5c4cd8ff47545e33a30f7a11d4963979ffb0" +SRCREV = "7c29283041a50def3ceca7de4471f211c9b30d4e" diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb index 840860dd..61920c04 100644 --- a/recipes-qt/qt5/qtquicktimeline_git.bb +++ b/recipes-qt/qt5/qtquicktimeline_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtbase qtdeclarative" -SRCREV = "32d7031e87551f29b598e789cfacd275c8095245" +SRCREV = "147ad75c589fc4804429710fdb177cc48a80dbea" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index eb81945f..c9519137 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "d08c7960de241d33ba6e4e2bc5dc2056a7ae3726" +SRCREV = "8e889442508e284691c923470eb4552c96afdfe3" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index a6023a0a..773bc044 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,4 +36,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 = "d2f926751d322bc0a46d2ceed57f871e282f26b1" +SRCREV = "5da7de1800eee3d604eb7e787b114479b61ffc93" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 78da9021..7a0975bf 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 = "38095de1942031707b05709b160e1399ecbf8276" +SRCREV = "95aa78be795a862b95371afa75e1417029ec0a16" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15 # 5.15.meta-qt5.1 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 3959bda3..c4b90f84 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 = "76fb972f600d9a2b4720a41fbec14955becc7885" +SRCREV = "5618198e6df5e0224f79f786a44af7527b431545" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 3f86df6d..94e0fbbd 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 = "289fff1f7f14a7c2dd44ab2232f7a2f17bda5fcf" +SRCREV = "1aa9b03756baead139943712839af5ecedeb2989" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index ab359428..b59d921d 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "6f5fa73a354d71d4e86c5cc686b0c0f79d4c52a9" +SRCREV = "192e376b01e65e7277772bdc94106613c22cf531" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 65f855bb..52d82653 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "6b444e832d31ce9a9497ca8e6aff0520f1d888ea" +SRCREV = "52d3788c7b0116ea3db232dccca5f1e3f1e229ac" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index f89d63a3..0c8b3e26 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -49,7 +49,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\ ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ " -SRCREV = "72744ac361a94bfd80af16403a69f8ff2422d583" +SRCREV = "cc52debd905e0ed061290d6fd00a5f1ab67478a5" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 23c25e4c..ecc9db2f 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "ec3a7a623ae7dc228e7a9795a605c6d7916816ec" +SRCREV = "cb1857418b36780b0444333f3aa6250ca3780f19" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 0eefdb6e..c3b8a90f 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "ae04a778c8bafa20812e337fbb80f60b898b8313" +SRCREV = "7b90415c58dd02c682a9ba317f273d7b3398ff88" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 5900a4f3..f3fea401 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -43,7 +43,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "c25f8b8fa4dc6d096382d34849b997ab7fe69c5c" +SRCREV = "3cc17177b1b03053276eb6236fda137c588261a7" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 3a4e6175..052bfd80 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 = "5bab22c141948e6215bd5239e22926b4c2e9b332" +SRCREV = "90cffd49575b075b0dc28440c693753d860fee87" diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch index 3abe38b6..8b5d41ba 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch @@ -1,4 +1,4 @@ -From 105421c09f009b77019e60db2de22d5966a73602 Mon Sep 17 00:00:00 2001 +From 5af62581e5116b57efbe4bb7cc467efeb0aab941 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 30 Mar 2017 11:37:24 +0300 Subject: [PATCH] chromium: workaround for too long .rps file name diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch index 497dd3b8..c93ba991 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch @@ -1,4 +1,4 @@ -From 99453086770508f96eeb95635dda3f9831c485bf Mon Sep 17 00:00:00 2001 +From 8dd7987fc70fd8dab4a9f7ee32334c8d28ed34e4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 23 Dec 2018 16:58:04 -0800 Subject: [PATCH] chromium: stack pointer clobber @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h -index 8e0cc385792..d2bd9df4d40 100644 +index d2baee9d243..fd8efdffea6 100644 --- a/chromium/third_party/lss/linux_syscall_support.h +++ b/chromium/third_party/lss/linux_syscall_support.h -@@ -2012,7 +2012,7 @@ struct kernel_statfs { +@@ -2017,7 +2017,7 @@ struct kernel_statfs { : "i" (__NR_##name), "ri" ((long)(arg1)), \ "c" ((long)(arg2)), "d" ((long)(arg3)), \ "S" ((long)(arg4)), "D" ((long)(arg5)) \ @@ -29,7 +29,7 @@ index 8e0cc385792..d2bd9df4d40 100644 LSS_RETURN(type,__res); \ } #undef _syscall6 -@@ -2034,7 +2034,7 @@ struct kernel_statfs { +@@ -2039,7 +2039,7 @@ struct kernel_statfs { : "i" (__NR_##name), "0" ((long)(&__s)), \ "c" ((long)(arg2)), "d" ((long)(arg3)), \ "S" ((long)(arg4)), "D" ((long)(arg5)) \ @@ -38,7 +38,7 @@ index 8e0cc385792..d2bd9df4d40 100644 LSS_RETURN(type,__res); \ } LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, -@@ -2120,7 +2120,7 @@ struct kernel_statfs { +@@ -2125,7 +2125,7 @@ struct kernel_statfs { : "0"(-EINVAL), "i"(__NR_clone), "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch index 253cdaf6..a3f292c3 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch @@ -1,4 +1,4 @@ -From d3889654a28d901d345cae8fc8ec23988a085dab Mon Sep 17 00:00:00 2001 +From be18ba6e0b879fbd542f4e0d1a249f2ab5abb27c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Feb 2019 19:28:59 -0800 Subject: [PATCH] chromium: fix build with clang @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn -index fdfcf65f5ab..13d71d04030 100644 +index ca81bd8ce0f..d3c588b21e3 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -779,8 +779,6 @@ config("compiler_cpu_abi") { +@@ -776,8 +776,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl) { @@ -22,7 +22,7 @@ index fdfcf65f5ab..13d71d04030 100644 } if (!is_nacl) { cflags += [ -@@ -793,8 +791,6 @@ config("compiler_cpu_abi") { +@@ -790,8 +788,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia) { @@ -31,7 +31,7 @@ index fdfcf65f5ab..13d71d04030 100644 } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] -@@ -803,9 +799,6 @@ config("compiler_cpu_abi") { +@@ -800,9 +796,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -41,7 +41,7 @@ index fdfcf65f5ab..13d71d04030 100644 } } else { cflags += [ "-EL" ] -@@ -884,10 +877,7 @@ config("compiler_cpu_abi") { +@@ -881,10 +874,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -53,7 +53,7 @@ index fdfcf65f5ab..13d71d04030 100644 cflags += [ "-EB" ] ldflags += [ "-EB" ] } -@@ -934,9 +924,6 @@ config("compiler_cpu_abi") { +@@ -931,9 +921,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -63,7 +63,7 @@ index fdfcf65f5ab..13d71d04030 100644 } } else { cflags += [ -@@ -993,10 +980,7 @@ config("compiler_cpu_abi") { +@@ -990,10 +977,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips64") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -75,7 +75,7 @@ index fdfcf65f5ab..13d71d04030 100644 cflags += [ "-EB", "-mabi=64", -@@ -1165,13 +1149,6 @@ config("compiler_deterministic") { +@@ -1157,13 +1141,6 @@ config("compiler_deterministic") { } } } diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch index 5b150b5f..c3de3cc5 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch @@ -1,4 +1,4 @@ -From 7a778d56065b041e55c60e500d5e60c71b7e345f Mon Sep 17 00:00:00 2001 +From 7eeed60fceeca490c5252e256baff08100e13259 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 5 Feb 2019 14:32:20 -0800 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm @@ -15,10 +15,10 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn -index 4422fecc0c8..1b398ad981a 100644 +index 00d1e7c6ca3..f2c36d72dd2 100644 --- a/chromium/third_party/zlib/BUILD.gn +++ b/chromium/third_party/zlib/BUILD.gn -@@ -80,8 +80,11 @@ if (use_arm_neon_optimizations) { +@@ -86,8 +86,11 @@ if (use_arm_neon_optimizations) { # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: # "All implementations of the ARMv8.1 architecture are required to # implement the CRC32* instructions. These are optional in ARMv8.0." diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch deleted file mode 100644 index 00293e5f..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7cabdbd5f444dc10f4c87ed554792e97a527075b Mon Sep 17 00:00:00 2001 -From: Johannes Pointner -Date: Fri, 3 May 2019 09:12:38 +0200 -Subject: [PATCH] chromium: Do not try to set the guessed values for - march/mtune/float-abi OE config machinary has computed these values already - and fed it via compiler cmdline to chromium build - -I think upstream should check for the values on compiler cmdline -before overriding these - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Khem Raj -Signed-off-by: Johannes Pointner ---- - chromium/build/config/compiler/BUILD.gn | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn -index 13d71d04030..3ebcf1ddbc3 100644 ---- a/chromium/build/config/compiler/BUILD.gn -+++ b/chromium/build/config/compiler/BUILD.gn -@@ -780,15 +780,6 @@ config("compiler_cpu_abi") { - } else if (current_cpu == "arm") { - if (is_clang && !is_android && !is_nacl) { - } -- if (!is_nacl) { -- cflags += [ -- "-march=$arm_arch", -- "-mfloat-abi=$arm_float_abi", -- ] -- } -- if (arm_tune != "") { -- cflags += [ "-mtune=$arm_tune" ] -- } - } else if (current_cpu == "arm64") { - if (is_clang && !is_android && !is_nacl && !is_fuchsia) { - } diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch new file mode 100644 index 00000000..5f3f4528 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch @@ -0,0 +1,41 @@ +From 0faac107930255380ea07aa75267153022de2248 Mon Sep 17 00:00:00 2001 +From: Johannes Pointner +Date: Fri, 3 May 2019 09:12:38 +0200 +Subject: [PATCH] chromium: Do not try to set the guessed values for + + march/mtune/float-abi OE config machinary has computed these values already + and fed it via compiler cmdline to chromium build + +I think upstream should check for the values on compiler cmdline +before overriding these + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj +Signed-off-by: Johannes Pointner + +%% original patch: 0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch +--- + chromium/build/config/compiler/BUILD.gn | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn +index d3c588b21e3..6d49fde33cc 100644 +--- a/chromium/build/config/compiler/BUILD.gn ++++ b/chromium/build/config/compiler/BUILD.gn +@@ -777,15 +777,6 @@ config("compiler_cpu_abi") { + } else if (current_cpu == "arm") { + if (is_clang && !is_android && !is_nacl) { + } +- if (!is_nacl) { +- cflags += [ +- "-march=$arm_arch", +- "-mfloat-abi=$arm_float_abi", +- ] +- } +- if (arm_tune != "") { +- cflags += [ "-mtune=$arm_tune" ] +- } + } else if (current_cpu == "arm64") { + if (is_clang && !is_android && !is_nacl && !is_fuchsia) { + } diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch index 798b5f05..f560e315 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch @@ -1,4 +1,4 @@ -From e7e0646f07d1c0dcf6502cd1c074d50839f3d461 Mon Sep 17 00:00:00 2001 +From 69abe5acb926cef9ac771015ade3873fa9985f3b Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Thu, 8 Mar 2018 15:39:55 +0100 Subject: [PATCH] chromium: aarch64 skia build fix @@ -28,7 +28,7 @@ Signed-off-by: Raphael Kubo da Costa 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -index 0d610ccfe33..c1844b61168 100644 +index 831f5b3bb03..bb9377c3641 100644 --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h @@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch index 307ce4d4..1c7a3b1e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch @@ -1,4 +1,4 @@ -From a5cdae084e84be8c847f4b0613b92e0462bbb038 Mon Sep 17 00:00:00 2001 +From 8a0cc2a6be8fb9f8c3f4976ad4b41b291e672a67 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 11 Jul 2019 09:35:13 +0200 Subject: [PATCH] chromium: fix build after y2038 changes in glibc @@ -15,7 +15,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+) diff --git a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc -index ead4e57dc15..7ba975e660a 100644 +index 0cbcb8130c6..bc3dd3bddda 100644 --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc @@ -71,6 +71,7 @@ typedef void* SockOptArg; diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 05917cd6..63a460cc 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -1,4 +1,4 @@ -From c769d6be7210a2fbc866e36f87ad21bcc91e9c6e Mon Sep 17 00:00:00 2001 +From ddedffaeb9f04ac8530f87f5010e0008dc548b96 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Nov 2019 10:07:43 -0800 Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t @@ -11,27 +11,10 @@ input.h [1] Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- - chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 4 ++-- chromium/ui/events/ozone/evdev/event_converter_evdev.h | 5 +++++ - chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++--- - chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | 5 +++++ - 4 files changed, 15 insertions(+), 5 deletions(-) + chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 3 +-- + 2 files changed, 6 insertions(+), 2 deletions(-) -diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc -index 9f27d39e209..f565dd2ce5c 100644 ---- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc -+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc -@@ -176,8 +176,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback( - base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent( - const input_event& event) { - base::TimeTicks timestamp = -- ui::EventTimeStampFromSeconds(event.time.tv_sec) + -- base::TimeDelta::FromMicroseconds(event.time.tv_usec); -+ ui::EventTimeStampFromSeconds(event.input_event_sec) + -+ base::TimeDelta::FromMicroseconds(event.input_event_usec); - ValidateEventTimeClock(×tamp); - return timestamp; - } diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h index 717410f2ebc..a4cd55ca20e 100644 --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h @@ -49,37 +32,16 @@ index 717410f2ebc..a4cd55ca20e 100644 namespace ui { diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc -index 363c3183e05..4fccfd62f84 100644 +index 01e49b7bbfd..4fccfd62f84 100644 --- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc +++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc -@@ -59,11 +59,11 @@ void TouchEventLogEvdev::DumpLog(const char* filename) { - for (int i = 0; i < kDebugBufferSize; ++i) { - struct TouchEvent* te = - &logged_events_[(debug_buffer_tail_ + i) % kDebugBufferSize]; -- if (te->ev.time.tv_sec == 0 && te->ev.time.tv_usec == 0) -+ if (te->ev.input_event_sec == 0 && te->ev.input_event_usec == 0) +@@ -63,8 +63,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) { continue; std::string event_string = base::StringPrintf( -- "E: %ld.%06ld %04x %04x %d %d\n", te->ev.time.tv_sec, -- te->ev.time.tv_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); -+ "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec, + "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec, +- te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, +- te->slot); + te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); report_content += event_string; } file.Write(0, report_content.c_str(), report_content.length()); -diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h -index 0d5b83148f6..1f17608e94d 100644 ---- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h -+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h -@@ -14,6 +14,11 @@ - - #include "base/component_export.h" - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - namespace ui { - - class EventDeviceInfo; diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch index 3659f586..41a8ce36 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch @@ -1,4 +1,4 @@ -From 58783bf8f46657200643543f765f405a91699440 Mon Sep 17 00:00:00 2001 +From 022100d701dca71ecfe237e133712398bc1c59a7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 25 Dec 2019 15:41:16 -0800 Subject: [PATCH] chromium: Include cstddef for size_t definition @@ -22,10 +22,10 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+) diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h -index b87fb2d0345..b3faffcfc79 100644 +index ec972949d89..2a76775cfb6 100644 --- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h +++ b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h -@@ -14,6 +14,7 @@ +@@ -15,6 +15,7 @@ #include #include #include diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch index 965ecd72..abe1e16d 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch @@ -1,4 +1,4 @@ -From faff740bb831e1a25c7acb1754df9bbd028330b9 Mon Sep 17 00:00:00 2001 +From 9d9db26e626e1c8d4d10eab1522daf0efc8cb11c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 2 Jan 2020 17:13:55 -0800 Subject: [PATCH] chromium: Move CharAllocator definition to a header file diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch index a6abd037..464f952b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch @@ -1,4 +1,4 @@ -From 33005dfa49d65170fb006cd4ca4dbb8c6cf901e5 Mon Sep 17 00:00:00 2001 +From 1b8d57ba6595bbd743f6570d834f6a08600fb117 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 15 Jan 2020 16:53:46 -0800 Subject: [PATCH] chromium: Include and diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch index 169b4c9b..eaff07e0 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch @@ -1,4 +1,4 @@ -From 910fe61d3ee439b26a6a33cc9f65e1f7a52f332d Mon Sep 17 00:00:00 2001 +From e60314a1257964bbebc0e7633d9799fd7c7ec35b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 1 Feb 2020 12:17:23 -0800 Subject: [PATCH] chromium: Link v8 with libatomic on x86 @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn -index 9107b302476..12d8171d238 100644 +index ab20142de9a..4ef4aa80cc0 100644 --- a/chromium/v8/BUILD.gn +++ b/chromium/v8/BUILD.gn -@@ -3324,7 +3324,8 @@ v8_source_set("v8_base_without_compiler") { +@@ -3543,7 +3543,8 @@ v8_source_set("v8_base_without_compiler") { if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" || v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" || v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch deleted file mode 100644 index b13532d3..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 06dcf80d09523fc075edc157231b33da63b3f37e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Jul 2017 15:12:39 -0700 -Subject: [PATCH] chromium: musl: Use correct member name __si_fields from - LinuxSigInfo - -Signed-off-by: Khem Raj ---- - chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc -index 003708d2c89..0fef3148f9d 100644 ---- a/chromium/sandbox/linux/seccomp-bpf/trap.cc -+++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc -@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { - // most versions of glibc don't include this information in siginfo_t. So, - // we need to explicitly copy it into a arch_sigsys structure. - struct arch_sigsys sigsys; -- memcpy(&sigsys, &info->_sifields, sizeof(sigsys)); -+ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys)); - - #if defined(__mips__) - // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index ea2acd56..033780d8 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -1,4 +1,4 @@ -From 991b9f17d0743c80340685181095dc8903a57b53 Mon Sep 17 00:00:00 2001 +From a49d5e2c256d18853c0e00e698759f763eaddf04 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 15:27:50 -0700 Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc @@ -13,7 +13,7 @@ Signed-off-by: Khem Raj create mode 100644 chromium/net/dns/resolv_compat.h diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc -index 2e0f06b0c1e..aaafef77d79 100644 +index eaa5336c339..18b40d7d005 100644 --- a/chromium/net/dns/dns_config_service_posix.cc +++ b/chromium/net/dns/dns_config_service_posix.cc @@ -29,6 +29,10 @@ diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch index 91b87490..97fce663 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -1,4 +1,4 @@ -From 19969b1ef03bce06fbc8518b4db999a243855c32 Mon Sep 17 00:00:00 2001 +From 6e44772c5aa78c39d52910aaf4cc2db3bcf0ba7e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 15:39:57 -0700 Subject: [PATCH] chromium: musl: Do not define __sbrk on musl diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch index b0833018..53ecedd4 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -1,19 +1,19 @@ -From dd7561980e6669aebae6c1fab1c4653139b6740f Mon Sep 17 00:00:00 2001 +From 31b50a484935d1a610da74fa5a06489f8309fd6d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 16:41:23 -0700 Subject: [PATCH] chromium: musl: Adjust default pthread stack size Signed-off-by: Khem Raj --- - chromium/base/threading/platform_thread_linux.cc | 3 ++- - .../third_party/blink/renderer/platform/wtf/stack_util.cc | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) + chromium/base/threading/platform_thread_linux.cc | 3 ++- + chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc -index 095c49b8dc0..d1479b54d48 100644 +index 74a01ad5af5..dab5773d73b 100644 --- a/chromium/base/threading/platform_thread_linux.cc +++ b/chromium/base/threading/platform_thread_linux.cc -@@ -186,7 +186,8 @@ void TerminateOnThread() {} +@@ -377,7 +377,8 @@ void TerminateOnThread() {} size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { #if !defined(THREAD_SANITIZER) @@ -24,15 +24,15 @@ index 095c49b8dc0..d1479b54d48 100644 // ThreadSanitizer bloats the stack heavily. Evidence has been that the // default stack size isn't enough for some browser tests. diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc -index b2421649ff3..a31b96e90e6 100644 +index ab1dff4167e..b0763b0bd9a 100644 --- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc +++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc @@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() { // FIXME: On Mac OSX and Linux, this method cannot estimate stack size // correctly for the main thread. --#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ +-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ ++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ defined(OS_FUCHSIA) // pthread_getattr_np() can fail if the thread is not invoked by // pthread_create() (e.g., the main thread of blink_unittests). diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch index d71a0926..750d0d5e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch @@ -1,4 +1,4 @@ -From 2150bb364442a2a352fff1f915c387f4dc37bdef Mon Sep 17 00:00:00 2001 +From d687194f970d5ed19d21916eba4f597625d20dfc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 25 Sep 2018 12:35:07 -0700 Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on diff --git a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch index b829057e..4ed957ee 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch @@ -1,4 +1,4 @@ -From f3f26710c365425453d7f8577fc6437f03b89a5c Mon Sep 17 00:00:00 2001 +From 976ee610f4bb87d1b5f57756c04f13b06f3ebf26 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 25 Sep 2018 12:59:05 -0700 Subject: [PATCH] chromium: musl: elf_reader.cc: include to get diff --git a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch index e7ba75f0..61a1137c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch @@ -1,4 +1,4 @@ -From 3c26038e4588bd73d92d5fbd4bd8c2c9a520ea8d Mon Sep 17 00:00:00 2001 +From 4cb584454ab1537c1e1e5ae8453f57a98aa9a928 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 23 Dec 2018 16:58:04 -0800 Subject: [PATCH] chromium: musl: pread pwrite @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj 1 file changed, 5 insertions(+) diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h -index d2bd9df4d40..88ea7f508aa 100644 +index fd8efdffea6..22a8863031c 100644 --- a/chromium/third_party/lss/linux_syscall_support.h +++ b/chromium/third_party/lss/linux_syscall_support.h -@@ -1239,6 +1239,11 @@ struct kernel_statfs { +@@ -1244,6 +1244,11 @@ struct kernel_statfs { #ifndef __NR_fallocate #define __NR_fallocate 285 #endif diff --git a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch index d316929c..0d73e07c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch @@ -1,4 +1,4 @@ -From f0cb2c411e58217b694f9bdf9d34cbc56bd0d785 Mon Sep 17 00:00:00 2001 +From acc3b1b674a2568dd19418ec5b3c58330a29521a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 10 May 2020 08:16:01 -0700 Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner @@ -25,10 +25,10 @@ Signed-off-by: Khem Raj 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc -index 572472a6993..504fdb5d5c6 100644 +index 7df6892d67e..030ff8896e4 100644 --- a/chromium/net/socket/udp_socket_posix.cc +++ b/chromium/net/socket/udp_socket_posix.cc -@@ -1190,8 +1190,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( +@@ -1199,8 +1199,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( for (auto& buffer : buffers) msg_iov->push_back({const_cast(buffer->data()), buffer->length()}); msgvec->reserve(buffers.size()); diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index cd79a8a6..1d7fe83f 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -23,6 +23,8 @@ DEPENDS += " \ qtlocation \ libdrm fontconfig pixman openssl pango cairo icu pciutils nss \ libcap \ + jpeg-native \ + freetype-native \ gperf-native \ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \ @@ -43,7 +45,7 @@ SECURITY_STRINGFORMAT = "" # To use system ffmpeg you need to enable also libwebp, opus, vpx # Only depenedencies available in oe-core are enabled by default -PACKAGECONFIG ??= "libwebp libevent libpng \ +PACKAGECONFIG ??= "libevent libpng \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG[icu] = "-feature-webengine-system-icu,-no-feature-webengine-system-icu,icu" @@ -142,7 +144,7 @@ RDEPENDS_${PN}-examples += " \ qtdeclarative-qmlplugins \ " -QT_MODULE_BRANCH_CHROMIUM = "80-based" +QT_MODULE_BRANCH_CHROMIUM = "83-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 # 5.15.meta-qt5.7 @@ -163,7 +165,7 @@ SRC_URI += " \ file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ - file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ + file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch;patchdir=src/3rdparty \ file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \ file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \ file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \ @@ -180,7 +182,6 @@ SRC_URI_append_libc-musl = "\ file://chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ file://chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ file://chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ - file://chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ file://chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ file://chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ file://chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ @@ -190,8 +191,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "9e4d1eb45d5c6299e79ac3f28282fd76f949980e" -SRCREV_chromium = "62bc475876cbae17e2e39175fe321780512e5951" +SRCREV_qtwebengine = "5537ff4437ea7a5f9ea140071343f88bf48deddc" +SRCREV_chromium = "fb6ab5e483876298235be1c6a6013b426c82b759" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 8eb8fce3..fd14851a 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "835b594bda455a3ecb768605d64fb3ca29ceb51d" +SRCREV = "5e41e564aaf96b7e49403af5099995efbe4cac8e" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index a7cc57db..c84f7828 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 = "9a0dd9a7b74a405488c4922a922d8a2ed8e8e28a" +SRCREV = "f73735911b2124ef16aa39228bf8f89ee900ba5d" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 0c5205dc..fcabec7a 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -23,4 +23,4 @@ python() { if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') } -SRCREV = "93bdca425bde930d58062216bd3cfae2abdc60c6" +SRCREV = "800926cc4e0ecfdb37a3b34486403354b66a37a4" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 80c8b7db..8a24f2f7 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "afa3ad1c1cb04ce1e51b0af4bdac028809f9d0d4" +SRCREV = "9bb0adeac84da6723cf57a2bb0d0c3b405691a15" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index bfacbfbb..f5db658d 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,6 +25,6 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "c4d24e467d7159a43eb90891b954f4cd816ba04b" +SRCREV = "50421402f05b3ee3c76c6cff455a69efaf576b6d" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3