From bc86df28d4e71791247c4dd96b143d72ec3e1065 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Fri, 11 Jul 2014 17:03:26 +0200
Subject: [PATCH] fix issue in opening a terminal in Konqueror/Dolphin does not
 inherit environment variable

---
 kdelibs-4.13.2-invokeTerminal.patch | 17 +++++++++++++++++
 kdelibs.spec                        |  9 ++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 kdelibs-4.13.2-invokeTerminal.patch

diff --git a/kdelibs-4.13.2-invokeTerminal.patch b/kdelibs-4.13.2-invokeTerminal.patch
new file mode 100644
index 0000000..9e73826
--- /dev/null
+++ b/kdelibs-4.13.2-invokeTerminal.patch
@@ -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"));
+     }
+ }
diff --git a/kdelibs.spec b/kdelibs.spec
index 3a8f331..89975be 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -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