diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2024-04-05 12:00:48 +0200 |
|---|---|---|
| committer | Martin Jansa <martin.jansa@gmail.com> | 2024-04-22 12:16:32 +0200 |
| commit | 28016af353053537b846121dd14c6609abab935f (patch) | |
| tree | 8295e470fcf306fc175fc1e2706ee8d09aa7e3d4 | |
| parent | f1aeb146b9194df1f2ab7ee063796e7fa41f77fe (diff) | |
qt5-creator: Fix Malformed Upstream-Statusupstream/nanbield
* Accepted was replaced with Backport in gatesgarth:
https://docs.yoctoproject.org/migration-guides/migration-3.2.html#miscellaneous-changes
ERROR: qt5-creator-4.15.2+git-r0 do_patch: QA Issue: Malformed Upstream-Status in patch
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch
Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status :
Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=14eb5b382cabf90352634393c19bf87a4c15766a] [patch-status]
ERROR: qt5-creator-4.15.2+git-r0 do_patch: QA Issue: Malformed Upstream-Status in patch
/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch
Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status :
Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=55b91a76172a3235b4879daf0b675519d5b02db7] [patch-status]
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch b/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch index b234604b..a77e8fb5 100644 --- a/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch +++ b/recipes-qt/qt5/qt5-creator/0002-clangformat-Fix-build-with-LLVM-13.patch @@ -6,7 +6,7 @@ Subject: [PATCH] clangformat: Fix build with LLVM 13 Change-Id: I5eaad17a6f240aa1e3f246492b69f093b4f59fee Reviewed-by: David Schulz <david.schulz@qt.io> -Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=14eb5b382cabf90352634393c19bf87a4c15766a] +Upstream-Status: Backport [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=14eb5b382cabf90352634393c19bf87a4c15766a] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/plugins/clangformat/clangformatbaseindenter.cpp | 4 ++++ diff --git a/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch b/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch index 072e43d3..fe377b9d 100644 --- a/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch +++ b/recipes-qt/qt5/qt5-creator/0003-clangformat-Fix-build-with-LLVM-13.patch @@ -6,7 +6,7 @@ Subject: [PATCH] clangformat: Fix build with LLVM 13 Change-Id: Ia9db10696fd129c8b989ecc4c9ecbb7f1f10e68c Reviewed-by: David Schulz <david.schulz@qt.io> -Upstream-Status: Accepted [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=55b91a76172a3235b4879daf0b675519d5b02db7] +Upstream-Status: Backport [https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=55b91a76172a3235b4879daf0b675519d5b02db7] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- src/plugins/clangformat/clangformatutils.cpp | 4 ++++ |