diff --git a/recipes-kde/kf5/tier3/kded/files/0001-hardcode-path-to-kconf_update.patch b/recipes-kde/kf5/tier3/kded/files/0001-hardcode-path-to-kconf_update.patch new file mode 100644 index 00000000..f6a78fbd --- /dev/null +++ b/recipes-kde/kf5/tier3/kded/files/0001-hardcode-path-to-kconf_update.patch @@ -0,0 +1,38 @@ +From 145e379cc805838e7aa88d3875d771c5ee55bda1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 4 May 2015 14:51:48 +0200 +Subject: [PATCH] hardcode path to kconf_update +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +kconfig does not export location to kconfig in our environment so set it +manually. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + src/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 5e95df8..8334c80 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -18,10 +18,10 @@ target_link_libraries(kdeinit_kded5 + KF5::Crash # Sets it as autostart + ) + target_compile_definitions(kdeinit_kded5 PRIVATE +- KCONF_UPDATE_EXE="$" ++ KCONF_UPDATE_EXE="${CMAKE_INSTALL_LIBDIR}/kconfig/kf5/kconf_update" + ) + target_compile_definitions(kded5 PRIVATE +- KCONF_UPDATE_EXE="$" ++ KCONF_UPDATE_EXE="${CMAKE_INSTALL_LIBDIR}/kconfig/kf5/kconf_update" + ) + + install(TARGETS kdeinit_kded5 EXPORT KDEDTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +-- +1.9.3 + diff --git a/recipes-kde/kf5/tier3/kded/kded.bb b/recipes-kde/kf5/tier3/kded/kded.bb index 96ca7f71..65782d94 100644 --- a/recipes-kde/kf5/tier3/kded/kded.bb +++ b/recipes-kde/kf5/tier3/kded/kded.bb @@ -11,13 +11,14 @@ DEPENDS += "kconfig kcoreaddons kcrash kdbusaddons kdoctools kinit kservice" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "eba4cae48b989df9b2af75ae20702cad" SRC_URI[sha256sum] = "37e72c1d56577805020bc477092c42f97b8f354e89b4febf7a93d5d5d22d07cf" +SRC_URI += "file://0001-hardcode-path-to-kconf_update.patch" # cross libs / headers CMAKE_ALIGN_SYSROOT[1] = "KDED, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" CMAKE_ALIGN_SYSROOT[2] = "KDED, -S${includedir}, -S${STAGING_INCDIR}" # executables REVISIT -> native -CMAKE_ALIGN_SYSROOT[3] = "KDED, -S${bindir}, -S${STAGING_BINDIR}" +#CMAKE_ALIGN_SYSROOT[3] = "KDED, -S${bindir}, -S${STAGING_BINDIR}" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/k*5 ${libdir}/libkdeinit5_kded5.so" FILES_${PN}-dev = "${libdir}/cmake"