diff options
| author | Kubuntu CI <kubuntu-ci@lists.launchpad.net> | 2016-05-25 00:07:37 (GMT) |
|---|---|---|
| committer | Kubuntu CI <kubuntu-ci@lists.launchpad.net> | 2016-05-25 00:07:37 (GMT) |
| commit | 59ebd3a35fc8d2f56dea7758325bfcc79d6989de (patch) | |
| tree | 8899dd17ceeadc791c938804535cd639364e41c4 | |
| parent | d70a2d6b7a844eff678d3f5f3817c4c2a5312449 (diff) | |
| parent | 517d50e0fb280940f3372918771fcb77b8715c27 (diff) | |
Merging kubuntu_stable into kubuntu_unstable.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/upstream_fix_kicker_recent_documents.diff | 21 |
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ec7e905..91a6820 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +plasma-desktop (4:5.6.4-0ubuntu2) UNRELEASED; urgency=medium + + * Adding patch upstream_fix_kicker_recent_documents.diff which + fixes opening recent docs on newer KF5. Fixes KDE-Bug:363337 + + -- Rik Mills <rik.mills88@gmail.com> Tue, 24 May 2016 12:29:09 +0100 + plasma-desktop (4:5.6.4-0ubuntu1) yakkety; urgency=medium [ Clive Johnston ] diff --git a/debian/patches/series b/debian/patches/series index c6adb4a..e4fd2b5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ allow_uxterm_overrides.diff upstream_include_cmath_c++_fix.diff +upstream_fix_kicker_recent_documents.diff diff --git a/debian/patches/upstream_fix_kicker_recent_documents.diff b/debian/patches/upstream_fix_kicker_recent_documents.diff new file mode 100644 index 0000000..1747d98 --- /dev/null +++ b/debian/patches/upstream_fix_kicker_recent_documents.diff @@ -0,0 +1,21 @@ +Description: Fix opening recent docs on newer KF5 from kicker menu + Fix opening recent docs on newer KF5. + The KActivities model can return scheme-less local paths, and execution + didn't go through the code path already handling this. +Origin: upstream +Bug-KDE: https://bugs.kde.org/show_bug.cgi?id=363337 +Forwarded: not-needed +Last-Update: 2015-05-24 +--- +Index: plasma-desktop-5.6.4/applets/kicker/plugin/recentusagemodel.cpp +=================================================================== +--- plasma-desktop-5.6.4.orig/applets/kicker/plugin/recentusagemodel.cpp ++++ plasma-desktop-5.6.4/applets/kicker/plugin/recentusagemodel.cpp +@@ -273,7 +273,7 @@ bool RecentUsageModel::trigger(int row, + const QString &resource = resourceAt(row); + + if (!resource.startsWith(QLatin1String("applications:"))) { +- new KRun(QUrl(resource), 0); ++ new KRun(docData(resource, Kicker::UrlRole).toUrl(), 0); + return true; + } |