Page MenuHomeFreeBSD

x11/xlockmore: various fixes
Needs ReviewPublic

Authored by jrm on Fri, Sep 6, 8:05 PM.

Details

Reviewers
jgh
Summary
  • Fix build with GTK2 and KERBEROS5 options on [submitted by jcfyecrayz@liamekaens.com]
  • Turn the MB option on by default. It was never disable before the switch to option helpers and fonts looks bad without it.

*Note*, even when supplying --disable-setuid to configure, xlock and
play.sh are installed with setuid bits on. This seems to be required/intentional based on pkg-plist and run-time tests.

Test Plan

portlint and poudriere testport are happy

Diff Detail

Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 26577
Build 24963: arc lint + arc unit

Event Timeline

jrm created this revision.Fri, Sep 6, 8:05 PM
jgh added a subscriber: jgh.EditedWed, Sep 11, 1:53 AM

I can take a look at this more later this week/weekend, but I did look at the previous revision, and MB was not enabled. I thought you had mentioned not making XINERAMA default. Do you still feel this way? I also sent a message to upstream regarding setuid note.

> make -V CONFIGURE_ARGS
--without-motif --without-ttf --without-editres  --without-dtsaver --without-rplay --without-nas  --without-gtk --without-esound --disable-setuid --without-mesa --without-opengl --without-ftgl --without-gtk2 --disable-bomb --without-magick --with-xinerama --x-libraries=/usr/local/lib --x-includes=/usr/local/include --prefix=/usr/local ${_LATE_CONFIGURE_ARGS}
> make -V PKGNAME
xlockmore-5.58
jrm added a comment.EditedWed, Sep 11, 2:01 AM

I made those comments before I was completely clear on what was going on. MB was never really disable before the switch to option helpers. The fonts look like terminal fonts without it, so I think most users would prefer it on. That's why my fonts changed after this latest update even though I had never explicitly turned on the MB knob. It's a similar situation with the Xinerama knob. It wasn't being disabled before and that's why I thought that the login screen was suddenly not being displayed on the primary display after the latest update. Later I realized what was really going on. The login screen was expanded over all displays without Xinerama on.

jrm updated this revision to Diff 62292.EditedThu, Sep 19, 2:16 AM

Re-add GTK2 and KERBEROS5 options based on https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=240526

jrm retitled this revision from x11/xlockmore: Remove options that break build; other fixes to x11/xlockmore: various fixes.Thu, Sep 19, 2:17 AM
jrm edited the summary of this revision. (Show Details)
jrm edited reviewers, added: jgh; removed: jhb.
jrm removed a subscriber: jgh.
jrm edited the summary of this revision. (Show Details)Thu, Sep 19, 2:20 AM
jrm updated this revision to Diff 62323.Thu, Sep 19, 7:45 PM
  • Add radio options for different Kerberos5 implementations. Only MIT and NONE are currently building.
  • Remove --disable-setuid from CONFIGURE_ARGS because both xlock and play.sh are installed with setuid bits on.