diff options
Diffstat (limited to 'gnome-base/gnome-session')
| -rw-r--r-- | gnome-base/gnome-session/Manifest | 1 | ||||
| -rw-r--r-- | gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch | 56 |
2 files changed, 0 insertions, 57 deletions
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest index 299b2ab0910a..4d932de93482 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -3,7 +3,6 @@ AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5b AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a5df5e8db665e43372f8c08a5ea8480e63e318befc5b2e56e4b027ca873947972aa2b19d14ba85f0ec3e SHA512 edee1126e11c3b49ebcea1e1a6929d55a28d09b6c382666d6d6a32271a4cf22af23927f7a5e15ecbd4a4cdaa41ac2f1ffc09350f4e48257e2e5e29ade08635ac -AUX gnome-session-3.38.0-exit-conflict-systemd247.patch 2229 BLAKE2B aeac31dd5d50d2e8eac6fe2bdcbabe82eb90f0a16f396da5ec45466f519fe3b565bebbcb818a0b41607df9ce6ecb46bd637c8ee9e72ba9d28fd315189820f31e SHA512 36e9640be8c04e9442609da36696895efec57a073792622eac7ded8c463e622b932d8693130f19491b4649cdc333d7d269c8732ebb12702ab2b574bc0dc6cc43 AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2 DIST gnome-session-40.1.1.tar.xz 482304 BLAKE2B 9a96f230dc793cc0b810bdaad6ce0103f923fbd2b22ee567316508c79bd6e7afe3961b593d094d0a4766a76f45ba6710f96e03a299f43d08a04aca776a172955 SHA512 91609915366839806729e066e5ca0d42daff0591732cda08c3da7d4951f7e27964d72988c4e61a64045443969b9fb0a9697c7ace82bdd8843310cb4d7e9dfd8c EBUILD gnome-session-40.1.1.ebuild 3452 BLAKE2B 38f77900a0d24c45b000dff3c7e2e4d5a687e0a60d14f877af6468cd906cc4ccb3b3d81b1b319a0fbd7a41804436d8be4daf88d3d525cadf9b70459e80a197fb SHA512 227b08745fb043d5ee96c0cbcd06f834b55f1a63871fb93173785ddac9f99708431b4af59c05ffb970b3497747289da68f64770d4b155bf9b1d83aa831fca5b7 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 deleted file mode 100644 index a4a99640f374..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9de6e40f12e8878f524f8d429d85724c156a0517 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg <bberg@redhat.com> -Date: Thu, 3 Dec 2020 13:45:36 +0100 -Subject: [PATCH] data: Fix indirect conflict with exit.target via app.slice - -systemd v247 now puts services into app.slice by default. But app.slice -will have a conflict with exit.target, which in turn means that we still -get a conflict with exit.target indirectly. - -Fix it by adding the appropriate Slice=-.slice into -gnome-session-restart-dbus.service. Also update the note in -gnome-session-shutdown.service to point out the requirements. - -Closes: #74 ---- - data/gnome-session-restart-dbus.service.in | 5 +++-- - data/gnome-session-shutdown.target | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/data/gnome-session-restart-dbus.service.in b/data/gnome-session-restart-dbus.service.in -index e90f6bc8..6389c321 100644 ---- a/data/gnome-session-restart-dbus.service.in -+++ b/data/gnome-session-restart-dbus.service.in -@@ -1,10 +1,11 @@ - [Unit] - Description=Restart DBus after GNOME Session shutdown - --# Allow exit.target to start even if this unit is started with replace-irreversibly --# Also put it into a slice that doesn't have such implicit dependencies -+# Allow exit.target to start even if this unit is started with replace-irreversibly. -+# For this to work, we also need to be in the root slice. - DefaultDependencies=no - - [Service] - Type=notify - ExecStart=@libexecdir@/gnome-session-ctl --restart-dbus -+Slice=-.slice -diff --git a/data/gnome-session-shutdown.target b/data/gnome-session-shutdown.target -index 607dc6e7..2c3d1963 100644 ---- a/data/gnome-session-shutdown.target -+++ b/data/gnome-session-shutdown.target -@@ -1,8 +1,9 @@ - [Unit] - Description=Shutdown running GNOME Session - --# Allow exit.target to start even if this unit is started with replace-irreversibly --# The same is needed for all (weak) dependencies -+# Allow exit.target to start even if this unit is started with replace-irreversibly. -+# All (weak) dependencies need to do the same. Services also need to ensure they -+# are in the root slice by setting Slice=-.slice. - DefaultDependencies=no - - Conflicts=graphical-session.target graphical-session-pre.target --- -GitLab - |