diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index ed5226b9..53a679fc 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -17,8 +17,8 @@ require qt5-native.inc require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.13 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared +# 5.12.meta-qt5-shared.1 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -32,26 +32,23 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ - file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ - file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ - file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ - file://0016-Disable-ltcg-for-host_build.patch \ - file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ - file://0018-corelib-Include-sys-types.h-for-uint32_t.patch \ - file://0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0020-Fix-compile-issue-with-gcc-9.patch \ + file://0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ + file://0014-Disable-ltcg-for-host_build.patch \ + file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ + file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ + file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ " # common for qtbase-native and nativesdk-qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.13 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native +# 5.12.meta-qt5-native.1 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ + file://0018-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0022-Bootstrap-without-linkat-feature.patch \ + file://0019-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" @@ -142,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 = "08de243eaa007597c2bfbc97d3d14e2f821ac4be" +SRCREV = "7fc427ba23a624a433d93e1c604d870656835305" |