From f4c8cef8586d28f51f69a78717c10093f8a9f730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 4 Jan 2019 08:43:15 -0800 Subject: qtbase: Fix qtopcua issue on bigendian systems See http://errors.yoctoproject.org/Errors/Details/213681/ Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'recipes-qt/qt5/qtbase-native_git.bb') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 9f0fca51..3ab6d5e9 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.4 +# 5.12.meta-qt5-shared.5 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -39,11 +39,12 @@ SRC_URI += "\ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ file://0018-Fix-compile-issue-with-gcc-9.patch \ file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ + file://0022-Fix-qbswap-calls-for-Big-Endian-targets.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.4 +# 5.12.meta-qt5-native.5 SRC_URI += " \ file://0020-Always-build-uic-and-qvkgen.patch \ " -- cgit v1.2.3 From 82abc2bb38e6db10b469975c1f50be1bc1c078e8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 12 Jan 2019 17:58:58 +0000 Subject: qtbase: fix incomplete recipe changes from previous commit * the patches were renamed, but I forgot to amend the SRC_URI modifications Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-qt/qt5/qtbase-native_git.bb') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 3ab6d5e9..e636167e 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -39,19 +39,19 @@ SRC_URI += "\ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ file://0018-Fix-compile-issue-with-gcc-9.patch \ file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ - file://0022-Fix-qbswap-calls-for-Big-Endian-targets.patch \ + file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native # 5.12.meta-qt5-native.5 SRC_URI += " \ - file://0020-Always-build-uic-and-qvkgen.patch \ + file://0021-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0021-Bootstrap-without-linkat-feature.patch \ + file://0022-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" -- cgit v1.2.3 From 70e4a1c9c9a7e264e710f4e6c2abbc0fcd0727cd Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 18 Jan 2019 15:29:00 +0200 Subject: qt5: update submodules Update to latest content in Qt 5.12.1 branch (RC) Task-number: QTBUG-72255 Change-Id: I54a8b32d7dc198a057d29825b58d45d932739ef6 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtbase-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtbase-native_git.bb') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 3bb6ae9a..83706dca 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -139,4 +139,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 = "af821f79cacbac0be9995a7eb4a0448a9a2958bf" +SRCREV = "7d1af8fa957c86fdbb4b0ab86dc2adc726c66bd9" -- cgit v1.2.3 From 0f27849166952e5ca377084a0746182169eaf324 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 25 Jan 2019 09:19:50 +0200 Subject: qt5: update submodules Update to latest content Qt 5.12.1 (RC2) Task-number: QTBUG-72255 Change-Id: I9f3bf8cf7bc3c5a1a69d1e606661a8666b207033 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtbase-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtbase-native_git.bb') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 83706dca..3e142402 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -139,4 +139,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 = "7d1af8fa957c86fdbb4b0ab86dc2adc726c66bd9" +SRCREV = "63891267c1fe2e483fa305de9102891448c52981" -- cgit v1.2.3 From b9131d61d3f08669b493b5070811f2c617c8ee9f Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 29 Jan 2019 14:56:56 +0200 Subject: qt5: update submodules Update to latest content Qt 5.12.1 (final) Task-number: QTBUG-72255 Change-Id: I3d9f24cc18b0020e95782912cbf8146f84ebffb3 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtbase-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtbase-native_git.bb') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 3e142402..a7813c87 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -139,4 +139,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 = "63891267c1fe2e483fa305de9102891448c52981" +SRCREV = "0c498153331d79715ecfe431eb27065748628ba8" -- cgit v1.2.3 From 7935b6bd03aafb7e238e623bdca832d1437b923a Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 5 Feb 2019 10:36:53 +0200 Subject: qt5: update submodules Update to latest content in Qt 5.12 branch Task-number: QTBUG-73533 Change-Id: I2c7e5ba745f42751c9402cf593a509ecc25d3355 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtbase-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtbase-native_git.bb') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index a7813c87..998e8c46 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -139,4 +139,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 = "0c498153331d79715ecfe431eb27065748628ba8" +SRCREV = "850c922036b7eebc24cdb74a43a4b31319d924c7" -- cgit v1.2.3 From 356ff007aa53439fbeb44798e550386f6f9194af Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 13 Feb 2019 09:30:34 +0200 Subject: qt5: update submodules Update to latest content in Qt 5.12.2 branch Task-number: QTBUG-73533 Change-Id: I9bbbf6ce3992ac834c8f060e0f059e8ae35c4966 Reviewed-by: Sami Nurmenniemi --- recipes-qt/qt5/qtbase-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtbase-native_git.bb') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 998e8c46..521dc49d 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -139,4 +139,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 = "850c922036b7eebc24cdb74a43a4b31319d924c7" +SRCREV = "81fd7f4c8af260d753a834480f790c82fb161889" -- cgit v1.2.3 From 62312010bba98e2b93f24b8b9e06736f9199df9e Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 19 Feb 2019 14:56:34 +0200 Subject: qt5: update submodules Update to latest content in Qt 5.12.2 branch Task-number: QTBUG-73533 Change-Id: I9eb7c420161870a83f529dd8ee0fd6bd16a2a410 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtbase-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtbase-native_git.bb') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 521dc49d..6fc3d8e2 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -139,4 +139,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 = "81fd7f4c8af260d753a834480f790c82fb161889" +SRCREV = "0f163887b526d00ccdcead907dde042aa370fc16" -- cgit v1.2.3 From 439f7be65f681d4e45f30571082e38791cca2ef2 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 25 Feb 2019 09:19:37 +0200 Subject: qt5: update submodules Update to Qt latest content in 5.12.2 branch (RC) Task-number: QTBUG-73533 Change-Id: I3e79964301632dbf8d19b06cb7e6e8ce745793de Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtbase-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtbase-native_git.bb') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 445b1846..3bc4f931 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -139,4 +139,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 = "0f163887b526d00ccdcead907dde042aa370fc16" +SRCREV = "e8d3306c8f86bf21648693521d8be91bb8f1335e" -- cgit v1.2.3