commit: 22193401fc34ccd8ac8556e4e400cd264336de16
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 17:21:42 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 29 18:19:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22193401
x11-misc/xscreensaver: drop dead prefix targets
Half the patch didn't make sense nowadays anyway as sync() was commented out.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/xscreensaver-6.01-interix.patch | 30 ----------------------
x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild | 3 +--
x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild | 1 -
x11-misc/xscreensaver/xscreensaver-6.06.ebuild | 1 -
4 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
deleted file mode 100644
index 72aa6535f139..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nru a/driver/prefsw.c b/driver/prefsw.c
---- a/driver/prefsw.c 2021-02-19 02:52:32.000000000 +0100
-+++ b/driver/prefsw.c 2021-05-07 15:20:09.280321274 +0200
-@@ -798,7 +798,10 @@
- sure that the bits actually land on the disk right away. */
- /* Update 2020: Apparently here in the future, this sometimes takes
- 3+ seconds, so let's not. */
-+/* Interix has no sync() or alike. */
-+#ifndef __INTERIX
- /* sync(); */
-+#endif
-
- status = 0; /* wrote and renamed successfully! */
- }
-diff -Nru a/driver/setuid.c b/driver/setuid.c
---- a/driver/setuid.c 2021-02-05 16:16:23.000000000 +0100
-+++ b/driver/setuid.c 2021-05-07 15:21:05.987949943 +0200
-@@ -104,9 +104,12 @@
- if (uid == (uid_t) -1) uid = (uid_t) -2;
-
- errno = 0;
-+
-+#ifndef __INTERIX
- if (setgroups_needed_p (gid) &&
- setgroups (1, &gid) < 0)
- sgs_errno = errno ? errno : -1;
-+#endif
-
- errno = 0;
- if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index c724289feed1..8b77e00352a5 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -77,7 +77,6 @@ BDEPEND="
virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}"/${PN}-6.01-interix.patch
"${FILESDIR}"/${PN}-5.31-pragma.patch
"${FILESDIR}"/${PN}-6.01-gentoo.patch
"${FILESDIR}"/${PN}-5.45-gcc.patch
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
index 7dbfa69b04f5..53580375256b 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}"/${PN}-6.01-interix.patch
"${FILESDIR}"/${PN}-5.31-pragma.patch
"${FILESDIR}"/${PN}-6.01-gentoo.patch
"${FILESDIR}"/${PN}-5.45-gcc.patch
diff --git a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
b/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
index 4b4247e5340a..02ae75c68a51 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.06.ebuild
@@ -75,7 +75,6 @@ BDEPEND="
virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}"/${PN}-6.01-interix.patch
"${FILESDIR}"/${PN}-5.31-pragma.patch
"${FILESDIR}"/${PN}-6.01-gentoo.patch
"${FILESDIR}"/${PN}-5.45-gcc.patch
