diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-14 08:37:18 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:34:49 +0000 |
| commit | f9e80edff01159375b6e03f3cb9ea1f8ed5ced79 (patch) | |
| tree | ada273f12808c8c1ed9e4585638c63d93d8363a4 /recipes-qt/qt5/qtbase-native_git.bb | |
| parent | 3e7da25564d74195610adede9391ca733a0a1412 (diff) | |
| download | meta-qt5-f9e80edff01159375b6e03f3cb9ea1f8ed5ced79.tar.gz | |
qt5: update to latest revision in 5.11 branch
* drop nobranch=1 again
* update the branches and tags on meta-qt5/qt* forks and the tag name
in recipes
* use latest revision in 5.11 branch instead of 5.11.2 which might be
removed again
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index cf9d1bc3..a01d19d9 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 | |||
| 18 | 18 | ||
| 19 | # common for qtbase-native, qtbase-nativesdk and qtbase | 19 | # common for qtbase-native, qtbase-nativesdk and qtbase |
| 20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared | 20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared |
| 21 | # 5.11.meta-qt5-shared.7 | 21 | # 5.11.meta-qt5-shared.8 |
| 22 | SRC_URI += "\ | 22 | SRC_URI += "\ |
| 23 | file://0001-Add-linux-oe-g-platform.patch \ | 23 | file://0001-Add-linux-oe-g-platform.patch \ |
| 24 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 24 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
| @@ -33,19 +33,19 @@ SRC_URI += "\ | |||
| 33 | file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ | 33 | file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ |
| 34 | file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ | 34 | file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ |
| 35 | file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ | 35 | file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ |
| 36 | file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ | 36 | file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ |
| 37 | " | 37 | " |
| 38 | 38 | ||
| 39 | # common for qtbase-native and nativesdk-qtbase | 39 | # common for qtbase-native and nativesdk-qtbase |
| 40 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native | 40 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native |
| 41 | # 5.11.meta-qt5-native.7 | 41 | # 5.11.meta-qt5-native.8 |
| 42 | SRC_URI += " \ | 42 | SRC_URI += " \ |
| 43 | file://0016-Always-build-uic-and-qvkgen.patch \ | 43 | file://0015-Always-build-uic-and-qvkgen.patch \ |
| 44 | " | 44 | " |
| 45 | 45 | ||
| 46 | # only for qtbase-native | 46 | # only for qtbase-native |
| 47 | SRC_URI += " \ | 47 | SRC_URI += " \ |
| 48 | file://0017-Bootstrap-without-linkat-feature.patch \ | 48 | file://0016-Bootstrap-without-linkat-feature.patch \ |
| 49 | " | 49 | " |
| 50 | 50 | ||
| 51 | CLEANBROKEN = "1" | 51 | CLEANBROKEN = "1" |
| @@ -135,4 +135,4 @@ do_install() { | |||
| 135 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 135 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | SRCREV = "b0dce506cc91c4b623eb323db7bbc18469e721c2" | 138 | SRCREV = "49efea26a5fae8c2275999c36c7c8d24cf4125de" |
