diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-01-12 17:58:58 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-01-12 17:58:58 +0000 |
| commit | 82abc2bb38e6db10b469975c1f50be1bc1c078e8 (patch) | |
| tree | 59da3dc515151c94e3f7165bf603b1d2cc4f14b8 /recipes-qt/qt5 | |
| parent | f4c8cef8586d28f51f69a78717c10093f8a9f730 (diff) | |
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 6 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 6 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index e3e063a6..1a0e38eb 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # 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 \ @@ -44,14 +44,14 @@ 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 \ " # CMake's toolchain configuration of nativesdk-qtbase 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" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 3d385dd6..d89ab2b7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -35,7 +35,7 @@ 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 \ " |