[neon/kde/kglobalaccel/Neon/unstable] debian/patches: update patches

[Jonathan Riddell]

Git commit 17d41515078763f945ad017a8ea1953b47ad4045 by Jonathan Riddell.
Committed on 01/04/2021 at 14:05.
Pushed by jriddell into branch 'Neon/unstable'.

update patches

M  +7    -26   debian/patches/uid2.diff

https://invent.kde.org/neon/kde/kglobalaccel/commit/17d41515078763f945ad017a8ea1953b47ad4045

diff --git a/debian/patches/uid2.diff b/debian/patches/uid2.diff
index 1187ce7..767a74d 100644
--- a/debian/patches/uid2.diff
+++ b/debian/patches/uid2.diff
@@ -6,38 +6,19 @@ Date:   Fri Mar 26 13:48:01 2021 +0100
     
     To fix build on Windows.
 
-diff --git a/src/runtime/main.cpp b/src/runtime/main.cpp
-index 46506b3..380b1b8 100644
---- a/src/runtime/main.cpp
-+++ b/src/runtime/main.cpp
-@@ -10,14 +10,16 @@
- #include "kglobalacceld.h"
- #include "logging_p.h"
- 
--#include <unistd.h>
--
- #include <KAboutData>
- #include <KCrash>
- #include <KDBusService>
- #include <QCommandLineParser>
- #include <QGuiApplication>
- 
-+#ifdef Q_OS_UNIX
-+#include <unistd.h>
-+#endif
-+
- static bool isEnabled()
- {
-     // TODO: Check if kglobalaccel can be disabled
-@@ -59,6 +61,7 @@ extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
-         return 0;
+Index: kglobalaccel/src/runtime/main.cpp
+===================================================================
+--- kglobalaccel.orig/src/runtime/main.cpp
++++ kglobalaccel/src/runtime/main.cpp
+@@ -75,6 +75,7 @@ extern "C" Q_DECL_EXPORT int main(int ar
      }
+ #endif
  
 +#ifdef Q_OS_UNIX
      // It's possible that kglobalaccel gets started as the wrong user by
      // accident, e.g. kdesu dolphin leads to dbus activation. It then installs
      // its grabs and the actions are run as the wrong user.
-@@ -68,6 +71,7 @@ extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
+@@ -84,6 +85,7 @@ extern "C" Q_DECL_EXPORT int main(int ar
          qCWarning(KGLOBALACCELD) << "kglobalaccel running as wrong user, exiting.";
          return 0;
      }