| 1 |
commit: 41bca9780b5257ed5f827768be9e4da0db2b31f8 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Tue Jun 1 17:28:35 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 1 19:01:31 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41bca978 |
| 7 |
|
| 8 |
gnome-base/gnome-session: remove unused patch |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 13 |
|
| 14 |
...e-session-3.38.0-exit-conflict-systemd247.patch | 56 ---------------------- |
| 15 |
1 file changed, 56 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch b/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index a4a99640f37..00000000000 |
| 20 |
--- a/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,56 +0,0 @@ |
| 23 |
-From 9de6e40f12e8878f524f8d429d85724c156a0517 Mon Sep 17 00:00:00 2001 |
| 24 |
-From: Benjamin Berg <bberg@××××××.com> |
| 25 |
-Date: Thu, 3 Dec 2020 13:45:36 +0100 |
| 26 |
-Subject: [PATCH] data: Fix indirect conflict with exit.target via app.slice |
| 27 |
- |
| 28 |
-systemd v247 now puts services into app.slice by default. But app.slice |
| 29 |
-will have a conflict with exit.target, which in turn means that we still |
| 30 |
-get a conflict with exit.target indirectly. |
| 31 |
- |
| 32 |
-Fix it by adding the appropriate Slice=-.slice into |
| 33 |
-gnome-session-restart-dbus.service. Also update the note in |
| 34 |
-gnome-session-shutdown.service to point out the requirements. |
| 35 |
- |
| 36 |
-Closes: #74 |
| 37 |
---- |
| 38 |
- data/gnome-session-restart-dbus.service.in | 5 +++-- |
| 39 |
- data/gnome-session-shutdown.target | 5 +++-- |
| 40 |
- 2 files changed, 6 insertions(+), 4 deletions(-) |
| 41 |
- |
| 42 |
-diff --git a/data/gnome-session-restart-dbus.service.in b/data/gnome-session-restart-dbus.service.in |
| 43 |
-index e90f6bc8..6389c321 100644 |
| 44 |
---- a/data/gnome-session-restart-dbus.service.in |
| 45 |
-+++ b/data/gnome-session-restart-dbus.service.in |
| 46 |
-@@ -1,10 +1,11 @@ |
| 47 |
- [Unit] |
| 48 |
- Description=Restart DBus after GNOME Session shutdown |
| 49 |
- |
| 50 |
--# Allow exit.target to start even if this unit is started with replace-irreversibly |
| 51 |
--# Also put it into a slice that doesn't have such implicit dependencies |
| 52 |
-+# Allow exit.target to start even if this unit is started with replace-irreversibly. |
| 53 |
-+# For this to work, we also need to be in the root slice. |
| 54 |
- DefaultDependencies=no |
| 55 |
- |
| 56 |
- [Service] |
| 57 |
- Type=notify |
| 58 |
- ExecStart=@libexecdir@/gnome-session-ctl --restart-dbus |
| 59 |
-+Slice=-.slice |
| 60 |
-diff --git a/data/gnome-session-shutdown.target b/data/gnome-session-shutdown.target |
| 61 |
-index 607dc6e7..2c3d1963 100644 |
| 62 |
---- a/data/gnome-session-shutdown.target |
| 63 |
-+++ b/data/gnome-session-shutdown.target |
| 64 |
-@@ -1,8 +1,9 @@ |
| 65 |
- [Unit] |
| 66 |
- Description=Shutdown running GNOME Session |
| 67 |
- |
| 68 |
--# Allow exit.target to start even if this unit is started with replace-irreversibly |
| 69 |
--# The same is needed for all (weak) dependencies |
| 70 |
-+# Allow exit.target to start even if this unit is started with replace-irreversibly. |
| 71 |
-+# All (weak) dependencies need to do the same. Services also need to ensure they |
| 72 |
-+# are in the root slice by setting Slice=-.slice. |
| 73 |
- DefaultDependencies=no |
| 74 |
- |
| 75 |
- Conflicts=graphical-session.target graphical-session-pre.target |
| 76 |
--- |
| 77 |
-GitLab |
| 78 |
- |
Archives