x11-misc/xscreensaver: Update patches

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Closes: https://bugs.gentoo.org/713788
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

4 files changed, 128 insertions, 3 deletions

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
new file mode 100644
index 000000000000..cf95cf105b01
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
@@ -0,0 +1,10 @@
+--- a/driver/test-passwd.c
++++ b/driver/test-passwd.c
+@@ -69,6 +69,7 @@
+ char *timestring (time_t when) { return ""; }
+ 
+ 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.44-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
new file mode 100644
index 000000000000..279a19cf6386
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
@@ -0,0 +1,47 @@
+--- 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
+ 
+ ! When a saver writes an error message to stdout/stderr, it can be printed
+ ! on the screen.
+@@ -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.44-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch
new file mode 100644
index 000000000000..4b2d6189b1e2
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch
@@ -0,0 +1,68 @@
+--- a/hacks/barcode.c
++++ b/hacks/barcode.c
+@@ -121,8 +121,6 @@
+   "belly",
+   "bliss",
+   "bogosity",
+-  "boobies",
+-  "boobs",
+   "booty",
+   "bread",
+   "brogrammers",
+@@ -137,7 +135,6 @@
+   "chocolate",
+   "chupacabra",
+   "CLONE",
+-  "cock",
+   "congress",
+   "constriction",
+   "contrition",
+@@ -280,7 +277,6 @@
+   "punishment",
+   "punk rock",
+   "punk",
+-  "pussy",
+   "quagmire",
+   "quarantine",
+   "quartz",
+@@ -355,8 +351,6 @@
+   "venom",
+   "verifiability",
+   "very fine people",
+-  "viagra",
+-  "vibrator",
+   "victim",
+   "vignette",
+   "villainy",
+--- a/hacks/glx/glsnake.c
++++ b/hacks/glx/glsnake.c
+@@ -569,17 +569,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 }
+@@ -999,7 +999,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/xscreensaver-5.44-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
index 67ed4a117306..0bb17e073d4a 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild
@@ -65,9 +65,9 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.05-interix.patch
-	"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
 	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-5.43-gentoo.patch
+	"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
+	"${FILESDIR}"/${PN}-5.44-gentoo.patch
 )
 
 src_prepare() {
@@ -83,7 +83,7 @@ src_prepare() {
 
 	default
 
-	use offensive || eapply "${FILESDIR}"/${PN}-5.43-offensive.patch
+	use offensive || eapply "${FILESDIR}"/${PN}-5.44-offensive.patch
 
 	eapply_user