Toast
98f9b3a8fc
The nixpkgs patch is to clear out a conflict with a patch that's applied to plasma-workspace by nixpkgs
65 lines
3 KiB
Diff
65 lines
3 KiB
Diff
diff --git a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
|
|
index b4d46cd869bb..ca5bfd2c4889 100644
|
|
--- a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
|
|
+++ b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
|
|
@@ -1,13 +1,14 @@
|
|
diff --git a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
|
|
-index ba214a555d..421d940738 100644
|
|
+index 183f207946..0f64b068ab 100644
|
|
--- a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
|
|
+++ b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
|
|
-@@ -155,7 +155,7 @@ void DeviceErrorMonitor::queryBlockingApps(const QString &devicePath)
|
|
+@@ -168,7 +168,8 @@ void DeviceErrorMonitor::queryBlockingApps(const QString &devicePath)
|
|
Q_EMIT blockingAppsReady(blockApps);
|
|
p->deleteLater();
|
|
});
|
|
- p->start(QStringLiteral("lsof"), {QStringLiteral("-t"), devicePath});
|
|
+ p->start(QStringLiteral("@lsof@"), {QStringLiteral("-t"), devicePath});
|
|
++ // @dbusSend@
|
|
// p.start(QStringLiteral("fuser"), {QStringLiteral("-m"), devicePath});
|
|
}
|
|
|
|
@@ -51,7 +52,7 @@ index e4d1ad4311..d45bdfad98 100644
|
|
|
|
void CFcQuery::procExited()
|
|
diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
|
|
-index f3c9956921..09c818739d 100644
|
|
+index 53f77d0a18..680e81b6e4 100644
|
|
--- a/kcms/krdb/krdb.cpp
|
|
+++ b/kcms/krdb/krdb.cpp
|
|
@@ -425,7 +425,7 @@ void runRdb(unsigned int flags)
|
|
@@ -107,7 +108,7 @@ index 7218628ce9..9126475ea4 100644
|
|
+ExecStart=@qdbus@ org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1
|
|
Slice=session.slice
|
|
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
|
|
-index 4d31c6f408..17418b1ff7 100644
|
|
+index 02c3f260fb..795244064d 100644
|
|
--- a/startkde/startplasma.cpp
|
|
+++ b/startkde/startplasma.cpp
|
|
@@ -57,7 +57,7 @@ void sigtermHandler(int signalNumber)
|
|
@@ -119,7 +120,7 @@ index 4d31c6f408..17418b1ff7 100644
|
|
}
|
|
|
|
QStringList allServices(const QLatin1String &prefix)
|
|
-@@ -512,7 +512,7 @@ QProcess *setupKSplash()
|
|
+@@ -508,7 +508,7 @@ QProcess *setupKSplash()
|
|
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
|
|
p = new QProcess;
|
|
p->setProcessChannelMode(QProcess::ForwardedChannels);
|
|
@@ -128,14 +129,4 @@ index 4d31c6f408..17418b1ff7 100644
|
|
}
|
|
}
|
|
return p;
|
|
-diff --git a/startkde/systemd/plasma-ksplash-ready.service.in b/startkde/systemd/plasma-ksplash-ready.service.in
|
|
-index 1e903130a9..0861c3d136 100644
|
|
---- a/startkde/systemd/plasma-ksplash-ready.service.in
|
|
-+++ b/startkde/systemd/plasma-ksplash-ready.service.in
|
|
-@@ -6,5 +6,5 @@ PartOf=graphical-session.target
|
|
-
|
|
- [Service]
|
|
- Type=oneshot
|
|
--ExecStart=dbus-send --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready
|
|
-+ExecStart=@dbusSend@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready
|
|
- Slice=session.slice
|
|
+
|
|
|