From db185f1598c549ff7015c0a33dbd6b5c74349217 Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Fri, 17 Jan 2025 18:52:54 +0100 Subject: [PATCH] plasma-activities: remove obsolete patch --- recipes-plasma/plasma-activities.inc | 2 -- ...bsolute-build-path-in-private-header.patch | 34 ------------------- 2 files changed, 36 deletions(-) delete mode 100644 recipes-plasma/plasma-activities/0001-Avoid-absolute-build-path-in-private-header.patch diff --git a/recipes-plasma/plasma-activities.inc b/recipes-plasma/plasma-activities.inc index 57774c8..9c1f947 100644 --- a/recipes-plasma/plasma-activities.inc +++ b/recipes-plasma/plasma-activities.inc @@ -9,8 +9,6 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f" PR = "r0" -SRC_URI:append = " file://0001-Avoid-absolute-build-path-in-private-header.patch" - DEPENDS = " \ qtbase \ qtdeclarative \ diff --git a/recipes-plasma/plasma-activities/0001-Avoid-absolute-build-path-in-private-header.patch b/recipes-plasma/plasma-activities/0001-Avoid-absolute-build-path-in-private-header.patch deleted file mode 100644 index 531c0ac..0000000 --- a/recipes-plasma/plasma-activities/0001-Avoid-absolute-build-path-in-private-header.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 87f9d4a40f373f50dd30309b3b4514d710d038c1 Mon Sep 17 00:00:00 2001 -From: Andreas Cord-Landwehr -Date: Mon, 4 Nov 2024 19:26:56 +0100 -Subject: [PATCH] Avoid absolute build path in (private) header - -Do not generate an absolute build path with host system paths into -internal headers, because that causes problems for debug symbol -unfolding. - -Upstream-Status: Submitted [https://invent.kde.org/plasma/plasma-activities/-/merge_requests/56] - -SPDX-FileCopyrightText: Andreas Cord-Landwehr -SPDX-License-Identifier: MIT -Signed-off-by: Andreas Cord-Landwehr ---- - src/lib/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt -index 169b0b57..c460bc15 100644 ---- a/src/lib/CMakeLists.txt -+++ b/src/lib/CMakeLists.txt -@@ -43,7 +43,7 @@ target_sources(PlasmaActivities PRIVATE - set_source_files_properties ( - ${PLASMA_ACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.Activities.xml - PROPERTIES -- INCLUDE ${PLASMA_ACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.Activities.h -+ INCLUDE ../common/dbus/org.kde.ActivityManager.Activities.h - ) - - set(PlasmaActivities_DBus_SRCS) --- -2.43.0 -