commit: ca9cc379aca25f6026c1592ac1c311d5a85899a9
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 9 08:30:29 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Aug 9 08:30:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca9cc379
x11-misc/xscreensaver: xscreensaver.service fixes
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
...06-service-remove-Alias-org.jwz.xscreensav.patch | 18 ++++++++++++++++++
...-service-start-xscreensaver-with-no-splash.patch | 21 +++++++++++++++++++++
...r-6.06-r1.ebuild => xscreensaver-6.06-r2.ebuild} | 2 ++
3 files changed, 41 insertions(+)
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
new file mode 100644
index 000000000000..454a9a7dd6bf
--- /dev/null
+++
b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
@@ -0,0 +1,18 @@
+From f275dd14752d9dc6a2159008490c68bf968be025 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <f...@geekplace.eu>
+Date: Sat, 29 Jul 2023 11:52:22 +0200
+Subject: xscreensaver.service: remove Alias=org.jwz.xscreensaver
+
+$ systemctl --user enable xscreensaver
+Failed to enable unit: Cannot alias xscreensaver.service as
org.jwz.xscreensaver.
+--- a/driver/xscreensaver.service.in
++++ b/driver/xscreensaver.service.in
+@@ -14,5 +14,4 @@ Restart=on-failure
+ OOMScoreAdjust=-1000
+
+ [Install]
+-Alias=org.jwz.xscreensaver
+ WantedBy=default.target
+--
+2.41.0
+
diff --git
a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
new file mode 100644
index 000000000000..ec4f85d373f9
--- /dev/null
+++
b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
@@ -0,0 +1,21 @@
+From d2ad34b94c01b4e41cac6c6181d2ee0cf332c583 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <f...@geekplace.eu>
+Date: Sat, 29 Jul 2023 11:51:45 +0200
+Subject: xscreensaver.service: start xscreensaver with --no-splash
+
+Prevents the splash screen being shown when the user logs in.
+
+--- a/driver/xscreensaver.service.in
++++ b/driver/xscreensaver.service.in
+@@ -9,7 +9,7 @@ ConditionUser=!@system
+ Conflicts=org.gnome.ScreenSaver org.cinnamon.ScreenSaver org.mate.ScreenSaver
org.xfce.ScreenSaver light-locker
+
+ [Service]
+-ExecStart=/usr/bin/xscreensaver
++ExecStart=/usr/bin/xscreensaver --no-splash
+ Restart=on-failure
+ OOMScoreAdjust=-1000
+
+--
+2.41.0
+
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
similarity index 97%
rename from x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
rename to x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
index 48ddc842e1b5..a3b38814fc7b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild
@@ -86,6 +86,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
# "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
# "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
+ "${FILESDIR}"/${PN}-6.06-service-remove-Alias-org.jwz.xscreensav.patch
+ "${FILESDIR}"/${PN}-6.06-service-start-xscreensaver-with-no-splash.patch
)
DOCS=( README{,.hacking} )
