From 5345e8c3fee4461da9166d3493d5fde8ea9dab4915bd8c9471d900224d396871 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 5 Oct 2016 15:59:37 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kio?expand=0&rev=3 --- ...-terminal-desktop-files-with-konsole.patch | 26 +++++++++++++++++++ kio.changes | 6 +++++ kio.spec | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 Fix-launching-terminal-desktop-files-with-konsole.patch diff --git a/Fix-launching-terminal-desktop-files-with-konsole.patch b/Fix-launching-terminal-desktop-files-with-konsole.patch new file mode 100644 index 0000000..12c685f --- /dev/null +++ b/Fix-launching-terminal-desktop-files-with-konsole.patch @@ -0,0 +1,26 @@ +From: Antonio Rojas +Date: Sat, 10 Sep 2016 22:14:56 +0000 +Subject: Fix launching terminal .desktop files with konsole +X-Git-Tag: v5.27.0-rc1 +X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=c784a879eaba0babc6274bc32e761772add3d4f8 +--- +Fix launching terminal .desktop files with konsole + +Launching .desktop files which have Terminal=true currently fails, because kio adds to the konsole command the obsolete KDE4 command line options, +which are not recognized by the KF5 konsole. + +REVIEW: 128882 +--- + + +--- a/src/core/desktopexecparser.cpp ++++ b/src/core/desktopexecparser.cpp +@@ -363,7 +363,7 @@ + if (!d->service.path().isEmpty()) { + terminal += " --workdir " + KShell::quoteArg(d->service.path()); + } +- terminal += QLatin1String(" -caption=%c %i %m"); ++ terminal += QLatin1String(" -qwindowtitle '%c' %i"); + } + terminal += ' '; + terminal += d->service.terminalOptions(); diff --git a/kio.changes b/kio.changes index 2c16497..8cf22e8 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 5 15:58:21 UTC 2016 - hrvoje.senjan@gmail.com + +- Added Fix-launching-terminal-desktop-files-with-konsole.patch + (kde#368949, boo#1003125) + ------------------------------------------------------------------- Tue Sep 6 20:50:52 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/kio.spec b/kio.spec index 11600c4..2e8baac 100644 --- a/kio.spec +++ b/kio.spec @@ -75,6 +75,8 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-% Source1: baselibs.conf # PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 Patch0: kio_help-fallback-to-kde4-docs.patch +# PATCH-FIX-UPSTREAM Fix-launching-terminal-desktop-files-with-konsole.patch +Patch1: Fix-launching-terminal-desktop-files-with-konsole.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -121,6 +123,7 @@ Development files. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build