From 799eb8622f42e731ad599e6ec1d603f191cb2ce3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 27 Jun 2022 08:01:59 +0000 Subject: [PATCH] qtapplicationmanager: fix compilation with GCC 12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I871c5507a01b1924825b7ed9a145176d61e5b3a7 Reviewed-by: Pasi Petäjäjärvi --- ...tributes-before-a-func-declaration-n.patch | 24 +++++++++++++++++++ recipes-qt/qt6/qtapplicationmanager_git.bb | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 recipes-qt/qt6/qtapplicationmanager/0001-clang-wants-C-attributes-before-a-func-declaration-n.patch diff --git a/recipes-qt/qt6/qtapplicationmanager/0001-clang-wants-C-attributes-before-a-func-declaration-n.patch b/recipes-qt/qt6/qtapplicationmanager/0001-clang-wants-C-attributes-before-a-func-declaration-n.patch new file mode 100644 index 0000000..e14d923 --- /dev/null +++ b/recipes-qt/qt6/qtapplicationmanager/0001-clang-wants-C-attributes-before-a-func-declaration-n.patch @@ -0,0 +1,24 @@ +From 44339721d8b94f2f14e243e494a45a9bdccbe4bd Mon Sep 17 00:00:00 2001 +From: Robert Griebl +Date: Fri, 24 Jun 2022 16:36:54 +0200 +Subject: [PATCH] clang wants C++ attributes before a func declaration nowadays + +Change-Id: I7a537aa4b21e499ba7ca0a1d46314dce60266bfc +Pick-to: 6.4 6.3 6.2 5.15 +--- + src/common-lib/crashhandler.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/common-lib/crashhandler.cpp b/src/common-lib/crashhandler.cpp +index 7ce7df5f..41578327 100644 +--- a/src/common-lib/crashhandler.cpp ++++ b/src/common-lib/crashhandler.cpp +@@ -310,7 +310,7 @@ QT_END_NAMESPACE_AM + + QT_BEGIN_NAMESPACE_AM + +-static Q_NORETURN void crashHandler(const char *why, int stackFramesToIgnore); ++Q_NORETURN static void crashHandler(const char *why, int stackFramesToIgnore); + + static void initBacktraceUnix() + { diff --git a/recipes-qt/qt6/qtapplicationmanager_git.bb b/recipes-qt/qt6/qtapplicationmanager_git.bb index 1bd5194..ffc4789 100644 --- a/recipes-qt/qt6/qtapplicationmanager_git.bb +++ b/recipes-qt/qt6/qtapplicationmanager_git.bb @@ -13,6 +13,8 @@ inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc +SRC_URI += "file://0001-clang-wants-C-attributes-before-a-func-declaration-n.patch" + DEPENDS += "qtbase qtdeclarative libyaml libarchive qtapplicationmanager-native" RDEPENDS:${PN}:class-target = "libcrypto ${PN}-tools"