pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 438376 from home:wolfi323:test

Browse Source 
- Call qtpaths with an absolute path in startkde to make sure the system one is used (boo#1004769)

Fixes Plasma starting when there is a different Qt installation in the user's path (that has no qdbus-qt5) like is the case when installing Anaconda, see https://forums.opensuse.org/showthread.php/520628-Could-not-start-D-bus-Can-you-call-qdbus-qt5

OBS-URL: https://build.opensuse.org/request/show/438376
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=272
This commit is contained in:
Fabian Vogt 2016-11-02 16:44:27 +00:00 committed by Git OBS Bridge
parent 30f79b731e
commit 068c0bbedb
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0001-Rename-qdbus-in-startkde.patch
View File

@ -2,11 +2,13 @@ diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 91c8a3c..0c658bd 100644 index 91c8a3c..0c658bd 100644
--- a/startkde/startkde.cmake --- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake +++ b/startkde/startkde.cmake
@@ -21,13 +21,13 @@ unset DYLD_FORCE_FLAT_NAMESPACE @@ -20,14 +20,14 @@ unset DYLD_FORCE_FLAT_NAMESPACE
# in case we have been started with full pathname spec without being in PATH
bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
if [ -n "$bindir" ]; then if [ -n "$bindir" ]; then
qbindir=`qtpaths --binaries-dir` - qbindir=`qtpaths --binaries-dir`
- qdbus=$qbindir/qdbus - qdbus=$qbindir/qdbus
+ qbindir=`/usr/bin/qtpaths --binaries-dir`
+ qdbus=$qbindir/qdbus-qt5 + qdbus=$qbindir/qdbus-qt5
case $PATH in case $PATH in
$bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;

6
plasma5-workspace.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 2 12:24:35 UTC 2016 - wbauer@tmo.at
- Call qtpaths with an absolute path in startkde to make sure the
system one is used (boo#1004769)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 2 11:12:23 UTC 2016 - alarrosa@suse.com Wed Nov 2 11:12:23 UTC 2016 - alarrosa@suse.com