summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2021-03-12 21:32:28 +0100
committerSebastian Pipping <sping@gentoo.org>2021-03-12 21:33:46 +0100
commitf5f7bd0d572d6d0f2ed37ca774a1d070e951b468 (patch)
tree9075c838d5b00534336923d282b40f9f9fbd47a9 /x11-misc/xscreensaver/files
parentnet-wireless/unifi: bump to 6.1.69, drop old (diff)
downloadgentoo-f5f7bd0d572d6d0f2ed37ca774a1d070e951b468.tar.gz
gentoo-f5f7bd0d572d6d0f2ed37ca774a1d070e951b468.tar.bz2
gentoo-f5f7bd0d572d6d0f2ed37ca774a1d070e951b468.zip
x11-misc/xscreensaver: Drop old
Signed-off-by: Sebastian Pipping <sping@gentoo.org> Package-Manager: Portage-3.0.17, Repoman-3.0.2
Diffstat (limited to 'x11-misc/xscreensaver/files')
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch12
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch13
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch23
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch21
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch47
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch59
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch47
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch68
8 files changed, 0 insertions, 290 deletions
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
deleted file mode 100644
index 1f2495363557..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.17-blurb-hndl-test-passwd.patch
-
---- a/driver/test-passwd.c
-+++ b/driver/test-passwd.c
-@@ -66,6 +66,7 @@
- Bool update_screen_layout (saver_info *si) { return 0; }
-
- const char *blurb(void) { return progname; }
-+Bool in_signal_handler_p = 0;
- Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
-
- void
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
deleted file mode 100644
index bc7f58b4085d..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-test-passwd-segv-tty.patch
-
---- a/driver/passwd.c
-+++ b/driver/passwd.c
-@@ -205,7 +205,7 @@
- {
- # ifdef HAVE_SYSLOG
- struct passwd *pw = getpwuid (getuid ());
-- char *d = DisplayString (si->dpy);
-+ char *d = (si->dpy ? DisplayString (si->dpy) : 0);
- char *u = (pw && pw->pw_name ? pw->pw_name : "???");
- int opt = 0;
- int fac = 0;
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
deleted file mode 100644
index 32fb638afa03..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-tests-miscfix.patch
-
---- a/driver/test-xdpms.c
-+++ a/driver/test-xdpms.c
-@@ -29,7 +29,6 @@
-
- #include <X11/Xproto.h>
- #include <X11/extensions/dpms.h>
--#include <X11/extensions/dpmsstr.h>
-
- extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret);
- extern Bool DPMSCapable (Display *dpy);
---- a/driver/Makefile.in
-+++ a/driver/Makefile.in
-@@ -850,7 +850,7 @@
- test-mlstring: test-mlstring.o
- $(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS)
-
--TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS)
-+TEST_FADE_OBJS = test-fade.o $(UTILS_BIN)/fade.o $(DEMO_UTIL_OBJS)
- test-fade: test-fade.o $(UTILS_BIN)/fade.o
- $(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS)
-
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch b/x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch
deleted file mode 100644
index 6c3143d758b7..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/hacks/tessellimage.c
-+++ b/hacks/tessellimage.c
-@@ -507,15 +507,15 @@
- out[i].p = (n > 0
- ? (XPoint *) calloc (out[i].npoints + 1, sizeof (*out[i].p))
- : 0);
--//printf("%d: ", i);
-+/*printf("%d: ", i);*/
- for (j = 0; j < out[i].npoints; j++)
- {
- ITRIANGLE *tt = &v[t->tri[j]];
- out[i].p[j].x = (p[tt->p1].x + p[tt->p2].x + p[tt->p3].x) / 3;
- out[i].p[j].y = (p[tt->p1].y + p[tt->p2].y + p[tt->p3].y) / 3;
--//printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y);
-+/*printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y);*/
- }
--//printf("\n");
-+/*printf("\n");*/
- }
-
- free (vert_to_tri);
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch
deleted file mode 100644
index 881869fb4637..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/driver/XScreenSaver.ad.in
-+++ b/driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode: random
- *timeout: 0:10:00
- *cycle: 0:10:00
--*lockTimeout: 0:00:00
-+*lockTimeout: 0:30:00
- *passwdTimeout: 0:00:30
--*dpmsEnabled: False
-+*dpmsEnabled: True
- *dpmsQuickoffEnabled: False
- *dpmsStandby: 2:00:00
- *dpmsSuspend: 2:00:00
- *dpmsOff: 4:00:00
--*grabDesktopImages: True
-+*grabDesktopImages: False
- *grabVideoFrames: False
- *chooseRandomImages: @DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
- *nice: 10
- *memoryLimit: 0
--*lock: False
-+*lock: True
- *verbose: False
- *timestamp: True
- *fade: True
-@@ -63,7 +63,7 @@
- *textLiteral: XScreenSaver
- *textFile: @DEFAULT_TEXT_FILE@
- *textProgram: fortune
--*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
-+*textURL: https://planet.gentoo.org/rss20.xml
-
- *overlayTextForeground: #FFFF00
- *overlayTextBackground: #000000
-@@ -123,7 +123,8 @@
-
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat: %d-%b-%y (%a); %I:%M %p
-+!*dateFormat: %d-%b-%y (%a); %I:%M %p
-+*dateFormat: %x %X
- ! To show the time only:
- ! *dateFormat: %I:%M %p
- ! For 24 hour time:
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch
deleted file mode 100644
index 91ce780aea3a..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/hacks/barcode.c
-+++ a/hacks/barcode.c
-@@ -131,7 +131,6 @@
- "children",
- "chocolate",
- "CLONE",
-- "cock",
- "constriction",
- "contrition",
- "cop",
-@@ -265,7 +264,6 @@
- "punishment",
- "punk rock",
- "punk",
-- "pussy",
- "quagmire",
- "quarantine",
- "quartz",
-@@ -333,8 +331,6 @@
- "vegetarian",
- "venom",
- "verifiability",
-- "viagra",
-- "vibrator",
- "victim",
- "vignette",
- "villainy",
---- a/hacks/glx/glsnake.c
-+++ a/hacks/glx/glsnake.c
-@@ -565,17 +565,17 @@
- ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- ZERO, PIN, ZERO }
- },
-- { "erect penis", /* thanks benno */
-+ { "shuffle board", /* thanks benno */
- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
- ZERO, ZERO }
- },
-- { "flaccid penis",
-+ { "flaccid anchor",
- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- ZERO, ZERO }
- },
-- { "vagina",
-+ { "engagement ring",
- { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- PIN, RIGHT, ZERO }
-@@ -995,7 +995,7 @@
- { "Parrot",
- { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
- },
-- { "Penis",
-+ { "Shuttle",
- { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
- },
- { "PictureComingSoon",
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch
deleted file mode 100644
index a6978a58e681..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/driver/XScreenSaver.ad.in
-+++ b/driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode: random
- *timeout: 0:10:00
- *cycle: 0:10:00
--*lockTimeout: 0:00:00
-+*lockTimeout: 0:30:00
- *passwdTimeout: 0:00:30
--*dpmsEnabled: False
-+*dpmsEnabled: True
- *dpmsQuickoffEnabled: False
- *dpmsStandby: 2:00:00
- *dpmsSuspend: 2:00:00
- *dpmsOff: 4:00:00
--*grabDesktopImages: True
-+*grabDesktopImages: False
- *grabVideoFrames: False
- *chooseRandomImages: @DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
- *nice: 10
- *memoryLimit: 0
--*lock: False
-+*lock: True
- *verbose: False
- *timestamp: True
- *fade: True
-@@ -63,7 +63,7 @@
- *textLiteral: XScreenSaver
- *textFile: @DEFAULT_TEXT_FILE@
- *textProgram: fortune
--*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
-+*textURL: https://planet.gentoo.org/rss20.xml
-
- *overlayTextForeground: #FFFF00
- *overlayTextBackground: #000000
-@@ -124,7 +124,8 @@
-
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat: %d-%b-%y (%a); %I:%M %p
-+!*dateFormat: %d-%b-%y (%a); %I:%M %p
-+*dateFormat: %x %X
- ! For day month date:
- ! *dateFormat: %a %b %d, %I:%M %p
- ! To show the time only:
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch
deleted file mode 100644
index 25ee7a96ec72..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/hacks/barcode.c
-+++ a/hacks/barcode.c
-@@ -118,8 +118,6 @@
- "belly",
- "bliss",
- "bogosity",
-- "boobies",
-- "boobs",
- "booty",
- "bread",
- "bubba",
-@@ -132,7 +130,6 @@
- "children",
- "chocolate",
- "CLONE",
-- "cock",
- "constriction",
- "contrition",
- "cop",
-@@ -266,7 +263,6 @@
- "punishment",
- "punk rock",
- "punk",
-- "pussy",
- "quagmire",
- "quarantine",
- "quartz",
-@@ -334,8 +330,6 @@
- "vegetarian",
- "venom",
- "verifiability",
-- "viagra",
-- "vibrator",
- "victim",
- "vignette",
- "villainy",
---- a/hacks/glx/glsnake.c
-+++ a/hacks/glx/glsnake.c
-@@ -565,17 +565,17 @@
- ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- ZERO, PIN, ZERO }
- },
-- { "erect penis", /* thanks benno */
-+ { "shuffle board", /* thanks benno */
- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
- ZERO, ZERO }
- },
-- { "flaccid penis",
-+ { "flaccid anchor",
- { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- ZERO, ZERO }
- },
-- { "vagina",
-+ { "engagement ring",
- { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- PIN, RIGHT, ZERO }
-@@ -995,7 +995,7 @@
- { "Parrot",
- { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
- },
-- { "Penis",
-+ { "Shuttle",
- { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
- },
- { "PictureComingSoon",