x11/xscreensaver: Update to 6.05
ClosedPublic
Actions

Authored by zirias on Nov 22 2022, 4:24 PM.

Details

Reviewers

tcberner
cy
manu

Group Reviewers

x11

Commits

R11:163c60305063: x11/xscreensaver: Update to 6.05

Summary

Changelog:

X11: Cope with dumb DPMS settings that existed pre-startup.
X11: Silence new Perl warnings from xscreensaver-getimage-file.
X11: Fix sonar pthreads crash on recent Pi systems.
X11: Removed dependence on gdk-pixbuf-xlib-2.0.
X11: GTK 3 is now required.

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 48450
Build 45336: arc lint + arc unit

Event Timeline

zirias created this revision.Nov 22 2022, 4:24 PM

Herald added a subscriber: mat. · View Herald TranscriptNov 22 2022, 4:24 PM

zirias requested review of this revision.Nov 22 2022, 4:24 PM

Harbormaster completed remote builds in B48449: Diff 113408.Nov 22 2022, 4:25 PM

Remarks:

Upstream distfile contains a .1 version suffix, but only the file itself, it doesn't appear in WRKSRC etc, so can't be handled with DISTVERSIONSUFFIX
Dependencies changed, the settings binary now uses gtk3 instead of gtk2
Extra patch of configure.ac is needed because DATADIR for some files is derived from pkg-config of gtk2, which isn't installed in a clean jail any more after the dependency change

Tested:

poudriere testport with default options on 12.3-i386, 13.1-amd64, 14-{i386,amd64,aarch64}
poudriere testport on 14-amd64 with all options off and all options on
correct operation (blanking, (un)locking, settings) on 13.1-amd64

Actually remove the gdk-pixbuf-xlib dependency.

Test builds on 14-amd64 repeated to make sure nothing breaks. Also notified jwz on twitter about the glitch in configure.ac.

Harbormaster completed remote builds in B48450: Diff 113409.Nov 22 2022, 4:51 PM

lgtm

This revision is now accepted and ready to land.Nov 22 2022, 6:32 PM

lgtm

In D37461#851794, @cy wrote:

thanks, may I take this as maintainer (x11) approval?

manu added a subscriber: manu.Nov 24 2022, 11:23 AM

manu added inline comments.

x11/xscreensaver/files/patch-configure.ac
8	That probably should be upstreamed if it only needs gtk3 now.
x11/xscreensaver/files/patch-hacks__config__sonar.xml
2	Where does this file comes from ?

In D37461#852408, @zirias wrote:

In D37461#851794, @cy wrote:

thanks, may I take this as maintainer (x11) approval?

No.

zirias marked 2 inline comments as done.Nov 24 2022, 11:33 AM

zirias added inline comments.

x11/xscreensaver/files/patch-configure.ac
8	Yes it should, as I said, I contacted jwz on twitter ... didn't get a reaction yet, so might try email later!
x11/xscreensaver/files/patch-hacks__config__sonar.xml
2	It was there before, I just resolved the conflicts. As far as I can see, all it does is replace linux.com with freebsd.com in the list of hosts to be pinged, and add a hint in the description about using the SUID option in order to make pings work....

zirias marked 2 inline comments as done.Nov 24 2022, 11:34 AM

zirias added inline comments.

x11/xscreensaver/files/patch-hacks__config__sonar.xml
2	.org of course ...

manu added inline comments.Nov 24 2022, 11:41 AM

x11/xscreensaver/files/patch-configure.ac
8	That's what the bug page recommend to do.
x11/xscreensaver/files/patch-hacks__config__sonar.xml
2	I would be inclined to say that we should just drop this patch.

zirias marked 2 inline comments as done.Nov 24 2022, 12:14 PM

zirias added inline comments.

x11/xscreensaver/files/patch-configure.ac
8	He did react on twitter previously, but of course I'll make sure he learns about the glitch.
x11/xscreensaver/files/patch-hacks__config__sonar.xml
2	Hm. I just double-checked. The list of hosts to ping is just branding, unfortunately not user-configurable, but still unnecessary. The hint about the port option, well, this "hack" already displays a message that it needs to be suid-root to actually ping, so users should easily figure what to do. All in all, I tend to agree here, patch be gone...