diff options
Diffstat (limited to 'recipes-qt/qt5')
128 files changed, 619 insertions, 304 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index f481c2e7..56e0a0a8 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.QT-LICENSE-AGREEMENT;md5=38de3b110ade3b6ee2f0b6a95ab16f1a \ + file://LICENSE.QT-LICENSE-AGREEMENT;md5=485e1d58b313def058a0d72598aa6efe \ " QT_MODULE = "qtbase" @@ -25,7 +25,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared -# 5.15.meta-qt5-shared.3 +# 5.15.meta-qt5-shared.4 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -45,14 +45,16 @@ SRC_URI += "\ file://0017-Define-__NR_futex-if-it-does-not-exist.patch \ file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ + file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \ + file://0022-testlib-don-t-track-the-build-or-source-directories.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native -# 5.15.meta-qt5-native.3 +# 5.15.meta-qt5-native.4 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ - file://0022-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0023-Always-build-uic-and-qvkgen.patch \ + file://0024-Avoid-renameeat2-for-native-sdk-builds.patch \ " # CMake's toolchain configuration of nativesdk-qtbase @@ -200,4 +202,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 = "4c647100f7440c922da7c329a6c2501cf4794dde" +SRCREV = "8a25db3204f39a228d14148d9cdf414393d239a5" diff --git a/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch b/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch index 0d2f165f..2e15543a 100644 --- a/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch +++ b/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch @@ -6,6 +6,7 @@ Subject: [PATCH] Fix examples build error Add workaround for QTBUG-77288 which causes examples to fail to build Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> +Upstream-Status: Pending --- examples/studio3d/cppdatainput/cppdatainput.pro | 1 + examples/studio3d/dynamicelement/dynamicelement.pro | 1 + diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index 310cf0ac..774d66f7 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -3,6 +3,8 @@ From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 17 Aug 2018 13:23:58 +0300 Subject: [PATCH] Allow a tools-only build +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- qt3d.pro | 7 ++++++- src/3rdparty/assimp/assimp_dependency.pri | 2 +- diff --git a/recipes-qt/qt5/qt3d/0001-renderers-opengl-Link-in-libatomic-on-riscv.patch b/recipes-qt/qt5/qt3d/0001-renderers-opengl-Link-in-libatomic-on-riscv.patch index 9f6e1f54..82feaf2e 100644 --- a/recipes-qt/qt5/qt3d/0001-renderers-opengl-Link-in-libatomic-on-riscv.patch +++ b/recipes-qt/qt5/qt3d/0001-renderers-opengl-Link-in-libatomic-on-riscv.patch @@ -8,6 +8,7 @@ GCC 11 needs this since it failing to find a builtin function Fixes src/plugins/renderers/opengl/renderer/renderview.cpp:107: undefined reference to `__atomic_exchange_1' +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/plugins/renderers/opengl/opengl.pri | 2 ++ diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 364184c6..df338b69 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -19,7 +19,7 @@ SRC_URI += " \ # For assimp submodule SRC_URI += " \ - git://github.com/assimp/assimp.git;name=assimp;branch=assimp_5.0_release;protocol=https;destsuffix=git/src/3rdparty/assimp/src \ + git://code.qt.io/qt/qtquick3d-assimp.git;name=assimp;branch=qt6_assimp;protocol=https;destsuffix=git/src/3rdparty/assimp/src \ " SRC_URI:append:riscv64 = " file://0001-renderers-opengl-Link-in-libatomic-on-riscv.patch" @@ -44,7 +44,7 @@ do_configure:prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV_qt3d = "c9bb0a3d1ef819033a674c5c05499d18bc898a70" +SRCREV_qt3d = "dac2afc9c6cffd42e49030dcafffc1e0a05873b9" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" SRCREV_FORMAT = "qt3d_assimp" diff --git a/recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch b/recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch deleted file mode 100644 index 28fe7844..00000000 --- a/recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch +++ /dev/null @@ -1,53 +0,0 @@ -From aa1f4a5dc09d8ded55384bd2172bea431ffa479c Mon Sep 17 00:00:00 2001 -From: Jani Suonpera <jani.suonpera@qt.io> -Date: Wed, 15 Sep 2021 13:54:30 +0300 -Subject: [PATCH] Fix interface of propertyNameListForWritablePropertie - -There are show compiling error: -Compiling error: -|build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/qt5-creator/4.15.0+gitAUTOINC+978f6caf1e-r0/git/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp: In function 'QmlDesigner::PropertyNameList QmlDesigner::Internal::QmlPrivateGate::propertyNameListForWritableProperties(QObject*, const PropertyName&, QObjectList*)': -| build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/qt5-creator/4.15.0+gitAUTOINC+978f6caf1e-r0/git/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp:156:117: error: no matching function for call to 'QQuickDesignerSupportProperties::propertyNameListForWritableProperties(QObject*&, const PropertyName&, QObjectList*&)' -| 156 | return QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object, baseName, inspectedObjects); - -This is cause of interface changes. There are drop out parameters -baseName and inspectedObjects from -QQuickDesignerSupportProperties::propertyNameListForWritableProperties. - ---- - .../qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h | 4 +--- - .../qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp | 6 ++---- - 2 files changed, 3 insertions(+), 7 deletions(-) - -diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h -index b0b68907ed..e600db3c60 100644 ---- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h -+++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h -@@ -68,9 +68,7 @@ public: - QObject *createComponent(const QUrl &componentUrl, QQmlContext *context); - void tweakObjects(QObject *object); - bool isPropertyBlackListed(const QmlDesigner::PropertyName &propertyName); -- PropertyNameList propertyNameListForWritableProperties(QObject *object, -- const PropertyName &baseName = PropertyName(), -- QObjectList *inspectedObjects = nullptr); -+ PropertyNameList propertyNameListForWritableProperties(QObject *object); - PropertyNameList allPropertyNames(QObject *object, - const PropertyName &baseName = PropertyName(), - QObjectList *inspectedObjects = nullptr); -diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp -index 7e5af01944..b9d6b75596 100644 ---- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp -+++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp -@@ -149,11 +149,9 @@ PropertyNameList allPropertyNames(QObject *object, - #endif - } - --PropertyNameList propertyNameListForWritableProperties(QObject *object, -- const PropertyName &baseName, -- QObjectList *inspectedObjects) -+PropertyNameList propertyNameListForWritableProperties(QObject *object) - { -- return QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object, baseName, inspectedObjects); -+ return QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object); - } - - void tweakObjects(QObject *object) diff --git a/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch index 99a34ae5..c1fd2340 100644 --- a/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch +++ b/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch @@ -3,6 +3,7 @@ From: Khem Raj <raj.khem@gmail.com> Date: Tue, 16 Jan 2018 13:26:57 +0000 Subject: [PATCH] Link with libexecinfo on musl +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> diff --git a/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch b/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch index 71b671c9..d88a4b21 100644 --- a/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch +++ b/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch @@ -7,7 +7,7 @@ Change-Id: I5eaad17a6f240aa1e3f246492b69f093b4f59fee Reviewed-by: David Schulz <david.schulz@qt.io> Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=14eb5b382cabf90352634393c19bf87a4c15766a] - +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/plugins/clangformat/clangformatbaseindenter.cpp | 4 ++++ src/plugins/clangformat/clangformatutils.cpp | 4 ++++ diff --git a/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch b/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch index 7c0e6d50..d2678b0c 100644 --- a/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch +++ b/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch @@ -7,7 +7,7 @@ Change-Id: Ia9db10696fd129c8b989ecc4c9ecbb7f1f10e68c Reviewed-by: David Schulz <david.schulz@qt.io> Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=55b91a76172a3235b4879daf0b675519d5b02db7] - +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/plugins/clangformat/clangformatutils.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb index ea656493..85bfcc35 100644 --- a/recipes-qt/qt5/qt5-creator_git.bb +++ b/recipes-qt/qt5/qt5-creator_git.bb @@ -17,14 +17,13 @@ inherit qmake5 pkgconfig mime-xdg DEPENDS += "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib" DEPENDS:append:libc-musl = " libexecinfo" -SRCREV = "94d227cd434d09717de95529e5210ec530451e1c" +SRCREV = "39ac7b1bf6add473026687003311b702742b6b21" PV = "4.15.2+git${SRCPV}" # Patches from https://github.com/meta-qt5/qtcreator/commits/b4.9.2 # 4.9.2.meta-qt5.1 SRC_URI = " \ git://code.qt.io/qt-creator/qt-creator.git;branch=4.15 \ file://0001-app-Use-malloc_trim-only-on-glibc.patch \ - file://0001-Fix-interface-of-propertyNameListForWritableProperti.patch \ file://0002-clangformat-Fix-build-with-LLVM-13.patch \ file://0003-clangformat-Fix-build-with-LLVM-13.patch \ " diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 12bdb1f5..b7672d3e 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -3,7 +3,7 @@ QT_MODULE ?= "${BPN}" QT_MODULE_BRANCH ?= "5.15" -QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" +QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" QT_MODULE_REPO ?= "${QT_MODULE}.git" # each module needs to define valid SRCREV @@ -11,8 +11,8 @@ SRC_URI = " \ ${QT_GIT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL} \ " -CVE_PRODUCT = "qt" +CVE_PRODUCT:append = " qt" S = "${WORKDIR}/git" -PV = "5.15.11+git${SRCPV}" +PV = "5.15.18+git${SRCPV}" diff --git a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch index 283601af..d4fb132c 100644 --- a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch +++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch @@ -52,6 +52,7 @@ Thread 1 "luna-next" received signal SIGSEGV, Segmentation fault. #3 0xb7afc6c1 in qLoadPlugin<QObject, QGenericPlugin, QString const&> (key=..., loader=<optimized out>) at ../../include/QtCore/../../../git/src/corelib/kernel/qobject.h:499 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Pending --- vboxtouch/vboxtouch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qt5-ptest.inc b/recipes-qt/qt5/qt5-ptest.inc index c96714a4..75d71ba9 100644 --- a/recipes-qt/qt5/qt5-ptest.inc +++ b/recipes-qt/qt5/qt5-ptest.inc @@ -10,6 +10,10 @@ do_compile_ptest() { oe_runmake } +DEBUG_PREFIX_MAP += "\ + -fmacro-prefix-map=${D}= \ +" + fakeroot do_install_ptest() { mkdir -p ${D}${PTEST_PATH} t=${D}${PTEST_PATH} diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 3cb17a55..2ed8aa50 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.QT-LICENSE-AGREEMENT;md5=38de3b110ade3b6ee2f0b6a95ab16f1a \ + file://LICENSE.QT-LICENSE-AGREEMENT;md5=485e1d58b313def058a0d72598aa6efe \ " require qt5-native.inc @@ -18,7 +18,7 @@ require qt5-lts.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared -# 5.15.meta-qt5-shared.3 +# 5.15.meta-qt5-shared.4 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -38,19 +38,21 @@ SRC_URI += "\ file://0017-Define-__NR_futex-if-it-does-not-exist.patch \ file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ + file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \ + file://0022-testlib-don-t-track-the-build-or-source-directories.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native -# 5.15.meta-qt5-native.3 +# 5.15.meta-qt5-native.4 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ - file://0022-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0023-Always-build-uic-and-qvkgen.patch \ + file://0024-Avoid-renameeat2-for-native-sdk-builds.patch \ " # only for qtbase-native SRC_URI += " \ - file://0023-Bootstrap-without-linkat-feature.patch \ + file://0025-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" @@ -143,4 +145,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 = "4c647100f7440c922da7c329a6c2501cf4794dde" +SRCREV = "8a25db3204f39a228d14148d9cdf414393d239a5" 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 f8eea812..85789f0d 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 168e5332f1f0dd4000f19b0ced0b1d68a1d65f16 Mon Sep 17 00:00:00 2001 +From 8f7ac021d483eca1b181fd9f0551f317aa7c5965 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -19,14 +19,15 @@ Upstream-Status: Inappropriate [embedded specific] Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + --- configure | 2 +- mkspecs/features/configure.prf | 4 +-- mkspecs/features/qt.prf | 6 ++--- mkspecs/features/qt_functions.prf | 2 +- - mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 1 + - 6 files changed, 47 insertions(+), 7 deletions(-) + 6 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h @@ -103,10 +104,10 @@ index 7777e615bd..8d792fa70a 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000000..c202c47fa1 +index 0000000000..087e13bb91 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -0,0 +1,39 @@ +@@ -0,0 +1,40 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -117,8 +118,9 @@ index 0000000000..c202c47fa1 + +include(../common/linux.conf) + -+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip ++# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar, objcopy and strip +QMAKE_AR = $$(OE_QMAKE_AR) cqs ++QMAKE_OBJCOPY = $$(OE_QMAKE_OBJCOPY) +QMAKE_STRIP = $$(OE_QMAKE_STRIP) + +include(../common/gcc-base-unix.conf) 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 c88e7ddd..ccac9b69 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 @@ -10,6 +10,7 @@ Also update length of EXT_PREFIX and HOST_PREFIX now. Change-Id: If98dd57160efe9c98c36148cdf872f50b3d38118 Signed-off-by: Denys Dmytriyenko <denys@ti.com> +Upstream-Status: Pending --- configure.pri | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch index 4be2e746..136b4ce1 100644 --- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Disable all unknown features instead of erroring out Task-number: QTBUG-56656 Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- mkspecs/features/qt_configure.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch index c057d03f..3210f2c8 100644 --- a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch +++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch @@ -4,6 +4,7 @@ Date: Wed, 7 Jun 2017 21:00:49 +0900 Subject: [PATCH] Delete qlonglong and qulonglong Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> +Upstream-Status: Pending --- tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch index 3457c53f..3cebfc11 100644 --- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch @@ -1,22 +1,23 @@ -From d47ae4638bf698c39225ff94dfb9f03ba4261b42 Mon Sep 17 00:00:00 2001 +From 9bf5632187b8f17cc0d626926df2784c38059875 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 3 Sep 2017 09:11:44 -0700 Subject: [PATCH] Add OE specific specs for clang compiler Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- - mkspecs/linux-oe-clang/qmake.conf | 39 ++++++++++++++++++++++++++ + mkspecs/linux-oe-clang/qmake.conf | 40 ++++++++++++++++++++++++++ mkspecs/linux-oe-clang/qplatformdefs.h | 1 + - 2 files changed, 40 insertions(+) + 2 files changed, 41 insertions(+) create mode 100644 mkspecs/linux-oe-clang/qmake.conf create mode 100644 mkspecs/linux-oe-clang/qplatformdefs.h diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf new file mode 100644 -index 0000000000..db02ab5215 +index 0000000000..c09b132ac8 --- /dev/null +++ b/mkspecs/linux-oe-clang/qmake.conf -@@ -0,0 +1,39 @@ +@@ -0,0 +1,40 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -27,8 +28,9 @@ index 0000000000..db02ab5215 + +include(../common/linux.conf) + -+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip ++# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar, objcopy and strip +QMAKE_AR = $$(OE_QMAKE_AR) cqs ++QMAKE_OBJCOPY = $$(OE_QMAKE_OBJCOPY) +QMAKE_STRIP = $$(OE_QMAKE_STRIP) + +include(../common/gcc-base-unix.conf) diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch index 9907952c..6279dc57 100644 --- a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch +++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch @@ -8,6 +8,7 @@ only when its glibc < 2 and not for other libcswhich may define it as per standards but are not glibc, e.g. musl Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- mkspecs/linux-clang/qplatformdefs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch index 704265ca..561cda05 100644 --- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch +++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch @@ -6,6 +6,7 @@ Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc musl does not have feenableexcept function Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase/0012-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0012-Disable-ltcg-for-host_build.patch index 8ecfa4f1..66945d21 100644 --- a/recipes-qt/qt5/qtbase/0012-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0012-Disable-ltcg-for-host_build.patch @@ -10,6 +10,7 @@ into debug packages. Task-number: QTBUG-71230 Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- mkspecs/features/ltcg.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase/0016-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch b/recipes-qt/qt5/qtbase/0016-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch index 06ee7c78..aa11a4be 100644 --- a/recipes-qt/qt5/qtbase/0016-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch +++ b/recipes-qt/qt5/qtbase/0016-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch @@ -7,7 +7,7 @@ the FE_INEXACT, FE_UNDERFLOW, FE_OVERFLOW, FE_DIVBYZERO, FE_INVALID are defined only for platforms with fp engine. Signed-off-by: Nicola Lunghi <nick83ola@gmail.com> -Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/289447] +Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/289447] --- .../gui/painting/qpainter/tst_qpainter.cpp | 50 ++++++++++++++----- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0018-Revert-Fix-workaround-in-pthread-destructor.patch b/recipes-qt/qt5/qtbase/0018-Revert-Fix-workaround-in-pthread-destructor.patch index 63dbbaf0..93a4a6ba 100644 --- a/recipes-qt/qt5/qtbase/0018-Revert-Fix-workaround-in-pthread-destructor.patch +++ b/recipes-qt/qt5/qtbase/0018-Revert-Fix-workaround-in-pthread-destructor.patch @@ -16,6 +16,9 @@ causing build failures in configurations which use this | /home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/cortexa8t2hf-neon-halium-webos-linux-gnueabi/qtbase/5.15.2+gitAUTOINC+40143c189b-r0/git/src/corelib/thread/qthread_unix.cpp:121:5: error: 'currentThreadData' was not declared in this scope | 121 | currentThreadData = data; | | ^~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/corelib/thread/qthread_unix.cpp | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch b/recipes-qt/qt5/qtbase/0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch new file mode 100644 index 00000000..521e6cc3 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch @@ -0,0 +1,29 @@ +From a2b11501812e0e34bd49b1950bac52dadd4e3cff Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 15 Oct 2022 15:50:34 +0200 +Subject: [PATCH] rcc: Just dcument file name without full path to reduce qa + warnings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + src/tools/rcc/rcc.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp +index c5e3d2ae4c..2d76cfd081 100644 +--- a/src/tools/rcc/rcc.cpp ++++ b/src/tools/rcc/rcc.cpp +@@ -344,7 +344,7 @@ qint64 RCCFileInfo::writeDataBlob(RCCResourceLibrary &lib, qint64 offset, + // some info + if (text || pass1) { + lib.writeString(" // "); +- lib.writeByteArray(m_fileInfo.absoluteFilePath().toLocal8Bit()); ++ lib.writeByteArray(m_fileInfo.baseName().toLocal8Bit()); + lib.writeString("\n "); + } + diff --git a/recipes-qt/qt5/qtbase/0022-testlib-don-t-track-the-build-or-source-directories.patch b/recipes-qt/qt5/qtbase/0022-testlib-don-t-track-the-build-or-source-directories.patch new file mode 100644 index 00000000..f16afed5 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0022-testlib-don-t-track-the-build-or-source-directories.patch @@ -0,0 +1,32 @@ +From 7d4da27df6ab641390de75dd7c04b755295a653b Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Mon, 22 Aug 2022 15:01:28 +0300 +Subject: [PATCH] testlib: don't track the build or source directories + +Build tests without location of the build and sources directories. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Change-Id: I8d5add473623a3d9f481097649819c9fb906e4b2 +--- + mkspecs/features/testlib_defines.prf | 2 -- + src/testlib/Qt5TestConfigExtras.cmake.in | 5 ----- + 2 files changed, 7 deletions(-) + +diff --git a/mkspecs/features/testlib_defines.prf b/mkspecs/features/testlib_defines.prf +index 901e03a91d..e69de29bb2 100644 +--- a/mkspecs/features/testlib_defines.prf ++++ b/mkspecs/features/testlib_defines.prf +@@ -1,2 +0,0 @@ +-contains(TEMPLATE, vc.*): DEFINES += QT_TESTCASE_BUILDDIR=\"$$OUT_PWD\" +-else: DEFINES += QT_TESTCASE_BUILDDIR=$$shell_quote(\"$$OUT_PWD\") +diff --git a/src/testlib/Qt5TestConfigExtras.cmake.in b/src/testlib/Qt5TestConfigExtras.cmake.in +index 2a575958ae..e69de29bb2 100644 +--- a/src/testlib/Qt5TestConfigExtras.cmake.in ++++ b/src/testlib/Qt5TestConfigExtras.cmake.in +@@ -1,5 +0,0 @@ +- +-set_property(TARGET Qt5::Test +- APPEND PROPERTY +- INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" +-) diff --git a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0023-Always-build-uic-and-qvkgen.patch index 5c878d72..7a100a69 100644 --- a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0023-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From 418c46b025edadc142ac60a6eb4c553dad19efed Mon Sep 17 00:00:00 2001 +From 5f415fb09ea64765e60d1d52721064f53545a413 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen @@ -9,6 +9,7 @@ as a native tool when compiling the target. Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Pending --- src/src.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase/0022-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0024-Avoid-renameeat2-for-native-sdk-builds.patch index fab399a2..97e4ff6c 100644 --- a/recipes-qt/qt5/qtbase/0022-Avoid-renameeat2-for-native-sdk-builds.patch +++ b/recipes-qt/qt5/qtbase/0024-Avoid-renameeat2-for-native-sdk-builds.patch @@ -1,4 +1,4 @@ -From 9ff02d5ebc1d0969306c57cbf77df861ec3924fc Mon Sep 17 00:00:00 2001 +From 77196464454a1c66e57ad5aac237a55de211a107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Sun, 14 Apr 2019 13:27:58 +0200 Subject: [PATCH] Avoid renameeat2 for native(sdk) builds diff --git a/recipes-qt/qt5/qtbase/0023-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0025-Bootstrap-without-linkat-feature.patch index f5e5268b..b759214b 100644 --- a/recipes-qt/qt5/qtbase/0023-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0025-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From f992d0551cd14c11fdb61511ac1d36ecf853089a Mon Sep 17 00:00:00 2001 +From a052a876d0639db2f919aada2ae0afe1718928af Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature @@ -7,6 +7,7 @@ qmake does not work together with pseudo when unnamed temporary files are used with linkat. Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> [YOCTO #11996] --- src/corelib/global/qconfig-bootstrapped.h | 2 +- diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index c0476026..4009afc5 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.QT-LICENSE-AGREEMENT;md5=38de3b110ade3b6ee2f0b6a95ab16f1a \ + file://LICENSE.QT-LICENSE-AGREEMENT;md5=485e1d58b313def058a0d72598aa6efe \ " # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared -# 5.15.meta-qt5-shared.3 +# 5.15.meta-qt5-shared.4 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -34,6 +34,8 @@ SRC_URI += "\ file://0017-Define-__NR_futex-if-it-does-not-exist.patch \ file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ + file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \ + file://0022-testlib-don-t-track-the-build-or-source-directories.patch \ " # Disable LTO for now, QT5 patches are being worked upstream, perhaps revisit with @@ -113,11 +115,11 @@ PACKAGECONFIG[no-opengl] = "-no-opengl" PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" PACKAGECONFIG[cups] = "-cups,-no-cups,cups" PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" -PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -no-bundled-xcb-xinput,-no-xcb,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil libxext" +PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -no-bundled-xcb-xinput -DUSE_X11=ON,-no-xcb,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil libxext" PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase" PACKAGECONFIG[sql-mysql] = "-sql-mysql -mysql_config ${STAGING_BINDIR_CROSS}/mysql_config,-no-sql-mysql,mysql5" PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql" -PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc" +PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc,unixodbc" PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci" PACKAGECONFIG[sql-tds] = "-sql-tds,-no-sql-tds" PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2" @@ -306,4 +308,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "4c647100f7440c922da7c329a6c2501cf4794dde" +SRCREV = "8a25db3204f39a228d14148d9cdf414393d239a5" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 7d44acc9..05160cb2 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 = "38e7e362334734bc28b0b1afa2c4d62bcc8e78b1" +SRCREV = "9da73121e87e7078f4f5ae2260c884d644242164" # 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 a965fbda..df48de45 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 = "a82e6785f001a64c57a8440ff1c5a67428d084d7" +SRCREV = "a9401d789d70e36d7f431bc1272c3ae95c2a5def" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 83f68522..47c31f4b 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 = "807c62ddee0749b68458654f7d37b28aceca6359" +SRCREV = "4c39684c31a2bfae5ac7d15b4c959ceb50101451" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 42b61652..9565c834 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 = "770d9a90b9b8ed3042fcdaf579ca87ecb006e50c" +SRCREV = "4482ce78012a754f0a95bcbf0ab7f29b6326eb86" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index b4bb54f2..5ade81be 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -53,6 +53,6 @@ do_install:append:class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "e404db276e958bcfd462c7e0cb2db89d11bedc44" +SRCREV = "73eeb35f09fd1ea846bb0f5ce507316f587fda9f" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 28ab77b0..dbe696b5 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -16,4 +16,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "8370c458c23a39f8df64650d452c03268ca96113" +SRCREV = "01a74df25b14981cf054d58ac238083f5715c80c" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 230b7922..2a7f7268 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 = "f1e069d519f051cb5645ecffe84289354fb66a49" +SRCREV = "161bf75024a8d04bf843c058717feef93de73624" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 3fc4583e..4986276c 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 = "8fb9a4fdcb05984bb6e9e532e4462aa7bfbeb62e" +SRCREV = "348a2b3860519a00f8b8f4cb690497b3f2ac5e7b" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index d4cedaf8..3ce3a0ef 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 = "c0e5becf7b9e2d8d7eca05ad9a22da02c0e7d4cb" +SRCREV = "f3a5a0a7b03ec565ab565ab316db974384eb59e1" diff --git a/recipes-qt/qt5/qtlocation/0001-mapbox-gl-explicitly-include-cstdint-header.patch b/recipes-qt/qt5/qtlocation/0001-mapbox-gl-explicitly-include-cstdint-header.patch new file mode 100644 index 00000000..78b5468e --- /dev/null +++ b/recipes-qt/qt5/qtlocation/0001-mapbox-gl-explicitly-include-cstdint-header.patch @@ -0,0 +1,52 @@ +From 92ce461e77dad3451eb5791efe7413a989dc2c3c Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <denys@konsulko.com> +Date: Wed, 7 Jun 2023 22:59:53 +0000 +Subject: [PATCH] mapbox-gl: explicitly include cstdint header + +Otherwise gcc13 report "undeclared" error for uint8_t and uint32_t + +Upstream-Status: Pending + +Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> +--- + include/mbgl/util/geometry.hpp | 1 + + include/mbgl/util/string.hpp | 1 + + src/mbgl/gl/stencil_mode.hpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/include/mbgl/util/geometry.hpp b/include/mbgl/util/geometry.hpp +index a28c59a47..92d928a37 100644 +--- a/include/mbgl/util/geometry.hpp ++++ b/include/mbgl/util/geometry.hpp +@@ -1,5 +1,6 @@ + #pragma once + ++#include <cstdint> + #include <mapbox/geometry/geometry.hpp> + #include <mapbox/geometry/point_arithmetic.hpp> + #include <mapbox/geometry/for_each_point.hpp> +diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp +index 13498ccb9..726f7f6fc 100644 +--- a/include/mbgl/util/string.hpp ++++ b/include/mbgl/util/string.hpp +@@ -1,5 +1,6 @@ + #pragma once + ++#include <cstdint> + #include <sstream> + #include <string> + #include <cassert> +diff --git a/src/mbgl/gl/stencil_mode.hpp b/src/mbgl/gl/stencil_mode.hpp +index bc959c9a7..2fc62bba7 100644 +--- a/src/mbgl/gl/stencil_mode.hpp ++++ b/src/mbgl/gl/stencil_mode.hpp +@@ -1,5 +1,6 @@ + #pragma once + ++#include <cstdint> + #include <mbgl/util/variant.hpp> + + namespace mbgl { +-- +2.25.1 + diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 8fd972a9..0aaaf9d2 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -33,9 +33,10 @@ QT_MODULE_BRANCH_MAPBOXGL = "upstream/qt-staging" 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 \ + file://0001-mapbox-gl-explicitly-include-cstdint-header.patch;patchdir=src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "63d055e875d35fe136a09707b8bc4b2f324dd4f7" +SRCREV_qtlocation = "ff8d83c1b94fe6f13247b844268c0c6816081e6d" 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 41d25095..c6a6e0cb 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 = "77bb69569615bc607e78e6c3279b43663a74e6a5" +SRCREV = "a56808f219f9a660dd48ee7e330d0bf86d2cee9b" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 2148a1de..f2caefb2 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 = "ea673b2e696b4ac7726cede34b0fbf6f6f311a6e" +SRCREV = "690889a590a18495b79217d4ef0436165bf1a74b" diff --git a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch index 4f9e78d6..6973e235 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch @@ -7,6 +7,7 @@ Use lgl2.h instead of gl2.h and gl2ext.h, fix a "conflicting declaration" error. Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> +Upstream-Status: Pending --- src/plugins/videonode/imx6/lgl2.h | 46 +++++++++++++++++++ .../imx6/qsgvivantevideomaterial.cpp | 5 +- diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index ee9fb7dd..8d90bd9b 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -40,7 +40,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 = "11c4ad2c8a39819c9359341ef0145984b9ac16d0" +SRCREV = "b46203a7c4e4889c76f59e4a72da68a069a8f9c4" # 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 c9a85ba6..61fb42c3 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-lts.inc DEPENDS += "qtbase" -SRCREV = "0dda48d823238f509a1bb4459abbb50989f6f0a0" +SRCREV = "0d6e283941f75ad01f13c471a3e88dbd885d89df" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index feb0cd98..46fc7c9a 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "03c7dd9ff387bc0af7a99cd28f8c9fbf3b3021f0" +SRCREV = "950f40dcc2d365d6e9ac60fe20178c8ba48a1b6a" diff --git a/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch b/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch index 5e88e578..013832e5 100644 --- a/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch +++ b/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch @@ -1,21 +1,23 @@ -From 8214eac226762702f5a652a07f3b15d60cd09c98 Mon Sep 17 00:00:00 2001 +From be54e6e336001ed3ed342f65f379c2e355d847f0 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com> Date: Tue, 8 Feb 2022 14:14:02 +0100 Subject: [PATCH] configure.json: remove python2 dependency +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/buildtools/configure.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json -index 9eb5e8e33..ebe31c216 100644 +index 5e5d9d725..541b7b740 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json -@@ -399,7 +399,6 @@ +@@ -422,7 +422,6 @@ && 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) diff --git a/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch b/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch index 920d1f35..c95e7d02 100644 --- a/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch +++ b/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch @@ -1,8 +1,10 @@ -From f98019bb6712fdfa1f3387baefe6b604e6191a88 Mon Sep 17 00:00:00 2001 +From 6e25650c829bf1052f607b3f3edbdf88f163efe0 Mon Sep 17 00:00:00 2001 From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com> Date: Tue, 8 Feb 2022 16:28:14 +0100 Subject: [PATCH] gn.pro: do not try to statically link stdc++ +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/buildtools/gn.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtpdf/0003-Fix-build-with-clang.patch b/recipes-qt/qt5/qtpdf/0003-Fix-build-with-clang.patch index f5efddd4..21fe4f0b 100644 --- a/recipes-qt/qt5/qtpdf/0003-Fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtpdf/0003-Fix-build-with-clang.patch @@ -1,4 +1,4 @@ -From b9ebaa970dbb050a51021a013e8d5b6d5aac86ab Mon Sep 17 00:00:00 2001 +From 9e1036a25207f9013a13b23401feacd72866be4c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 26 Feb 2022 18:15:28 -0800 Subject: [PATCH] Fix build with clang @@ -21,19 +21,20 @@ Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - src/buildtools/gn.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/buildtools/gn.pro | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro -index 9632f0ef7..da85f8a26 100644 +index 9632f0ef7..5ff50cca1 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro -@@ -20,7 +20,7 @@ build_pass|!debug_and_release { +@@ -20,8 +20,7 @@ build_pass|!debug_and_release { gn_gen_args = --no-last-commit-position --out-path $$out_path \ --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ - --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" \ -+ --ld \"$$which($$CXX_host) -rtlib=libgcc -unwindlib=libgcc\" --ar \"$$which(ar)\" \ - --no-static-libstdc++ +- --no-static-libstdc++ ++ --ld \"$$which($$CXX_host) -stdlib=libc++ -rtlib=libgcc -unwindlib=libgcc $$(GN_HOST_TOOLCHAIN_EXTRA_LDFLAGS)\" --ar \"$$which(ar)\" msvc:!clang_cl: gn_gen_args += --use-lto + diff --git a/recipes-qt/qt5/qtpdf_git.bb b/recipes-qt/qt5/qtpdf_git.bb index c742c24e..ad17f36e 100644 --- a/recipes-qt/qt5/qtpdf_git.bb +++ b/recipes-qt/qt5/qtpdf_git.bb @@ -71,6 +71,7 @@ COMPATIBLE_MACHINE:armv6 = "(.*)" COMPATIBLE_MACHINE:armv7a = "(.*)" COMPATIBLE_MACHINE:armv7ve = "(.*)" COMPATIBLE_MACHINE:aarch64 = "(.*)" +COMPATIBLE_MACHINE:riscv64 = "(.*)" inherit qmake5 inherit gettext @@ -90,6 +91,7 @@ require qt5-git.inc export GN_PKG_CONFIG_HOST = "${STAGING_BINDIR_NATIVE}/pkg-config-native" export GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS = "-I${STAGING_DIR_NATIVE}/usr/include" +export GN_HOST_TOOLCHAIN_EXTRA_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE}" export NINJAFLAGS="${PARALLEL_MAKE}" do_configure() { @@ -134,13 +136,13 @@ QT_MODULE = "qtwebengine" FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtwebengine:" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc -# 5.15-glibc.meta-qt5.15 +# 5.15-glibc.meta-qt5.17 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 -# 5.15.meta-qt5.15 +# 5.15.meta-qt5.17 SRC_URI:append:libc-musl = "\ file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ file://0003-musl-link-against-libexecinfo.patch \ @@ -148,7 +150,7 @@ SRC_URI:append:libc-musl = "\ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based-glibc -# 87-based-glibc.meta-qt5.9 +# 87-based-glibc.meta-qt5.11 SRC_URI += " \ file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ @@ -160,12 +162,13 @@ SRC_URI += " \ file://chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ file://chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ file://chromium/0010-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ - file://chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch;patchdir=src/3rdparty \ - file://chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \ + file://chromium/0011-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \ + file://chromium/0012-Remove-unsetting-_FILE_OFFSET_BITS.patch;patchdir=src/3rdparty \ + file://chromium/0024-Fix-dependecy-when-compiling-content-browser.patch;patchdir=src/3rdparty \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based -# 87-based.meta-qt5.9 +# 87-based.meta-qt5.11 SRC_URI:append:libc-musl = "\ file://chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ file://chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ @@ -180,8 +183,8 @@ SRC_URI:append:libc-musl = "\ file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "c107eb20a25157836fcf3be91566d8ea38490f40" -SRCREV_chromium = "7e11d69b957595a172a3eb60db17141daed29d63" +SRCREV_qtwebengine = "17fd3176988586168bee8654008a097a5f23ec1d" +SRCREV_chromium = "fdfef5b37af3bed8402d7c7e20a5487f2602b0a6" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" @@ -198,7 +201,7 @@ INSANE_SKIP:${PN} += "textrel" # First patch skips "python2" dependency checks for the pdf module # Second patch repairs a failing build of the `gn` buildtool due to missing (host) libstdc++ # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-qtpdf -# 5.15-qtpdf.meta-qt5.2 +# 5.15-qtpdf.meta-qt5.5 SRC_URI += " \ file://0001-configure.json-remove-python2-dependency.patch \ file://0002-gn.pro-do-not-try-to-statically-link-stdc.patch \ @@ -208,7 +211,7 @@ SRC_URI:append:toolchain-clang:runtime-llvm = " file://0003-Fix-build-with-clang # These flags below go more into detail than qtwebengine's documentation PACKAGECONFIG[no-core] = "-no-build-qtwebengine-core,," PACKAGECONFIG[qtpdf] = "-feature-build-qtpdf,-no-feature-build-qtpdf,python3-native" -PACKAGECONFIG[webengine-pdf] = "-feature-webengine-python2,-no-feature-webengine-python2,python3-native" +PACKAGECONFIG[webengine-pdf] = "-feature-webengine-python,-no-feature-webengine-python,python3-native" # The flags below enable just the PDF widget PACKAGECONFIG = "no-core qtpdf" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 20132eb2..1d93d2a5 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 = "83b81903934789c59775a1b2982f2abe743b8737" +SRCREV = "e879db20f84340a9eaef66cd34137eafa5388b00" diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index e15fd759..9349e098 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtquickcontrols2" SRC_URI += " \ - git://github.com/assimp/assimp.git;name=assimp;branch=assimp_5.0_release;protocol=https;destsuffix=git/src/3rdparty/assimp/src \ + git://code.qt.io/qt/qtquick3d-assimp.git;name=assimp;branch=qt6_assimp;protocol=https;destsuffix=git/src/3rdparty/assimp/src \ " PACKAGECONFIG ??= "" @@ -21,7 +21,7 @@ FILES:${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ " -SRCREV_qtquick3d = "aaa458855a45355518f21adf926744ba0a06d3f1" +SRCREV_qtquick3d = "d3272d49a0a01714bc486e0fd39ae2bbfe7a74c6" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" SRCREV_FORMAT = "qtquick3d_assimp" diff --git a/recipes-qt/qt5/qtquickcontrols2/0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch b/recipes-qt/qt5/qtquickcontrols2/0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch index a5512bbe..1692e2de 100644 --- a/recipes-qt/qt5/qtquickcontrols2/0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch +++ b/recipes-qt/qt5/qtquickcontrols2/0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch @@ -13,6 +13,7 @@ Reported but nobody cares. [1] Upstream-Status: Pending This reverts commit 761dba8b23b7e558acc57b3e481648ce319a4397. +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/quicktemplates2/qquickpopuppositioner.cpp | 18 +++++++-------- .../qquickpopuppositioner_p_p.h | 1 - diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 3317564a..7ad39bef 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative qtdeclarative-native" SRC_URI += "file://0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch" -SRCREV = "56acab014d490951f14e6719b7bd535146646fc7" +SRCREV = "32755d45229fdcb2de7af1b21a23d9649773d6cb" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 5d7d1574..fcde2ea9 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 = "47ff5f00e040dc089b411b18c2b2d73ed14a25d9" +SRCREV = "dd98d78caa6f68c9aa6ffe61445ddfed701daf98" diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb index 422b5bd2..c31d119f 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 = "027a12f59085f222f7fbd8132a3a1d18329f33d6" +SRCREV = "4278a28a27317bbb30c978ccc21e2e58d83d5d1f" diff --git a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch index 5ae00be7..90588176 100644 --- a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch @@ -4,6 +4,8 @@ Date: Wed, 7 Jun 2017 15:17:12 +0300 Subject: [PATCH] Allow a tools-only build Change-Id: I3b33fc1c8877fc82568bd386b063e7a0aa57b706 +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- mkspecs/features/repccommon.pri | 2 +- qtremoteobjects.pro | 5 +++++ diff --git a/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch index 92a97b29..b0bfd34e 100644 --- a/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch +++ b/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch @@ -3,6 +3,8 @@ From: ibinderwolf <daniel@bluepattern.net> Date: Wed, 26 Jun 2019 09:46:48 +0200 Subject: [PATCH] cmake Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/remoteobjects/Qt5RemoteObjectsConfigExtras.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index ebf7d1f3..3dd17b2d 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 = "e661b07a1ef910be9b9591078c73a38e3127bc12" +SRCREV = "e006bf7ec70e4e1617810667f992aa3f9b01cd0f" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index b524fbc9..ded1b5a7 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 = "f237e324508dcf0dbabde9dd498eda9fa61c4ff0" +SRCREV = "572daa83e990ce88cca27909470c5404657ec9de" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 9c1a4b3b..8a105e4b 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-lts.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "7317cfd666b6f803ce23476bb80da91eb7a6455a" +SRCREV = "9c12ec9ad94d84f3c2319cc461b6342bdfd3b593" # 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 ddbfb5d1..62312884 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 = "f2498cb7f148a5e87fa73d066db115860914375f" +SRCREV = "83ee0a26e791e0a9ea01df2109e26053d3ec2ab5" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 611b359b..c5e20fc9 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -17,4 +17,4 @@ PACKAGECONFIG[socketcan] = "-feature-socketcan,-no-feature-socketcan,,libsocketc EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "db246244f5079e87a204d3f2d46d5992ab34e181" +SRCREV = "58372774dcadfbfeb1f375103d1cd58b9ef1225a" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index a26c0f54..1c5bce54 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 = "03a18a2229ff2aee032f406a3e2ad413aae75939" +SRCREV = "f4663160f1c5d0b1806f43ef2d1d25a5103995ec" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 98c0747a..5378985f 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 = "c81b0033700ae0f424aa8f2fbc6bc1c47056444d" +SRCREV = "59b581701c0cb888f6ac9b6b3ef78b26b6d30d8d" diff --git a/recipes-qt/qt5/qtsystems/0001-qtsystems-install-files-only-once.patch b/recipes-qt/qt5/qtsystems/0001-qtsystems-install-files-only-once.patch index 93a34f2b..93d34b8d 100644 --- a/recipes-qt/qt5/qtsystems/0001-qtsystems-install-files-only-once.patch +++ b/recipes-qt/qt5/qtsystems/0001-qtsystems-install-files-only-once.patch @@ -7,6 +7,7 @@ This fixes build error for qtsystems when it tries to install files multiple times and fails with error of "Destination file exists". +Upstream-Status: Pending Signed-off-by: ansar-rasool <ansar_rasool@mentor.com> --- examples/systeminfo/inputinfo/inputinfo.pro | 3 +-- diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 8d3eca5e..4389d992 100644 --- a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Inappropiate [configuration] +Upstream-Status: Inappropriate [configuration] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> diff --git a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch index 6f570d62..1cdfc433 100644 --- a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch @@ -4,6 +4,8 @@ Date: Mon, 18 Feb 2019 10:45:03 +0200 Subject: [PATCH] linguist-tools cmake: allow overriding the location for lupdate and lrelease +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/linguist/Qt5LinguistToolsConfig.cmake.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch index 3ee3fda6..32de7de1 100644 --- a/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch +++ b/recipes-qt/qt5/qttools/0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch @@ -5,6 +5,7 @@ Subject: [PATCH] src.pro: Add option noqdoc to disable qdoc builds it needs clang on host, so lets separate it out +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/src.pro | 2 +- diff --git a/recipes-qt/qt5/qttools/0004-Force-native-build-of-qt-help-tools-as-qhelpgenerato.patch b/recipes-qt/qt5/qttools/0004-Force-native-build-of-qt-help-tools-as-qhelpgenerato.patch index 4bc53c79..bc833e0b 100644 --- a/recipes-qt/qt5/qttools/0004-Force-native-build-of-qt-help-tools-as-qhelpgenerato.patch +++ b/recipes-qt/qt5/qttools/0004-Force-native-build-of-qt-help-tools-as-qhelpgenerato.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstrem-Statu: Inappropriate [embedded specific] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index b76a34e7..83434189 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -24,6 +24,10 @@ SRC_URI:append:class-native = " ${@bb.utils.contains('PACKAGECONFIG', 'clang', ' FILES:${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks" FILES:${PN}-examples = "${datadir}${QT_DIR_NAME}/examples" +# Without "opengl" in DISTRO_FEATURES, the libQt5UiTools.a library isn't generated, but qttools-staticdev +# is required by packagegroup-qt5-toolchain-target. +ALLOW_EMPTY:${PN}-staticdev = "1" + PACKAGECONFIG ??= "" PACKAGECONFIG:append:toolchain-clang = " clang" @@ -39,7 +43,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \ " -SRCREV = "723bca3fae97de0b39d6f2d015e68baf36ea649c" +SRCREV = "bc3cbd02fe57d01c6d8378c82cd60974ec0886c7" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 28e0f8ba..0a103c14 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 = "6983a12db7a9376c7043e071ad4ebd6d4acac77a" +SRCREV = "8a0280788ec15f496c78a3c06e641e4fae087409" diff --git a/recipes-qt/qt5/qtvirtualkeyboard/0001-replace-deprecated-std-auto_ptr-with-std-unique_ptr.patch b/recipes-qt/qt5/qtvirtualkeyboard/0001-replace-deprecated-std-auto_ptr-with-std-unique_ptr.patch new file mode 100644 index 00000000..874c079c --- /dev/null +++ b/recipes-qt/qt5/qtvirtualkeyboard/0001-replace-deprecated-std-auto_ptr-with-std-unique_ptr.patch @@ -0,0 +1,66 @@ +From fe4546abf79cf2e93e151fe8cd771901f9b768d3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 7 Feb 2023 23:11:18 -0800 +Subject: [PATCH] replace deprecated std::auto_ptr with std::unique_ptr + +auto_ptr is gone with c++17 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../lipi-toolkit/src/util/lib/LTKLoggerUtil.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/src/util/lib/LTKLoggerUtil.cpp b/src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/src/util/lib/LTKLoggerUtil.cpp +index 1971a69d..894028e4 100644 +--- a/src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/src/util/lib/LTKLoggerUtil.cpp ++++ b/src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/src/util/lib/LTKLoggerUtil.cpp +@@ -96,7 +96,7 @@ LTKLoggerUtil::LTKLoggerUtil(){} + int LTKLoggerUtil::createLogger(const string& lipiLibPath) + { + void* functionHandle = NULL; +- auto_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); ++ unique_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); + + int iErrorCode = a_ptrOSUtil->loadSharedLib(lipiLibPath, + LOGGER_MODULE_STR, +@@ -159,7 +159,7 @@ int LTKLoggerUtil::createLogger(const string& lipiLibPath) + *****************************************************************************/ + int LTKLoggerUtil::destroyLogger() + { +- auto_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); ++ unique_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); + + if (module_destroyLogger != NULL ) + { +@@ -196,7 +196,7 @@ int LTKLoggerUtil::configureLogger(const string& logFile, LTKLogger::EDebugLevel + LTKReturnError(ELOGGER_LIBRARY_NOT_LOADED); + } + +- auto_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); ++ unique_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); + + if ( logFile.length() != 0 ) + { +@@ -257,7 +257,7 @@ int LTKLoggerUtil::getAddressLoggerFunctions() + void* functionHandle = NULL; + int returnVal = SUCCESS; + +- auto_ptr<LTKOSUtil> a_ptrOSUtil; ++ unique_ptr<LTKOSUtil> a_ptrOSUtil; + + //start log + +@@ -323,7 +323,7 @@ ostream& LTKLoggerUtil::logMessage(LTKLogger::EDebugLevel logLevel, string inStr + { + if (m_libHandleLogger == NULL) + { +- auto_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); ++ unique_ptr<LTKOSUtil> a_ptrOSUtil(LTKOSUtilFactory::getInstance()); + m_libHandleLogger = a_ptrOSUtil->getLibraryHandle(LOGGER_MODULE_STR); + + if (m_libHandleLogger == NULL) +-- +2.39.1 + diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 1dd2754e..32cb27fd 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " +SRC_URI += "file://0001-replace-deprecated-std-auto_ptr-with-std-unique_ptr.patch" + # To enabled Nuance T9 Write support, you need to provide the licensed components # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file. # for example: @@ -71,4 +73,4 @@ FILES:${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "82e9824334a3ab7a4e0b6079de75df0915b316f9" +SRCREV = "b613d3c2ae8301028bbdc8dafbf6bf288d746886" diff --git a/recipes-qt/qt5/qtwayland/0001-Fix-vulkan-buffer-formats-for-GLES2.patch b/recipes-qt/qt5/qtwayland/0001-Fix-vulkan-buffer-formats-for-GLES2.patch index 2a9516ad..ecaf5d60 100644 --- a/recipes-qt/qt5/qtwayland/0001-Fix-vulkan-buffer-formats-for-GLES2.patch +++ b/recipes-qt/qt5/qtwayland/0001-Fix-vulkan-buffer-formats-for-GLES2.patch @@ -8,6 +8,7 @@ vulkanserverbufferintegration.cpp:163:77: error: use of undeclared identifier 'G if (extraDebug) qDebug() << "format" << Qt::hex << m_internalFormat << GL_RGBA8; ^ +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../client/vulkan-server/vulkanserverbufferintegration.cpp | 2 +- diff --git a/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch b/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch index ae205b89..854ca45c 100644 --- a/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch +++ b/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch @@ -7,6 +7,7 @@ build fails with libc++ otherwise tests/auto/client/seatv4/tst_seatv4.cpp:330:43: error: implicit instantiation of undefined template 'std::__1::array<const char *, 4>' +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- tests/auto/client/seatv4/tst_seatv4.cpp | 2 +- diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 09326059..828822f6 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -48,7 +48,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "16efc74256ef4759881bfda0dcbcbe7cce0fb7d5" +SRCREV = "4f363a988155c86757ecd36c81393a7ba9fc8c95" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 0e72532c..486a7bd9 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 = "83c01d1e98178c84b6ef540019b2a46a3bf47113" +SRCREV = "f887498f50123b96411070e7b1d5c9ff89b07732" diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index cec6c56a..7daa801a 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From bae24edf61de8e374a43b7eede7be8c90a2a32e5 Mon Sep 17 00:00:00 2001 +From ecde45984c610529c25257324252fb2ba01fe4ca Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -14,9 +14,9 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> --- src/buildtools/config/linux.pri | 2 +- - src/buildtools/configure_host.pro | 14 +++++++------- + src/buildtools/configure_host.pro | 16 +++++++++------- src/buildtools/gn.pro | 5 ++--- - 3 files changed, 10 insertions(+), 11 deletions(-) + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri index 7507d51ef..1e078cbfe 100644 @@ -32,7 +32,7 @@ index 7507d51ef..1e078cbfe 100644 # Don't bother trying to use system libraries in this case gn_args += use_glib=false diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro -index dd0d3e327..6312c8678 100644 +index dd0d3e327..3d39198f3 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -4,7 +4,7 @@ TEMPLATE = aux @@ -44,7 +44,15 @@ index dd0d3e327..6312c8678 100644 !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH) else: GN_TARGET_CPU = $$GN_HOST_CPU GN_OS = $$gnOS() -@@ -31,9 +31,9 @@ GN_CONTENTS = \ +@@ -24,6 +24,7 @@ contains(GN_TARGET_CPU, "arm")|contains(GN_TARGET_CPU, "mipsel")|contains(GN_TAR + } + + GN_HOST_EXTRA_CPPFLAGS = $$(GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS) ++GN_HOST_EXTRA_LDFLAGS = $$(GN_HOST_TOOLCHAIN_EXTRA_LDFLAGS) + + # We always use the gcc_toolchain, because clang_toolchain is just + # a broken wrapper around it for Google's custom clang binaries. +@@ -31,12 +32,13 @@ GN_CONTENTS = \ "import(\"//build/config/sysroot.gni\")" \ "import(\"//build/toolchain/gcc_toolchain.gni\")" \ "gcc_toolchain(\"host\") {" \ @@ -57,7 +65,11 @@ index dd0d3e327..6312c8678 100644 " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ -@@ -45,9 +45,9 @@ GN_CONTENTS = \ ++" extra_ldflags = \"$$GN_HOST_EXTRA_LDFLAGS\" " \ + " toolchain_args = { " \ + " current_os = \"$$GN_OS\" " \ + " current_cpu = \"$$GN_HOST_CPU\" " \ +@@ -45,9 +47,9 @@ GN_CONTENTS = \ " } " \ "}" \ "gcc_toolchain(\"v8_snapshot\") {" \ diff --git a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index 5a642486..d8044c9f 100644 --- a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch @@ -1,10 +1,11 @@ -From b136b5999396d4ee3363bfdaee4db7e571ba9aa7 Mon Sep 17 00:00:00 2001 +From a6c1cdbb588359676888b7961c063d1d13d05a2a Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Tue, 12 Dec 2017 16:06:14 +0200 Subject: [PATCH] musl: don't use pvalloc as it's not available on musl Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> +Upstream-Status: Pending --- src/core/api/qtbug-61521.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch index 0d4924ea..f8f4229d 100644 --- a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch @@ -1,10 +1,11 @@ -From 9046f8a87da16f3605f600cc6beb039f40bdaa14 Mon Sep 17 00:00:00 2001 +From 84938d171df35970e3444b8f7b0abc9c2b275f9f Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Thu, 14 Dec 2017 11:28:10 +0200 Subject: [PATCH] musl: link against libexecinfo Change-Id: Ifada60f9c72691973612850121f6fb152d70839a Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> +Upstream-Status: Pending --- src/core/core_module.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch index 2e58b43e..da4cea8d 100644 --- a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch @@ -1,8 +1,9 @@ -From 0ffba1b9cba1421c3751b2f20ba84fca356911fb Mon Sep 17 00:00:00 2001 +From d30d88b852e3b46086ce92f4dfaedfe21ee926a8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 12 Nov 2019 19:53:59 -0800 Subject: [PATCH] mkspecs: Allow builds with libc != glibc +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/buildtools/config/support.pri | 4 ---- 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 d4a355c7..6712cef6 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 8eec6045850c5786b18f89b4444c5e2c68b64a31 Mon Sep 17 00:00:00 2001 +From ba309beb6cdd4a0cd343cc8043464714cd5e8c3e Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Thu, 30 Mar 2017 11:37:24 +0300 Subject: [PATCH] chromium: workaround for too long .rps file name @@ -13,6 +13,8 @@ le.rsp): Unable to create file. File name too long Task-number: QTBUG-59769 Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1 +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- gn/tools/gn/ninja_action_target_writer.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch index e232dbe2..a7d8a1c5 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch @@ -1,4 +1,4 @@ -From a88d4dfdb0f9d27a0acc8f28167fbb09d913fd75 Mon Sep 17 00:00:00 2001 +From a67f504fcc2c96ea7e7a57e44dc9c6d559f19838 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 2 Feb 2019 19:28:59 -0800 Subject: [PATCH] chromium: fix build with clang diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch index 8e14d145..3dfcb1af 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch @@ -1,4 +1,4 @@ -From b2e7a10448d984eb62810ad5c41720d61599cecc Mon Sep 17 00:00:00 2001 +From cf19db916e8566a8c19e9a5aeeb6a9e6a7f08111 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 5 Feb 2019 14:32:20 -0800 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm @@ -11,20 +11,20 @@ src/3rdparty/chromium/third_party/zlib/crc32_simd.c:184: undefined reference to Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - chromium/third_party/zlib/BUILD.gn | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + chromium/third_party/zlib/BUILD.gn | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn -index 891c2c34bfb..5ab519bd133 100644 +index 44b827155b2..16892b8d284 100644 --- a/chromium/third_party/zlib/BUILD.gn +++ b/chromium/third_party/zlib/BUILD.gn -@@ -115,8 +115,11 @@ if (use_arm_neon_optimizations) { +@@ -129,8 +129,12 @@ 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." + defines = [] - if (!is_ios) { -- defines = [ "CRC32_ARMV8_CRC32" ] + if (!is_ios && !use_qt) { + defines = [ "CRC32_ARMV8_CRC32" ] + if (current_cpu == "arm64") { + defines += [ "CRC32_ARMV8_CRC32" ] + } diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch index 7e7fbed2..4a82d69d 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch @@ -1,4 +1,4 @@ -From 6b188e734a8cfa68f5c14e46e90fc89cbcb8313c Mon Sep 17 00:00:00 2001 +From 1dd881dafa5d61f9a260dd54092689868869f066 Mon Sep 17 00:00:00 2001 From: Johannes Pointner <johannes.pointner@br-automation.com> Date: Fri, 3 May 2019 09:12:38 +0200 Subject: [PATCH] chromium: Do not try to set the guessed values for diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch index 6170047f..8ce307c9 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch @@ -1,4 +1,4 @@ -From e142cbdc339bcc73c3f41f512b67ddf7a694337e Mon Sep 17 00:00:00 2001 +From 73c864315f3d14ba232657232d145795adf25d89 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jslaby@suse.cz> Date: Thu, 11 Jul 2019 09:35:13 +0200 Subject: [PATCH] chromium: fix build after y2038 changes in glibc diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 8f18779c..b05d9163 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -1,4 +1,4 @@ -From bcf1d52853fc5e603ff4bca3495f860e81994108 Mon Sep 17 00:00:00 2001 +From c9c77a6fdd6679815f8c68f1e519a317472e7bc5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 30 Nov 2019 10:07:43 -0800 Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t @@ -8,6 +8,7 @@ input.h [1] [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch index b6a9d9e6..87893de6 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch @@ -1,4 +1,4 @@ -From 4b3b7ae386d300f784d44d93c875908e082af154 Mon Sep 17 00:00:00 2001 +From 851073e7af2c21567e1d8c1a15639fcc6e01be40 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 25 Dec 2019 15:41:16 -0800 Subject: [PATCH] chromium: Include cstddef for size_t definition diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch index 3e311165..603173d1 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch @@ -1,4 +1,4 @@ -From da832c778d013f4217e2d704c27c1d2e19a9364c Mon Sep 17 00:00:00 2001 +From 50f862c3bed6f13932d43da5c992d3dacfdfe00e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 2 Jan 2020 17:13:55 -0800 Subject: [PATCH] chromium: Move CharAllocator definition to a header @@ -7,6 +7,7 @@ Subject: [PATCH] chromium: Move CharAllocator definition to a header Fixes error: invalid application of 'sizeof' to an incomplete type 'cc::ListContainerHelper::CharAllocator' +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- chromium/cc/base/list_container_helper.cc | 251 --------------------- diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch index c360999b..f1385890 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch @@ -1,4 +1,4 @@ -From 7f9421b4609d8a1f9590152fb3976de22e9a1b12 Mon Sep 17 00:00:00 2001 +From df7f7525ece62cde56de905098bd6000483f10d2 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 1 Feb 2020 12:17:23 -0800 Subject: [PATCH] chromium: Link v8 with libatomic on x86 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch index 03856a05..7b648671 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch @@ -1,4 +1,4 @@ -From 8a0c927cdc9705e2a1c29d63c87d32e8cb089510 Mon Sep 17 00:00:00 2001 +From 7cc4c3490f01cec09f9ca63e36cf34c9977243f0 Mon Sep 17 00:00:00 2001 From: Andrej Valek <andrej.valek@siemens.com> Date: Fri, 17 Apr 2020 09:43:32 +0200 Subject: [PATCH] chromium: icu: use system library only targets @@ -13,6 +13,7 @@ On the other hand webenegine does not produce external native artifacts. So external system ICU linking is not needed. +Upstream-Status: Pending Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch deleted file mode 100644 index a3b35d30..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 308bddc0bfedb6ab222e3b626ef9bb5234c819b4 Mon Sep 17 00:00:00 2001 -From: Frank Tang <ftang@chromium.org> -Date: Tue, 20 Oct 2020 01:09:43 +0000 -Subject: [PATCH] chromium: Remove TRUE to prep landing of icu68 - -ICU 68, to work with C++20, remove the #define of TRUE -since the usage in libxml is as an int, use 1 instead. - -Upstream-Status: Backport [https://github.com/chromium/chromium/commit/e8aa87fa88f55e76ce08794690665ce30caa3183] -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> ---- - chromium/third_party/libxml/README.chromium | 2 ++ - chromium/third_party/libxml/src/encoding.c | 6 +++--- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/chromium/third_party/libxml/README.chromium b/chromium/third_party/libxml/README.chromium -index e1b7e1d8065..5cb589f04fd 100644 ---- a/chromium/third_party/libxml/README.chromium -+++ b/chromium/third_party/libxml/README.chromium -@@ -24,6 +24,8 @@ Modifications: - non-recursive broke a few web platform tests. - - add-fuzz-target.patch: Prevents autoreconf from failing on mac due to a - missing makefile for fuzz. -+- chromium-issue-1138555.patch: Change TRUE to 1 for ICU68 which remove the -+ #define of TRUE. - - Add helper classes in the chromium/ subdirectory. - - Delete various unused files, see chromium/roll.py - -diff --git a/chromium/third_party/libxml/src/encoding.c b/chromium/third_party/libxml/src/encoding.c -index 730e2532e45..f876e0c02de 100644 ---- a/chromium/third_party/libxml/src/encoding.c -+++ b/chromium/third_party/libxml/src/encoding.c -@@ -1882,7 +1882,7 @@ xmlIconvWrapper(iconv_t cd, unsigned char *out, int *outlen, - * @outlen: the length of @out - * @in: a pointer to an array of input bytes - * @inlen: the length of @in -- * @flush: if true, indicates end of input -+ * @flush: if 1, indicates end of input - * - * Returns 0 if success, or - * -1 by lack of space, or -@@ -1922,7 +1922,7 @@ xmlUconvWrapper(uconv_t *cd, int toUnicode, unsigned char *out, int *outlen, - *inlen = ucv_in - (const char*) in; - *outlen = ucv_out - (char *) out; - if (U_SUCCESS(err)) { -- /* reset pivot buf if this is the last call for input (flush==TRUE) */ -+ /* reset pivot buf if this is the last call for input (flush==1) */ - if (flush) - cd->pivot_source = cd->pivot_target = cd->pivot_buf; - return 0; -@@ -2028,7 +2028,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, - #ifdef LIBXML_ICU_ENABLED - else if (handler->uconv_out != NULL) { - ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, -- TRUE); -+ 1); - } - #endif /* LIBXML_ICU_ENABLED */ - else { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-skia-Fix-build-with-gcc-12.patch index 4cb7c6ea..0cd9a85f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-skia-Fix-build-with-gcc-12.patch @@ -1,4 +1,4 @@ -From 03e9ff9a00ea85e84faeb6267d60fb9ed7c0a598 Mon Sep 17 00:00:00 2001 +From ce0d0a3961dafb0e682a47b3cc3963a23bdcea37 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 16 May 2022 20:01:49 +0000 Subject: [PATCH] chromium: skia: Fix build with gcc-12 @@ -43,13 +43,14 @@ In file included from ../../../../recipe-sysroot/usr/include/c++/12.1.0/utility: | ~~~~~~~~^~~~~~~~~~~~~ [67/9144] CXX obj/skia/skia/GrClipStack.o +Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- chromium/third_party/skia/src/utils/SkParseColor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/chromium/third_party/skia/src/utils/SkParseColor.cpp b/chromium/third_party/skia/src/utils/SkParseColor.cpp -index 7260365b2c6..cd07eb48650 100644 +index 0dc3497062f..f63f1800501 100644 --- a/chromium/third_party/skia/src/utils/SkParseColor.cpp +++ b/chromium/third_party/skia/src/utils/SkParseColor.cpp @@ -7,6 +7,7 @@ @@ -58,5 +59,5 @@ index 7260365b2c6..cd07eb48650 100644 #include "include/utils/SkParse.h" +#include <vector> - static constexpr const char* gColorNames[] = { - "aliceblue", + #include <algorithm> // std::lower_bound + #include <iterator> diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-Remove-unsetting-_FILE_OFFSET_BITS.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-Remove-unsetting-_FILE_OFFSET_BITS.patch new file mode 100644 index 00000000..64a3d06b --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-Remove-unsetting-_FILE_OFFSET_BITS.patch @@ -0,0 +1,34 @@ +From 3332ea15dfd4024eb7b95ebd1b26bf76f592b23f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 3 Jan 2023 14:10:23 -0800 +Subject: [PATCH] Remove unsetting _FILE_OFFSET_BITS + +This does not work when enabling 64bit time_t with glibc which is enabled with -D_TIME_BITS=64, since it also needs +_FILE_OFFSET_BITS=64 and this does not work when its undefined explicitly + +Upstream-Status: Submitted [https://github.com/madler/zlib/pull/764] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + chromium/third_party/zlib/gzguts.h | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/chromium/third_party/zlib/gzguts.h b/chromium/third_party/zlib/gzguts.h +index 57faf37165a..3747f3c449d 100644 +--- a/chromium/third_party/zlib/gzguts.h ++++ b/chromium/third_party/zlib/gzguts.h +@@ -3,15 +3,6 @@ + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +-#ifdef _LARGEFILE64_SOURCE +-# ifndef _LARGEFILE_SOURCE +-# define _LARGEFILE_SOURCE 1 +-# endif +-# ifdef _FILE_OFFSET_BITS +-# undef _FILE_OFFSET_BITS +-# endif +-#endif +- + #ifdef HAVE_HIDDEN + # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) + #else diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index 94b4151d..ef788ff2 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch @@ -1,4 +1,4 @@ -From a7bb1b5b26caa4b3c374c3d3f74f0dfe522d854f Mon Sep 17 00:00:00 2001 +From 4951642cc3b22379211c492759849c79a59938f5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:01:12 -0700 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if @@ -7,6 +7,7 @@ Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if Musl does not define this Macro Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- chromium/sandbox/linux/suid/sandbox.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index 766f4cdd..0b14f09d 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -1,10 +1,11 @@ -From e0768318d6289672085b8f8f9a3425178e1475b5 Mon Sep 17 00:00:00 2001 +From 49c7efab2123eff453df1bd0bdbdc718a8292c58 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:09:06 -0700 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- chromium/base/process/process_metrics_posix.cc | 4 ++-- chromium/base/trace_event/malloc_dump_provider.cc | 2 ++ diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch index 95699ad3..72cf812a 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch @@ -1,9 +1,10 @@ -From fb0ebec2df9f7fb90d47265db90750a01fa71cbf Mon Sep 17 00:00:00 2001 +From 1150bddce8d8cb4a691b3197569d304434fa6219 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:37:49 -0700 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- .../tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index cc296fc9..45907779 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch @@ -1,4 +1,4 @@ -From aef1128c27a1975168bb371337bfd59f49873546 Mon Sep 17 00:00:00 2001 +From ceb6a8ca7548ef255150e1b8d1e65b40c4949dee Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:38:37 -0700 Subject: [PATCH] chromium: musl: use off64_t instead of the internal @@ -8,6 +8,7 @@ Subject: [PATCH] chromium: musl: use off64_t instead of the internal does not support the 32-bit ABI. Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- .../tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch index 479cfbff..2bba01b4 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch @@ -1,9 +1,10 @@ -From bccfc7999135a44fce7473ee8a60333c6d5db746 Mon Sep 17 00:00:00 2001 +From b59ba5a52e29867f9ebbc4423514d50f4b36b0ae Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:54:38 -0700 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- chromium/base/allocator/allocator_check.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index fe8dd0cb..fd62102a 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -1,10 +1,11 @@ -From db3a551e932481d4ccdd315fb05cd24910807136 Mon Sep 17 00:00:00 2001 +From f82c828b2c8ffd7c5f0e884132e0f1d721295c36 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:27:50 -0700 Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc platforms Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- chromium/net/dns/dns_config_service_posix.cc | 4 +++ chromium/net/dns/dns_reloader.cc | 4 +++ diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch index 8691553b..ef05aa23 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -1,4 +1,4 @@ -From 029557f2f50714b2e87aa3c0ad82aaca48f68a50 Mon Sep 17 00:00:00 2001 +From f4b417ae2878f5ebf8d5a171669f516e1c6d4d9c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:39:57 -0700 Subject: [PATCH] chromium: musl: Do not define __sbrk on musl @@ -7,6 +7,7 @@ musl libc does not have sbrk. on musl libc will only work when called with 0 as argument, so we just let it out for now Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch index 8edfb13e..86757bbd 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -1,9 +1,10 @@ -From 194688cb3ddc3d331b3d254b41cb6ae55d55f0f8 Mon Sep 17 00:00:00 2001 +From d41fdb34286e134d4ff871943ea54b03b2ab02d6 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 16:41:23 -0700 Subject: [PATCH] chromium: musl: Adjust default pthread stack size Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- chromium/base/threading/platform_thread_linux.cc | 3 ++- .../third_party/blink/renderer/platform/wtf/stack_util.cc | 4 ++-- diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch index da379b0f..59a5e66f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch @@ -1,4 +1,4 @@ -From c151ad89ab323db1730c8b3d77bd72d415c80ca1 Mon Sep 17 00:00:00 2001 +From 9808a4034b0a6354ecbc2081a2b022614acb392f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 25 Sep 2018 12:59:05 -0700 Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to @@ -6,6 +6,7 @@ Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Pending --- chromium/third_party/breakpad/breakpad/configure.ac | 2 +- .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 4 ++++ diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-pread-pwrite.patch index 28fb2b61..a925c0d6 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-pread-pwrite.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-pread-pwrite.patch @@ -1,4 +1,4 @@ -From 2ee1af42a550fa258a2061452ff2ad2c30c91f9e Mon Sep 17 00:00:00 2001 +From e0413ce85e22a1a0a83015f22cd850add6250c9c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 23 Dec 2018 16:58:04 -0800 Subject: [PATCH] chromium: musl: pread pwrite diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch index a5a4f0ba..eb157045 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch @@ -1,4 +1,4 @@ -From e0b5335ced4cbc78847e63cc98e9c1a78f426c99 Mon Sep 17 00:00:00 2001 +From 78eae00a5c53cd44a4b73e6ba357088a82dd4b84 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 10 May 2020 08:16:01 -0700 Subject: [PATCH] chromium: musl: initialize msghdr in a compatible diff --git a/recipes-qt/qt5/qtwebengine/chromium/0024-Fix-dependecy-when-compiling-content-browser.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-Fix-dependecy-when-compiling-content-browser.patch new file mode 100644 index 00000000..2ca2e313 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0024-Fix-dependecy-when-compiling-content-browser.patch @@ -0,0 +1,28 @@ +From a4783ee130e638f51438340b9f8f4de415f9ad76 Mon Sep 17 00:00:00 2001 +From: Michal Klocek <michal.klocek@qt.io> +Date: Wed, 8 May 2024 09:07:49 +0200 +Subject: [PATCH] Fix dependecy when compiling content/browser + +Deals with: + +"fatal error: components/spellcheck/spellcheck_buildflags.h: +No such file or directory" + +Change-Id: If633fdf9d3d793158ab0dd994c011c17e66c13b5 +Upstream-Status: Pending +--- + chromium/content/browser/BUILD.gn | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn +index 1466f33d462..ae459c24d4f 100644 +--- a/chromium/content/browser/BUILD.gn ++++ b/chromium/content/browser/BUILD.gn +@@ -334,6 +334,7 @@ jumbo_static_library("browser") { + + public_deps = [ + ":accessibility_buildflags", ++ "//components/spellcheck:buildflags", + "//base/util/memory_pressure", + "//base/util/type_safety", + "//ipc", diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 22b93ab8..efdd57b9 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -150,14 +150,14 @@ RDEPENDS:${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "87-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc -# 5.15-glibc.meta-qt5.15 +# 5.15-glibc.meta-qt5.17 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 -# 5.15.meta-qt5.15 +# 5.15.meta-qt5.17 SRC_URI:append:libc-musl = "\ file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ file://0003-musl-link-against-libexecinfo.patch \ @@ -165,7 +165,7 @@ SRC_URI:append:libc-musl = "\ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based-glibc -# 87-based-glibc.meta-qt5.9 +# 87-based-glibc.meta-qt5.11 SRC_URI += " \ file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ @@ -178,12 +178,13 @@ SRC_URI += " \ file://chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ file://chromium/0010-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ file://chromium/0011-chromium-Add-missing-include-for-C-strncpy.patch;patchdir=src/3rdparty \ - file://chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch;patchdir=src/3rdparty \ - file://chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \ + file://chromium/0011-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \ + file://chromium/0012-Remove-unsetting-_FILE_OFFSET_BITS.patch;patchdir=src/3rdparty \ + file://chromium/0024-Fix-dependecy-when-compiling-content-browser.patch;patchdir=src/3rdparty \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based -# 87-based.meta-qt5.9 +# 87-based.meta-qt5.11 SRC_URI:append:libc-musl = "\ file://chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ file://chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ @@ -198,8 +199,8 @@ SRC_URI:append:libc-musl = "\ file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "2291526b04a09e126eff5785bbfb869b223c7fa2" -SRCREV_chromium = "be349eaf62e77955791d7bf29f893f1e8a37daf4" +SRCREV_qtwebengine = "17fd3176988586168bee8654008a097a5f23ec1d" +SRCREV_chromium = "fdfef5b37af3bed8402d7c7e20a5487f2602b0a6" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 1b411a83..64dc464f 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 = "d2bfc05d0d7bc3762521c2d42c81dcaa006f13cb" +SRCREV = "4f75644c2b9517b7d2621df1309d499956ea5e86" diff --git a/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch index a237d03d..91bf19de 100644 --- a/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch +++ b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch @@ -1,4 +1,4 @@ -From 34018c2a61045c58f88e09a12ecd62533aa2c2f1 Mon Sep 17 00:00:00 2001 +From 34100abf0a24b3d2dadebe90926eea98d50a43b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Mon, 4 Jun 2018 10:35:46 +0200 Subject: [PATCH] Do not skip build for cross-compile diff --git a/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch index bf79b363..8486a84d 100644 --- a/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch +++ b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch @@ -1,4 +1,4 @@ -From c4ceb318aa1064bfa677cdd800c52155eb1bed3a Mon Sep 17 00:00:00 2001 +From a454e27d7993de8a3aa7e5cc37d7e16803da4271 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 23 Aug 2018 04:06:17 +0000 Subject: [PATCH] Fix build with non-glibc libc on musl diff --git a/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch index ffd8da0f..8ebb5894 100644 --- a/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch +++ b/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch @@ -1,4 +1,4 @@ -From f6576377f8bf2c854d8079b7f309f570b3d2bde4 Mon Sep 17 00:00:00 2001 +From fb5f7d19a390c399c35f9fbaa1185e309394666d Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@cn.fujitsu.com> Date: Fri, 31 Aug 2018 15:42:48 +0900 Subject: [PATCH] Fix build bug for armv32 BE. diff --git a/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch index 14cb8aa4..bde4300b 100644 --- a/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch +++ b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch @@ -1,4 +1,4 @@ -From 83aa5b3265d7c9f64e754cb890988cf8a5669ce7 Mon Sep 17 00:00:00 2001 +From 597d54c6553cd9ffbf08e40a7a706096b8990399 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 24 Sep 2018 02:11:10 -0700 Subject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths @@ -9,15 +9,16 @@ compiler does not like specifying absolute include paths pointing to build host includes Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- Source/WebKit/PlatformQt.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake -index 9aed9906e..48638aef4 100644 +index 65c1ff1c1..b7ef82f4e 100644 --- a/Source/WebKit/PlatformQt.cmake +++ b/Source/WebKit/PlatformQt.cmake -@@ -512,7 +512,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) +@@ -511,7 +511,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) endif () @@ -26,7 +27,7 @@ index 9aed9906e..48638aef4 100644 set(WebKit_PRI_ARGUMENTS BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" -@@ -737,7 +737,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) +@@ -741,7 +741,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) endif () diff --git a/recipes-qt/qt5/qtwebkit/0005-Fix-build-with-bison37.patch b/recipes-qt/qt5/qtwebkit/0005-Let-Bison-generate-the-header-directly-to-fix-build-.patch index 9262f5fe..b3671a2b 100644 --- a/recipes-qt/qt5/qtwebkit/0005-Fix-build-with-bison37.patch +++ b/recipes-qt/qt5/qtwebkit/0005-Let-Bison-generate-the-header-directly-to-fix-build-.patch @@ -1,4 +1,4 @@ -From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 +From b579ee43a3f832e9b3785ed4cb03284cbc142ef1 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev <mitya57@gmail.com> Date: Tue, 4 Aug 2020 21:04:06 +0300 Subject: [PATCH] Let Bison generate the header directly, to fix build with @@ -15,15 +15,16 @@ Found at [1] [1] https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31 Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- Source/WebCore/css/makegrammar.pl | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl -index 5d63b08102eb..9435701c7061 100644 +index 5d63b0810..9435701c7 100644 --- a/Source/WebCore/css/makegrammar.pl +++ b/Source/WebCore/css/makegrammar.pl -@@ -73,25 +73,6 @@ +@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") { } my $fileBase = File::Spec->join($outputDir, $filename); diff --git a/recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch b/recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch index 15607c0d..d5ddfeb7 100644 --- a/recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch +++ b/recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch @@ -1,7 +1,8 @@ -From 32eb0352d98fcf325b0a94a4f7e141d746938a4b Mon Sep 17 00:00:00 2001 +From d012406bcde49de9cba89f42a79ecba40b70a0ff Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev <annulen@yandex.ru> Date: Sun, 3 May 2020 18:50:24 +0300 -Subject: [PATCH] Disable code related to HTTP/2 when Qt is configured without SSL support +Subject: [PATCH] Disable code related to HTTP/2 when Qt is configured without + SSL support For enabling HTTP/2 by default we check if Qt uses OpenSSL and its version is 1.0.2 or higher via QSslSocket API. While it would be sufficient to @@ -29,6 +30,3 @@ index 1154d56a0..87e21ec3f 100644 #define USE_HTTP2 1 #endif --- -2.29.2 - diff --git a/recipes-qt/qt5/qtwebkit/0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch b/recipes-qt/qt5/qtwebkit/0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch index 4eef3451..676ea85c 100644 --- a/recipes-qt/qt5/qtwebkit/0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch +++ b/recipes-qt/qt5/qtwebkit/0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch @@ -1,4 +1,4 @@ -From df9f6a8c9d59996b52bfdc5ea6f780de517905e5 Mon Sep 17 00:00:00 2001 +From d478fb2ffb158e84e8705fdff3b7b2994a5d46c7 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev <annulen@yandex.ru> Date: Wed, 3 Jun 2020 15:01:42 +0300 Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to @@ -27,6 +27,3 @@ index c5dab429c..af3431275 100644 except: print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) --- -2.29.2 - diff --git a/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch b/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch index 1715c8f3..18ae4aac 100644 --- a/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch +++ b/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch @@ -1,4 +1,4 @@ -From 0e94085f74b562bf8edf5418142323785a069454 Mon Sep 17 00:00:00 2001 +From 934ff3e2768a4ef2f1b21ee883acb56cb8ae898b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Wed, 2 Dec 2020 22:34:54 +0100 Subject: [PATCH] Fix build with icu >= 68 @@ -120,6 +120,3 @@ index 7aaac48c8..6ac693602 100644 namespace WebCore { // UTF16ContextAware provider --- -2.26.2 - diff --git a/recipes-qt/qt5/qtwebkit/0009-Riscv-Add-support-for-riscv.patch b/recipes-qt/qt5/qtwebkit/0009-Riscv-Add-support-for-riscv.patch index 2bfb72fe..2e667a78 100644 --- a/recipes-qt/qt5/qtwebkit/0009-Riscv-Add-support-for-riscv.patch +++ b/recipes-qt/qt5/qtwebkit/0009-Riscv-Add-support-for-riscv.patch @@ -1,8 +1,10 @@ -From b5a58d2c001689b07591fdce8820773d57a74002 Mon Sep 17 00:00:00 2001 +From 2d43706b5b607ba2fdc777ef69532a75447cccd8 Mon Sep 17 00:00:00 2001 From: Chenxi Mao <chenxi.mao2013@gmail.com> Date: Fri, 3 Apr 2020 08:33:10 +0800 -Subject: [PATCH 1/1] Riscv: Add support for riscv +Subject: [PATCH] Riscv: Add support for riscv +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- CMakeLists.txt | 2 ++ Source/JavaScriptCore/CMakeLists.txt | 1 + @@ -11,7 +13,7 @@ Subject: [PATCH 1/1] Riscv: Add support for riscv 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 31a2ea1fd..516476729 100644 +index 432ae6fce..eaf3a35df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,6 +83,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390") @@ -24,10 +26,10 @@ index 31a2ea1fd..516476729 100644 message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'") endif () diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index 937b3ed00..2fff29f9d 100644 +index afd76ca1a..3d184090d 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1286,6 +1286,7 @@ elseif (WTF_CPU_S390) +@@ -1287,6 +1287,7 @@ elseif (WTF_CPU_S390) elseif (WTF_CPU_S390X) elseif (WTF_CPU_MIPS) elseif (WTF_CPU_SH4) @@ -78,6 +80,3 @@ index 05302e6e6..25dd352ee 100644 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) #if defined(_WIN32) --- -2.17.1 - diff --git a/recipes-qt/qt5/qtwebkit/mips-atomic.patch b/recipes-qt/qt5/qtwebkit/0010-Fix-build-on-mips.patch index d29d85ff..fe09dded 100644 --- a/recipes-qt/qt5/qtwebkit/mips-atomic.patch +++ b/recipes-qt/qt5/qtwebkit/0010-Fix-build-on-mips.patch @@ -1,4 +1,7 @@ -fix build on mips +From 7e3e0ca548cc9c92705308dd2e0f88ada544e794 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 26 Oct 2021 11:03:25 -0700 +Subject: [PATCH] Fix build on mips Fixes Source/WTF/wtf/Atomics.cpp:63:9: error: definition of builtin function '__sync_add_and_fetch_8' @@ -7,8 +10,15 @@ Source/WTF/wtf/Atomics.cpp:68:9: error: definition of builtin function '__sync_s int64_t __sync_sub_and_fetch_8(int64_t volatile* addend, int64_t value) Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + Source/WTF/wtf/Platform.h | 1 + + 1 file changed, 1 insertion(+) +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 8fac85f72..5b8bbcb18 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h @@ -88,6 +88,7 @@ diff --git a/recipes-qt/qt5/qtwebkit/0011-Offlineasm-warnings-with-newer-Ruby-versions.patch b/recipes-qt/qt5/qtwebkit/0011-Offlineasm-warnings-with-newer-Ruby-versions.patch new file mode 100644 index 00000000..1c810be5 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0011-Offlineasm-warnings-with-newer-Ruby-versions.patch @@ -0,0 +1,47 @@ +From 3d3a5974ff31e55651bb0c47278bd15734d60be4 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro <aperez@igalia.com> +Date: Wed, 15 Jan 2020 22:15:38 +0000 +Subject: [PATCH] Offlineasm warnings with newer Ruby versions + +https://bugs.webkit.org/show_bug.cgi?id=206233 + +Reviewed by Yusuke Suzuki. + +Avoid a warning about using Object#=~ on Annotation instances, which +has been deprecated in Ruby 2.7. + +* offlineasm/parser.rb: Swap checks to prevent applying the =~ operator +to Annotation instances, which do not define it. + +Canonical link: https://commits.webkit.org/219400@main +git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254637 268f45cc-cd09-0410-ab3c-d52691b4dbfc +Upstream-Status: Backport +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + Source/JavaScriptCore/offlineasm/parser.rb | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb +index b44511245..cd1cffaec 100644 +--- a/Source/JavaScriptCore/offlineasm/parser.rb ++++ b/Source/JavaScriptCore/offlineasm/parser.rb +@@ -584,9 +584,7 @@ class Parser + firstCodeOrigin = @tokens[@idx].codeOrigin + list = [] + loop { +- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) +- break +- elsif @tokens[@idx].is_a? Annotation ++ if @tokens[@idx].is_a? Annotation + # This is the only place where we can encounter a global + # annotation, and hence need to be able to distinguish between + # them. +@@ -600,6 +598,8 @@ class Parser + list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string) + @annotation = nil + @idx += 2 # Consume the newline as well. ++ elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) ++ break + elsif @tokens[@idx] == "\n" + # ignore + @idx += 1 diff --git a/recipes-qt/qt5/qtwebkit/0012-Fix-build-with-gcc-13.patch b/recipes-qt/qt5/qtwebkit/0012-Fix-build-with-gcc-13.patch new file mode 100644 index 00000000..bc489250 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0012-Fix-build-with-gcc-13.patch @@ -0,0 +1,34 @@ +From 8a82826054f55d17d9b765bc383418b750ed836b Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 12 Apr 2023 16:07:40 +0200 +Subject: [PATCH] Fix build with gcc-13 + +* fixes: + http://errors.yoctoproject.org/Errors/Details/699653/ + + TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit/5.15.9+gitAUTOINC+10cd6a106e-r0/git/Source/ThirdParty/ANGLE/src/common/mathutil.h:575:8: error: 'uint32_t' does not name a type + 575 | inline uint32_t RotL(uint32_t x, int8_t r) + | ^~~~~~~~ + TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit/5.15.9+gitAUTOINC+10cd6a106e-r0/git/Source/ThirdParty/ANGLE/src/common/mathutil.h:19:1: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? + 18 | #include <stdlib.h> + +++ |+#include <cstdint> + 19 | + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Pending +--- + Source/ThirdParty/ANGLE/src/common/mathutil.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/ThirdParty/ANGLE/src/common/mathutil.h b/Source/ThirdParty/ANGLE/src/common/mathutil.h +index 7959da8bd..6a8e77b4d 100644 +--- a/Source/ThirdParty/ANGLE/src/common/mathutil.h ++++ b/Source/ThirdParty/ANGLE/src/common/mathutil.h +@@ -12,6 +12,7 @@ + #include "common/debug.h" + #include "common/platform.h" + ++#include <cstdint> + #include <limits> + #include <algorithm> + #include <string.h> diff --git a/recipes-qt/qt5/qtwebkit/0010-webdriver-libatomic.patch b/recipes-qt/qt5/qtwebkit/0013-link-with-libatomic.patch index 39ee847c..42ce33dc 100644 --- a/recipes-qt/qt5/qtwebkit/0010-webdriver-libatomic.patch +++ b/recipes-qt/qt5/qtwebkit/0013-link-with-libatomic.patch @@ -1,4 +1,7 @@ -link with libatomic +From 999affc771f761894b6fd6e491c6adac7861fcf2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 8 Mar 2021 18:15:47 -0800 +Subject: [PATCH] link with libatomic This fixes build with C11 @@ -6,8 +9,15 @@ lib/../Source/WTF/wtf/CMakeFiles/WTF.dir/Assertions.cpp.o:/usr/include/c++/11.0. | collect2: error: ld returned 1 exit status Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + Source/WTF/wtf/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) +diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt +index 297589b90..5b8d8c71b 100644 --- a/Source/WTF/wtf/CMakeLists.txt +++ b/Source/WTF/wtf/CMakeLists.txt @@ -245,6 +245,10 @@ if (NOT USE_SYSTEM_MALLOC) diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index ee69a6a2..ffa349d5 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -11,23 +11,25 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native bison-native flex-native" -# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.13 -# 5.13.meta-qt5.1 +# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.212 +# 5.212.meta-qt5.1 SRC_URI += "\ file://0001-Do-not-skip-build-for-cross-compile.patch \ file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \ file://0003-Fix-build-bug-for-armv32-BE.patch \ file://0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ - file://0005-Fix-build-with-bison37.patch \ + file://0005-Let-Bison-generate-the-header-directly-to-fix-build-.patch \ file://0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch \ file://0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch \ file://0008-Fix-build-with-icu-68.patch \ file://0009-Riscv-Add-support-for-riscv.patch \ - file://mips-atomic.patch \ + file://0010-Fix-build-on-mips.patch \ + file://0011-Offlineasm-warnings-with-newer-Ruby-versions.patch \ + file://0012-Fix-build-with-gcc-13.patch \ " -SRC_URI:append:riscv32 = " file://0010-webdriver-libatomic.patch " -SRC_URI:append:riscv64 = " file://0010-webdriver-libatomic.patch " +SRC_URI:append:riscv32 = " file://0013-link-with-libatomic.patch" +SRC_URI:append:riscv64 = " file://0013-link-with-libatomic.patch" inherit cmake_qt5 perlnative @@ -94,6 +96,7 @@ PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,libxcomposi PACKAGECONFIG[fontconfig] = "-DENABLE_TEST_SUPPORT=ON,-DENABLE_TEST_SUPPORT=OFF,fontconfig" # hyphen is only in meta-office currently! PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen" +PACKAGECONFIG[tools] = "-DENABLE_TOOLS=ON,-DENABLE_TOOLS=OFF," # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe PACKAGES:remove = "${PN}-examples" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 7cd18e40..e7d3a6bd 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 = "1923ea8d68c8a9eccb4346cb35485df960f78a60" +SRCREV = "7e0979bd69493914dc63897a8e61f48bf55d71cc" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 099358ff..bac1b565 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 = "f80cd0f766094e01da1008d14123a12740a2b771" +SRCREV = "b4713043a1cc9378226fc32002141cbd748cb9a4" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 93c3c064..bb8e5927 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 = "91acda7a8e3b51d871bd0324048decc8cd6c5ae2" +SRCREV = "ce7b2fd52df5b474dfea2bd7dd4e7956b10bf7ba" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index b7a98410..5867704a 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 = "98b7ae3d9e3098639c15779a129d28b1737a3277" +SRCREV = "cfc30b0df5e6d0c4d08b1ccc9c97a7ffa4ad0911" BBCLASSEXTEND =+ "native nativesdk" |