[neon/kde/kio/Neon/unstable] debian/patches: Revert "add patch for trunk"

[Jonathan Riddell]

Git commit a9613e11777e62688827944e703b0a9ceedefca5 by Jonathan Riddell.
Committed on 23/06/2021 at 15:14.
Pushed by jriddell into branch 'Neon/unstable'.

Revert "add patch for trunk"

This reverts commit 2aa0b7fcf74c11f8a6b53e0b195ddf3b5538194f.

D  +0    -35   debian/patches/KProcessRunner-ForkingProcessRunner-xdgActivationTokenArrived.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/kde/kio/commit/a9613e11777e62688827944e703b0a9ceedefca5

diff --git a/debian/patches/KProcessRunner-ForkingProcessRunner-xdgActivationTokenArrived.diff b/debian/patches/KProcessRunner-ForkingProcessRunner-xdgActivationTokenArrived.diff
deleted file mode 100644
index 696d37f..0000000
--- a/debian/patches/KProcessRunner-ForkingProcessRunner-xdgActivationTokenArrived.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 3bc92c23dd3456bb18efd44968fabf32dd9c3402
-Author: Aleix Pol <aleixpol at kde.org>
-Date:   Fri Jun 11 12:45:41 2021 +0200
-
-    KProcessRunner: Make sure we are connected as we request
-    
-    This way we make sure that we always catch when it's emitted.
-
-diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp
-index 2f625063..d35edb0b 100644
---- a/src/gui/kprocessrunner.cpp
-+++ b/src/gui/kprocessrunner.cpp
-@@ -270,6 +270,9 @@ void ForkingProcessRunner::startProcess()
-             if (window) {
-                 const int launchedSerial = KWindowSystem::lastInputSerial(window);
-                 waitingForXdgToken = true;
-+                connect(this, &ForkingProcessRunner::xdgActivationTokenArrived, m_process.get(), [this] {
-+                    m_process->start();
-+                });
-                 connect(KWindowSystem::self(),
-                         &KWindowSystem::xdgActivationTokenArrived,
-                         m_process.get(),
-@@ -284,11 +287,7 @@ void ForkingProcessRunner::startProcess()
-         }
-     }
- 
--    if (waitingForXdgToken) {
--        connect(this, &ForkingProcessRunner::xdgActivationTokenArrived, m_process.get(), [this] {
--            m_process->start();
--        });
--    } else {
-+    if (!waitingForXdgToken) {
-         m_process->start();
-     }
- }
diff --git a/debian/patches/series b/debian/patches/series
index 474f1db..f49df91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ Disable-flaky-test.patch
 Disable-baloo-dependant-tests.patch
 #Disable-flaky-test-1.patch
 libexec_from_env.patch
-KProcessRunner-ForkingProcessRunner-xdgActivationTokenArrived.diff