[neon/kde/kglobalaccel/Neon/release-lts] debian/patches: remove patches in branch

[Jonathan Riddell]

Git commit 5b3938276756c2b4197cbf7dd0f2e05c33df607a by Jonathan Riddell.
Committed on 11/04/2021 at 22:33.
Pushed by jriddell into branch 'Neon/release-lts'.

remove patches in branch

D  +0    -2    debian/patches/series
D  +0    -38   debian/patches/uid.diff
D  +0    -28   debian/patches/uid2.diff

https://invent.kde.org/neon/kde/kglobalaccel/commit/5b3938276756c2b4197cbf7dd0f2e05c33df607a

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2ade593..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-uid.diff
-uid2.diff
diff --git a/debian/patches/uid.diff b/debian/patches/uid.diff
deleted file mode 100644
index 2243488..0000000
--- a/debian/patches/uid.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-commit bbec74337b3186bc258bd5adf849b89191789535
-Author: Fabian Vogt <fabian at ritter-vogt.de>
-Date:   Fri Jan 29 11:31:54 2021 +0100
-
-    Don't let kglobalaccel run if KDE_SESSION_UID mismatches
-    
-    Otherwise shortcuts execute actions as the wrong user.
-
-diff --git a/src/runtime/main.cpp b/src/runtime/main.cpp
-index d2917ad..46506b3 100644
---- a/src/runtime/main.cpp
-+++ b/src/runtime/main.cpp
-@@ -10,6 +10,8 @@
- #include "kglobalacceld.h"
- #include "logging_p.h"
- 
-+#include <unistd.h>
-+
- #include <KAboutData>
- #include <KCrash>
- #include <KDBusService>
-@@ -57,6 +59,16 @@ extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
-         return 0;
-     }
- 
-+    // 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.
-+    bool isUidset = false;
-+    const int sessionuid = qEnvironmentVariableIntValue("KDE_SESSION_UID", &isUidset);
-+    if(isUidset && static_cast<uid_t>(sessionuid) != getuid()) {
-+        qCWarning(KGLOBALACCELD) << "kglobalaccel running as wrong user, exiting.";
-+        return 0;
-+    }
-+
-     KDBusService service(KDBusService::Unique);
- 
-     app.setQuitOnLastWindowClosed(false);
diff --git a/debian/patches/uid2.diff b/debian/patches/uid2.diff
deleted file mode 100644
index 767a74d..0000000
--- a/debian/patches/uid2.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 33bd15697220f8a1223117fee8b03506fe87d912
-Author: Fabian Vogt <fabian at ritter-vogt.de>
-Date:   Fri Mar 26 13:48:01 2021 +0100
-
-    Only use unistd/getuid when available
-    
-    To fix build on Windows.
-
-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.
-@@ -84,6 +85,7 @@ extern "C" Q_DECL_EXPORT int main(int ar
-         qCWarning(KGLOBALACCELD) << "kglobalaccel running as wrong user, exiting.";
-         return 0;
-     }
-+#endif
- 
-     KDBusService service(KDBusService::Unique);
-