Hrvoje Senjan 2016-10-05 15:59:37 +00:00 committed by Git OBS Bridge
parent 480206d47c
commit 5345e8c3fe
3 changed files with 35 additions and 0 deletions

View File

@ -0,0 +1,26 @@
From: Antonio Rojas <arojas@archlinux.org>
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();

View File

@ -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 Tue Sep 6 20:50:52 UTC 2016 - hrvoje.senjan@gmail.com

View File

@ -75,6 +75,8 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%
Source1: baselibs.conf 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 # 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 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -121,6 +123,7 @@ Development files.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build