[neon/kf6/kf6-kdbusaddons/Neon/unstable_jammy] debian/patches: delete merged patch

[Carlos De Maine]

Git commit ab0f29ec4aa1d73cafcd2b9b193e704b79eb5338 by Carlos De Maine.
Committed on 13/08/2024 at 11:28.
Pushed by carlosdem into branch 'Neon/unstable_jammy'.

delete merged patch

(cherry picked from commit cfbc50cb0006a967b224a3f9279c65b4c0c62791)

Co-authored-by: Carlos De Maine <carlosdemaine at gmail.com>

D  +0    -38   debian/patches/env_vars_leaking_in_snaps
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/kf6/kf6-kdbusaddons/-/commit/ab0f29ec4aa1d73cafcd2b9b193e704b79eb5338

diff --git a/debian/patches/env_vars_leaking_in_snaps b/debian/patches/env_vars_leaking_in_snaps
deleted file mode 100644
index 08da67c..0000000
--- a/debian/patches/env_vars_leaking_in_snaps
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/src/kupdatelaunchenvironmentjob.cpp b/src/kupdatelaunchenvironmentjob.cpp
-index 981666e51bf6d4e40f349d60e7b78770239fb18d..6af300301dab70e2273f672e74f6629aaeb89f51 100644
---- a/src/kupdatelaunchenvironmentjob.cpp
-+++ b/src/kupdatelaunchenvironmentjob.cpp
-@@ -23,6 +23,7 @@ public:
-     void monitorReply(const QDBusPendingReply<> &reply);
- 
-     static bool isPosixName(const QString &name);
-+    static bool isProcessConfinementName(const QString &name);
-     static bool isSystemdApprovedValue(const QString &value);
- 
-     KUpdateLaunchEnvironmentJob *q;
-@@ -71,6 +72,10 @@ void KUpdateLaunchEnvironmentJob::start()
-             qCWarning(KDBUSADDONS_LOG) << "Skipping syncing of environment variable " << varName << "as name contains unsupported characters";
-             continue;
-         }
-+        if (KUpdateLaunchEnvironmentJobPrivate::isProcessConfinementName(varName)) {
-+            qCWarning(KDBUSADDONS_LOG) << "Skipping syncing of environment variable " << varName << "as name is related to process specific confinement";
-+            continue;
-+        }
-         const QString value = d->environment.value(varName);
- 
-         // plasma-session
-@@ -137,6 +142,14 @@ bool KUpdateLaunchEnvironmentJobPrivate::isPosixName(const QString &name)
-     return !first;
- }
- 
-+bool KUpdateLaunchEnvironmentJobPrivate::isProcessConfinementName(const QString &name)
-+{
-+    if (name == QStringLiteral("SNAP") || name.startsWith(QStringLiteral("SNAP_"))) {
-+        return true;
-+    }
-+    return false;
-+}
-+
- bool KUpdateLaunchEnvironmentJobPrivate::isSystemdApprovedValue(const QString &value)
- {
-     // systemd code checks that a value contains no control characters except \n \t
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f4454f9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-env_vars_leaking_in_snaps