summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/nativesdk-qtbase_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-01-16 12:47:51 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-01-18 12:34:25 +0000
commite0a55c24f6637b58f0a517e3d7fc092249d5d987 (patch)
treecdb463862b935ab3e42f18f8fbaf7338cf9c15ba /recipes-qt/qt5/nativesdk-qtbase_git.bb
parentd6f5b4a96a93c1aaed64bb25e7b6de2f4c07529e (diff)
downloadmeta-qt5-e0a55c24f6637b58f0a517e3d7fc092249d5d987.tar.gz
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb11
1 files changed, 7 insertions, 4 deletions
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:"
26 26
27# common for qtbase-native, qtbase-nativesdk and qtbase 27# common for qtbase-native, qtbase-nativesdk and qtbase
28# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared 28# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
29# 5.9.meta-qt5-shared.2 29# 5.9.meta-qt5-shared.3
30SRC_URI += "\ 30SRC_URI += "\
31 file://0001-Add-linux-oe-g-platform.patch \ 31 file://0001-Add-linux-oe-g-platform.patch \
32 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 32 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -36,13 +36,16 @@ SRC_URI += "\
36 file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 36 file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
37 file://0007-Delete-qlonglong-and-qulonglong.patch \ 37 file://0007-Delete-qlonglong-and-qulonglong.patch \
38 file://0008-Replace-pthread_yield-with-sched_yield.patch \ 38 file://0008-Replace-pthread_yield-with-sched_yield.patch \
39 file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
40 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
41 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
39" 42"
40 43
41# common for qtbase-native and nativesdk-qtbase 44# common for qtbase-native and nativesdk-qtbase
42# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native 45# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
43# 5.9.meta-qt5-native.2 46# 5.9.meta-qt5-native.3
44SRC_URI += " \ 47SRC_URI += " \
45 file://0009-Always-build-uic.patch \ 48 file://0012-Always-build-uic.patch \
46" 49"
47 50
48# CMake's toolchain configuration of nativesdk-qtbase 51# CMake's toolchain configuration of nativesdk-qtbase
@@ -197,4 +200,4 @@ fakeroot do_generate_qt_environment_file() {
197 200
198addtask generate_qt_environment_file after do_install before do_package 201addtask generate_qt_environment_file after do_install before do_package
199 202
200SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1" 203SRCREV = "4d8ae444c2b15ec7da5ef133aa5ad5a548180e21"