[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     c7fe6837c7b82a622816002ae1dd4e0ad514a014
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon May  6 16:49:17 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon May  6 18:30:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7fe6837

x11-misc/xscreensaver: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../xscreensaver-6.05-configure-exit-codes.patch   | 29 ----------------------
 ...6-service-remove-Alias-org.jwz.xscreensav.patch | 18 --------------
 ...service-start-xscreensaver-with-no-splash.patch | 21 ----------------
 3 files changed, 68 deletions(-)

diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch
deleted file mode 100644
index a8ef464d2db0..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-The configure scripts exits on a non zero exit code even with a warning. Even
-though for upstream this is just a warning, for portage this means failure and 
-it will exit.
-We therefore alter the exit codes where neccesary.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -4588,7 +4588,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then
-   else
-     warnL "The GTK libraries do not seem to be available; the"
-     warn2 "\`xscreensaver-settings' program requires them."
--    CONF_STATUS=1
- #   echo ''
- #   warn2 'You can use Motif or Lesstif instead of GTK (use the'
- #   warn2 "\`--with-motif' option) but that is NOT recommended."
-@@ -4615,7 +4614,6 @@ if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then
-   warn  "GTK is being used, but the GDK-Pixbuf library and/or"
-   warn2 "headers were not found.  That can't be good.  Please"
-   warn2 "install the GDK-Pixbuf development kit and re-configure."
--  CONF_STATUS=1
- fi
-
- if test "$have_motif" = yes -a "$have_lesstif" = yes ; then
-@@ -4733,7 +4731,6 @@ if test "$have_png" = no ; then
-
-   if test "$png_halfassed" = yes ; then halfassery ; fi
-   warn2 "Many things aren't going to work right."
--  CONF_STATUS=1
- fi

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
deleted file mode 100644
index 454a9a7dd6bf..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From f275dd14752d9dc6a2159008490c68bf968be025 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@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
deleted file mode 100644
index ec4f85d373f9..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From d2ad34b94c01b4e41cac6c6181d2ee0cf332c583 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@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
-