From 3cef727dc8d590bd48956a48a62dec29a6c3e33e Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 1 Nov 2024 08:26:35 +0200 Subject: [PATCH] qtapplicationmanager: remove patch The patch is now merged upstream. Pick-to: dev Change-Id: Iece64a6f482d478521558c79e9ec06919107d4d0 Reviewed-by: Samuli Piippo --- ...on-t-store-build-dir-to-the-binaries.patch | 29 ------------------- recipes-qt/qt6/qtapplicationmanager_git.bb | 2 -- 2 files changed, 31 deletions(-) delete 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 deleted file mode 100644 index ab1b0c5..0000000 --- a/recipes-qt/qt6/qtapplicationmanager/0001-Don-t-store-build-dir-to-the-binaries.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e16e843dbcb67d7262379ac131ce3867d0ec169d 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 28a5e3eb..e51eb466 100644 ---- a/src/main-lib/main.cpp -+++ b/src/main-lib/main.cpp -@@ -141,9 +141,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)); -- - static bool once = false; - if (!once) { - once = true; diff --git a/recipes-qt/qt6/qtapplicationmanager_git.bb b/recipes-qt/qt6/qtapplicationmanager_git.bb index aeb0372..175ee3d 100644 --- a/recipes-qt/qt6/qtapplicationmanager_git.bb +++ b/recipes-qt/qt6/qtapplicationmanager_git.bb @@ -13,8 +13,6 @@ 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"