rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix issue in opening a terminal in Konqueror/Dolphin does not inherit environment variable

This commit is contained in:
Than Ngo 2014-07-11 17:03:26 +02:00
parent e39a4b2757
commit bc86df28d4
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kdelibs-4.13.2-invokeTerminal.patch Normal file
View File

@ -0,0 +1,17 @@
diff -up kdelibs-4.13.2/kdecore/kernel/ktoolinvocation_x11.cpp.orig kdelibs-4.13.2/kdecore/kernel/ktoolinvocation_x11.cpp
--- kdelibs-4.13.2/kdecore/kernel/ktoolinvocation_x11.cpp.orig 2014-07-11 16:54:51.000000000 +0200
+++ kdelibs-4.13.2/kdecore/kernel/ktoolinvocation_x11.cpp 2014-07-11 16:57:31.000000000 +0200
@@ -412,11 +412,9 @@ void KToolInvocation::invokeTerminal(con
// directory before launching them, see below.
}
- QString error;
- if (self()->startServiceInternal("kdeinit_exec_with_workdir",
- cmd, cmdTokens, &error, 0, NULL, startup_id, false, workdir)) {
+ if (!QProcess::startDetached(cmd, cmdTokens)) {
KMessage::message(KMessage::Error,
- i18n("Could not launch the terminal client:\n\n%1", error),
+ i18n("Could not launch the terminal client"),
i18n("Could not launch Terminal Client"));
}
}

9
kdelibs.spec
View File

@ -39,7 +39,7 @@
Summary: KDE Libraries
Version: 4.13.2
Release: 10%{?dist}
Release: 11%{?dist}
Name: kdelibs
Epoch: 6
@ -160,6 +160,9 @@ Patch62: kdelibs-4.11.3-arm.patch
# set QT_NO_GLIB in klauncher_main.cpp as a possible fix/workaround for #983110
Patch63: kdelibs-4.11.3-klauncher-no-glib.patch
# opening a terminal in Konqueror / Dolphin does not inherit environment variables
Patch64: kdelibs-4.13.2-invokeTerminal.patch
## upstream
# revert these commits for
@ -387,6 +390,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch61 -p1 -b .dot
%patch62 -p1 -b .arm-plasma
%patch63 -p1 -b .klauncher-no-glib
%patch64 -p1 -b .invokeTerminal
# upstream patches
%patch090 -p1 -R -b .return-not-break.-copy-paste-error
@ -727,6 +731,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Fri Jul 11 2014 Than Ngo <than@redhat.com> - 6:4.13.2-11
- fix issue in opening a terminal in Konqueror/Dolphin does not inherit environment variable
* Tue Jul 08 2014 Rex Dieter <rdieter@fedoraproject.org> 6:4.13.2-10
- mimeinfo scriptlet polish