Page MenuHomeFreeBSD

x11/xscreensaver: Update to 6.05
ClosedPublic

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

Details

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
R11 FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

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.

cy added a subscriber: cy.

lgtm

This revision is now accepted and ready to land.Tue, Nov 22, 6:32 PM
In D37461#851794, @cy wrote:

lgtm

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

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
0

Where does this file comes from ?

In D37461#851794, @cy wrote:

lgtm

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

No.

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
0

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 added inline comments.
x11/xscreensaver/files/patch-hacks__config__sonar.xml
0

.org of course ...

x11/xscreensaver/files/patch-configure.ac
8

That's what the bug page recommend to do.

x11/xscreensaver/files/patch-hacks__config__sonar.xml
0

I would be inclined to say that we should just drop this patch.

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
0

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...

zirias marked 2 inline comments as done.

Remove questionable sonar patch.

This revision now requires review to proceed.Thu, Nov 24, 12:16 PM
This revision is now accepted and ready to land.Thu, Nov 24, 12:41 PM
This revision was automatically updated to reflect the committed changes.