From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 48648138350 for ; Sun, 22 Mar 2020 07:33:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96259E0A02; Sun, 22 Mar 2020 07:33:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6BB0E0A02 for ; Sun, 22 Mar 2020 07:33:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 774FE34F41B for ; Sun, 22 Mar 2020 07:33:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A12CB18E for ; Sun, 22 Mar 2020 07:33:18 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1584862392.efa9f2b010f21e54d07e9e6070ee94253038b41c.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch x11-misc/xscreensaver/files/xscreensaver-5.44-offensive.patch x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild X-VCS-Directories: x11-misc/xscreensaver/files/ x11-misc/xscreensaver/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: efa9f2b010f21e54d07e9e6070ee94253038b41c X-VCS-Branch: master Date: Sun, 22 Mar 2020 07:33:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bd5bc97e-fa42-42c9-b2d5-5427e3e173fd X-Archives-Hash: 24995dbddbc9b7c55decb88a3d520d2f commit: efa9f2b010f21e54d07e9e6070ee94253038b41c Author: Jeroen Roovers gentoo org> AuthorDate: Sun Mar 22 07:32:44 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Mar 22 07:33:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa9f2b0 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 gentoo.org> .../xscreensaver-5.44-blurb-hndl-test-passwd.patch | 10 ++++ .../files/xscreensaver-5.44-gentoo.patch | 47 +++++++++++++++ .../files/xscreensaver-5.44-offensive.patch | 68 ++++++++++++++++++++++ x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild | 6 +- 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 00000000000..cf95cf105b0 --- /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 00000000000..279a19cf638 --- /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 00000000000..4b2d6189b1e --- /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 67ed4a11730..0bb17e073d4 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