zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plasma-workspace: fix further path to qt5 tool in startplasmacompositor

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2016-12-08 18:37:34 +01:00
parent 4e8ab6dfa8
commit 4d01e78234
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
recipes-kde/plasma/tier3/plasma-workspace/files/0006-startplasmacompositor-add-qt5-bin-path-to-PATH.patch → recipes-kde/plasma/tier3/plasma-workspace/files/0006-startplasmacompositor-align-qt5-bin-path.patch
View File

@@ -1,7 +1,7 @@
From 13f3dc717f866f51795f257ccfbe1c90b523e96d Mon Sep 17 00:00:00 2001
From 3fabfaa8f0beb09513bf0dd770f6273682edd12a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 15 Aug 2016 22:43:04 +0200
Subject: [PATCH] startplasmacompositor: add qt5 bin path to PATH
Subject: [PATCH] startplasmacompositor: align qt5 bin path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -10,11 +10,11 @@ Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
startkde/startplasmacompositor.cmake | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
startkde/startplasmacompositor.cmake | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
index 535d1c1..6f43f50 100644
index 5bcf26a..6252d79 100644
--- a/startkde/startplasmacompositor.cmake
+++ b/startkde/startplasmacompositor.cmake
@@ -4,17 +4,9 @@
@@ -38,6 +38,15 @@ index 535d1c1..6f43f50 100644
# We need to create config folder so we can write startupconfigkeys
if [ ${XDG_CONFIG_HOME} ]; then
@@ -148,7 +140,7 @@ fi
# better use the Autostart folder.
# TODO: Use GenericConfigLocation once we depend on Qt 5.4
-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
+scriptpath=`@CMAKE_INSTALL_FULL_BINDIR@/qt5/qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
# Add /env/ to the directory to locate the scripts to be sourced
for prefix in `echo $scriptpath`; do
--
2.5.5
2.7.4

2
recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
View File

@@ -50,7 +50,7 @@ SRC_URI += " \
file://0003-startkde-add-meta-qt5-standard-binary-path-to-PATH.patch \
file://0004-startkde-create-kde-s-home.patch \
file://0005-startkde-enable-starting-X.patch \
file://0006-startplasmacompositor-add-qt5-bin-path-to-PATH.patch \
file://0006-startplasmacompositor-align-qt5-bin-path.patch \
"
# REVISIT