From a231046ed74f8df571a8082ee1763d57e8f26663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 9 Feb 2015 19:12:35 +0100 Subject: [PATCH] plasma-workspace: fix path for start_kdeinit_wrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...e-fix-path-for-start_kdeinit_wrapper.patch | 33 +++++++++++++++++++ .../plasma-workspace/plasma-workspace.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 recipes-kde/plasma/tier3/plasma-workspace/files/0017-startkde-fix-path-for-start_kdeinit_wrapper.patch diff --git a/recipes-kde/plasma/tier3/plasma-workspace/files/0017-startkde-fix-path-for-start_kdeinit_wrapper.patch b/recipes-kde/plasma/tier3/plasma-workspace/files/0017-startkde-fix-path-for-start_kdeinit_wrapper.patch new file mode 100644 index 00000000..2588a464 --- /dev/null +++ b/recipes-kde/plasma/tier3/plasma-workspace/files/0017-startkde-fix-path-for-start_kdeinit_wrapper.patch @@ -0,0 +1,33 @@ +From 6888f465f0aa7c2954f180113935e5b6927504a6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 9 Feb 2015 19:06:41 +0100 +Subject: [PATCH] startkde: fix path for start_kdeinit_wrapper +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +we have per-package libexec-dir and start_kdeinit_wrapper is installed by kinit + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + startkde/startkde.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake +index 046543e..32cb13f 100644 +--- a/startkde/startkde.cmake ++++ b/startkde/startkde.cmake +@@ -356,7 +356,7 @@ fi + + # We set LD_BIND_NOW to increase the efficiency of kdeinit. + # kdeinit unsets this variable before loading applications. +-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup ++LD_BIND_NOW=true @CMAKE_INSTALL_LIBDIR@/kinit/kf5/start_kdeinit_wrapper --kded +kcminit_startup + if test $? -ne 0; then + # Startup error + echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 +-- +1.9.3 + diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb index fa81a014..12c90aca 100644 --- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb +++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb @@ -55,6 +55,7 @@ SRC_URI += " \ file://0014-dataengines-mouse-fix-build-in-X11-less-environments.patch \ file://0015-fix-paths-in-startkde.patch \ file://0016-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch \ + file://0017-startkde-fix-path-for-start_kdeinit_wrapper.patch \ " # Notes on patches