From e0a55c24f6637b58f0a517e3d7fc092249d5d987 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 16 Jan 2018 12:47:51 +0000 Subject: qt: refresh remaining patches and tags in meta-qt5 repos * update tag name to match the patches in meta-qt5 repository where the meta-qt5 .patch files are maintained, so that it's more clear from where these changes are exported (with: git format-patch --no-numbered --no-signature) * use the same SRCREV and patches for nativesdk-qtbase like other qtbase recipes Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 87bd5019..f40c8077 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -26,7 +26,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared -# 5.9.meta-qt5-shared.2 +# 5.9.meta-qt5-shared.3 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -36,13 +36,16 @@ SRC_URI += "\ file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ file://0007-Delete-qlonglong-and-qulonglong.patch \ file://0008-Replace-pthread_yield-with-sched_yield.patch \ + file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ + file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ + file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native -# 5.9.meta-qt5-native.2 +# 5.9.meta-qt5-native.3 SRC_URI += " \ - file://0009-Always-build-uic.patch \ + file://0012-Always-build-uic.patch \ " # CMake's toolchain configuration of nativesdk-qtbase @@ -197,4 +200,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1" +SRCREV = "4d8ae444c2b15ec7da5ef133aa5ad5a548180e21" -- cgit v1.2.3-54-g00ecf