Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 788865

Summary: x11-misc/xscreensaver-6.01 version bump
Product: Gentoo Linux Reporter: José María Fernández González <josemariafg>
Component: Current packagesAssignee: No maintainer - Look at https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers if you want to take care of it <maintainer-needed>
Status: RESOLVED FIXED    
Severity: normal CC: flow, ionen, sam, sping
Priority: Normal Keywords: EBUILD, PATCH
Version: unspecified   
Hardware: All   
OS: Linux   
Whiteboard:
Package list:
Runtime testing required: ---
Attachments: x11-misc/xscreensaver 6.00 ebuild
XScreensaver Interix patch , adapted to 6.00
XScreensaver gentoo branding patch, adapted to 6.00
XScreensaver configure.ac sandbox patch, adapted to 6.00
XScreensaver elogind support patch

Description José María Fernández González 2021-05-08 00:36:43 UTC
Created attachment 706575 [details]
x11-misc/xscreensaver 6.00 ebuild

XScreensaver 6.00 was released past April 1st (see https://www.jwz.org/xscreensaver/changelog.html). I have taken as starting point x11-misc/xscreensaver-5.45 ebuild , and I have adapted several of its patches. Also, XScreensaver 6.00 now contains several fonts, needed by a few of its screensavers.

As XScreensaver acknowledges screensaver Inhibit signals on systemd installations since 5.45 , but it does not support elogind, I have also created a patch to also support this latter.

So, the ebuild depends on some previous patches and the ones I'm including in this bug.
Comment 1 José María Fernández González 2021-05-08 00:37:58 UTC
Created attachment 706578 [details, diff]
XScreensaver Interix patch , adapted to 6.00
Comment 2 José María Fernández González 2021-05-08 00:38:46 UTC
Created attachment 706581 [details, diff]
XScreensaver gentoo branding patch, adapted to 6.00
Comment 3 José María Fernández González 2021-05-08 00:39:29 UTC
Created attachment 706584 [details, diff]
XScreensaver configure.ac sandbox patch, adapted to 6.00
Comment 4 José María Fernández González 2021-05-08 00:40:23 UTC
Created attachment 706587 [details, diff]
XScreensaver elogind support patch
Comment 5 Sebastian Pipping gentoo-dev 2021-06-13 13:58:10 UTC
Hi José,

many thanks for committing to work on this topic and for sharing your work here.  I'm a bit concerned about the elogind support patching, because we already deviate from upstream by more than ideal and this would further increase the gap and the bar for version bumps due to potential need to forward-port things.  Is anything known about how upstream thinks about adding elogind support?

Also, can you help me understand the impact/effect of presence/lack of support for elogind on a non-systemd system?  What does the user gain/lose?  Thanks in advance!

Best



Sebastian
Comment 6 Sebastian Pipping gentoo-dev 2021-06-14 00:38:51 UTC
Quick update:
It turned out that release 6.01 as shipped by upstream already comes with support for elogind.
Comment 7 Larry the Git Cow gentoo-dev 2021-06-14 00:53:22 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a31e4b1f4d63318c13dc98cb9dfa8d5e3e5594

commit 57a31e4b1f4d63318c13dc98cb9dfa8d5e3e5594
Author:     Sebastian Pipping <sping@gentoo.org>
AuthorDate: 2021-06-14 00:42:55 +0000
Commit:     Sebastian Pipping <sping@gentoo.org>
CommitDate: 2021-06-14 00:50:43 +0000

    x11-misc/xscreensaver: 6.01
    
    Thanks to José María Fernández González for his help!
    Closes: https://bugs.gentoo.org/788865
    Signed-off-by: Sebastian Pipping <sping@gentoo.org>
    Package-Manager: Portage-3.0.19, Repoman-3.0.3

 x11-misc/xscreensaver/Manifest                     |   1 +
 .../xscreensaver-6.01-configure.ac-sandbox.patch   | 120 +++++++++++++
 .../files/xscreensaver-6.01-gentoo.patch           |  47 +++++
 .../files/xscreensaver-6.01-interix.patch          |  30 ++++
 x11-misc/xscreensaver/metadata.xml                 |   1 +
 x11-misc/xscreensaver/xscreensaver-6.01.ebuild     | 198 +++++++++++++++++++++
 6 files changed, 397 insertions(+)
Comment 8 José María Fernández González 2021-06-14 12:06:07 UTC
Hi, Sebastian,
    browsers like firefox, and other software, send the inhibit signal to systemd / elogind when it is playing media content in full screen (a video, for instance), and the uninhibition when it is not (for instance, a paused video). systemd / elogind dispatches the signals to the registered listeners. As XScreensaver was already capable to act as a systemd listener for these signals, the patch were the minimal changes to also be capable to do the same in a elogind installation.

(In reply to Sebastian Pipping from comment #5)
> Hi José,
> 
> many thanks for committing to work on this topic and for sharing your work
> here.  I'm a bit concerned about the elogind support patching, because we
> already deviate from upstream by more than ideal and this would further
> increase the gap and the bar for version bumps due to potential need to
> forward-port things.  Is anything known about how upstream thinks about
> adding elogind support?
> 
> Also, can you help me understand the impact/effect of presence/lack of
> support for elogind on a non-systemd system?  What does the user gain/lose? 
> Thanks in advance!
> 
> Best
> 
> 
> 
> Sebastian
Comment 9 José María Fernández González 2021-06-14 12:10:28 UTC
The same day I opened this issue, I also wrote Jamie Zawinski (the developer of XScreensaver) in order to send him the patches. He replied to the e-mail thanking the patches, and it seems he integrated them upstream.

(In reply to Sebastian Pipping from comment #6)
> Quick update:
> It turned out that release 6.01 as shipped by upstream already comes with
> support for elogind.
Comment 10 Sebastian Pipping gentoo-dev 2021-06-14 13:03:14 UTC
Well done, and thanks for the explanation!