[neon/kde/kio/Neon/release] debian/patches: add patch for trunk

[Jonathan Riddell]

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

add patch for trunk

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

https://invent.kde.org/neon/kde/kio/commit/2aa0b7fcf74c11f8a6b53e0b195ddf3b5538194f

diff --git a/debian/patches/KProcessRunner-ForkingProcessRunner-xdgActivationTokenArrived.diff b/debian/patches/KProcessRunner-ForkingProcessRunner-xdgActivationTokenArrived.diff
new file mode 100644
index 0000000..696d37f
--- /dev/null
+++ b/debian/patches/KProcessRunner-ForkingProcessRunner-xdgActivationTokenArrived.diff
@@ -0,0 +1,35 @@
+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 f49df91..474f1db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ Disable-flaky-test.patch
 Disable-baloo-dependant-tests.patch
 #Disable-flaky-test-1.patch
 libexec_from_env.patch
+KProcessRunner-ForkingProcessRunner-xdgActivationTokenArrived.diff