Fix launching terminal .desktop files with konsole (#1376981,kde#368949)

This commit is contained in:
Rex Dieter 2016-09-17 10:06:39 -05:00
parent f93390aa84
commit cb5cf3fb3e
3 changed files with 34 additions and 9 deletions

8
.gitignore vendored
View File

@ -1,9 +1 @@
/kio-5.18.0.tar.xz
/kio-5.19.0.tar.xz
/kio-5.20.0.tar.xz
/kio-5.21.0.tar.xz
/kio-5.22.0.tar.xz
/kio-5.23.0.tar.xz
/kio-5.24.0.tar.xz
/kio-5.25.0.tar.xz
/kio-5.26.0.tar.xz

View File

@ -0,0 +1,29 @@
From c784a879eaba0babc6274bc32e761772add3d4f8 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Sun, 11 Sep 2016 00:14:56 +0200
Subject: [PATCH 09/13] 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
---
src/core/desktopexecparser.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/desktopexecparser.cpp b/src/core/desktopexecparser.cpp
index c526da7..5162905 100644
--- a/src/core/desktopexecparser.cpp
+++ b/src/core/desktopexecparser.cpp
@@ -363,7 +363,7 @@ QStringList KIO::DesktopExecParser::resultingArguments() const
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();
--
2.7.4

View File

@ -2,7 +2,7 @@
Name: kf5-%{framework}
Version: 5.26.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction
License: GPLv2+ and MIT and BSD
@ -18,6 +18,7 @@ URL: https://quickgit.kde.org/?p=%{framework}.git
Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
## upstream patches
Patch9: 0009-Fix-launching-terminal-.desktop-files-with-konsole.patch
BuildRequires: extra-cmake-modules >= %{version}
BuildRequires: kf5-karchive-devel >= %{version}
@ -262,6 +263,9 @@ fi
%changelog
* Sat Sep 17 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.26.0-2
- Fix launching terminal .desktop files with konsole (#1376981,kde#368949)
* Wed Sep 07 2016 Daniel Vrátil <dvratil@fedoraproject.org> - 5.26.0-1
- KDE Frameworks 5.26.0