From 179259bc36235cbee5cd72bcdff03b7f30cd1122 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 16 Oct 2024 09:42:27 +0000 Subject: [PATCH] qtapplicationmanager: fix contains reference to TMPDIR QA issues Temporarily add patch to fix a QA issue related to buildpaths. Change-Id: If8e14c7834e2d20b22494549c0a1350cfdec6cb3 Pick-to: 6.8 Task-number: QTBUG-105913 Reviewed-by: Ari Parkkila --- ...on-t-store-build-dir-to-the-binaries.patch | 29 +++++++++++++++++++ recipes-qt/qt6/qtapplicationmanager_git.bb | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 recipes-qt/qt6/qtapplicationmanager/0001-Don-t-store-build-dir-to-the-binaries.patch diff --git a/recipes-qt/qt6/qtapplicationmanager/0001-Don-t-store-build-dir-to-the-binaries.patch b/recipes-qt/qt6/qtapplicationmanager/0001-Don-t-store-build-dir-to-the-binaries.patch new file mode 100644 index 0000000..99c65c4 --- /dev/null +++ b/recipes-qt/qt6/qtapplicationmanager/0001-Don-t-store-build-dir-to-the-binaries.patch @@ -0,0 +1,29 @@ +From 37b0a11ac7ca9521b4f1446ad817ee28d2216698 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 16 Oct 2024 09:05:15 +0000 +Subject: [PATCH] Don't store build dir to the binaries + +Storing build dir to the binaries causes QA errors: + "contains reference to TMPDIR [buildpaths]" + +Change-Id: Ic887b8ca5332e0bd2ddbabb22aeb386dac6e2eac +Task-number: QTBUG-130117 +Upstream-Status: Pending +--- + src/main-lib/main.cpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp +index 1deba17d..8cd5599a 100644 +--- a/src/main-lib/main.cpp ++++ b/src/main-lib/main.cpp +@@ -139,9 +139,6 @@ Main::Main(int &argc, char **argv, InitFlags initFlags) + false; + #endif + +- // this might be needed later on by the native runtime to find a suitable qml runtime launcher +- setProperty("_am_build_dir", QString::fromLatin1(AM_BUILD_DIR)); +- + UnixSignalHandler::instance()->install(UnixSignalHandler::ForwardedToEventLoopHandler, + { SIGINT, SIGTERM }, + [](int sig) { diff --git a/recipes-qt/qt6/qtapplicationmanager_git.bb b/recipes-qt/qt6/qtapplicationmanager_git.bb index e9f0990..ddde9c7 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-Don-t-store-build-dir-to-the-binaries.patch" + DEPENDS += "qtbase qtdeclarative libyaml libarchive qtapplicationmanager-native" DEPENDS:append:libc-musl = " libexecinfo" RDEPENDS:${PN}:class-target = "libcrypto ${PN}-tools"