Bug 207289 - x11/slock: [UPDATE] to 1.3
Summary: x11/slock: [UPDATE] to 1.3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Raphael Kubo da Costa
URL:
Keywords: easy, patch, patch-ready
Depends on:
Blocks:
 
Reported: 2016-02-17 21:30 UTC by Chris Hutchinson
Modified: 2016-02-25 16:44 UTC (History)
2 users (show)

See Also:


Attachments
svn diff for x11/slock (patch) (8.09 KB, patch)
2016-02-17 21:30 UTC, Chris Hutchinson
portmaster: maintainer-approval+
Details | Diff
QA LOG for x11/slock (3.87 KB, text/plain)
2016-02-17 21:31 UTC, Chris Hutchinson
no flags Details
svn diff for x11/slock (8.34 KB, patch)
2016-02-25 02:18 UTC, Chris Hutchinson
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Chris Hutchinson 2016-02-17 21:30:34 UTC
Created attachment 167125 [details]
svn diff for x11/slock (patch)

The attached patch (svn diff) updates x11/slock to version 1.3.

Changes:
break out the 2 patches from files/patch-pam
update the 2 patches to work with the current version
add man/man1/slock.1.gz to pkg-plist
update distinfo
Makefile:
update PORTVERSION
remove PORTREVISION

that's it!

feel free to add me as MAINTAINER, if need be.

Thanks!

--Chris

currently maintained by ports@ -- implicit approval
Comment 1 Chris Hutchinson 2016-02-17 21:31:13 UTC
Created attachment 167126 [details]
QA LOG for x11/slock
Comment 2 Raphael Kubo da Costa freebsd_committer 2016-02-18 11:03:56 UTC
It failed to me on Poudriere (9.3-i386):

slock.c:16:35: error: X11/extensions/Xrandr.h: No such file or directory
In file included from /usr/local/include/X11/Xlib.h:47,
                 from slock.c:18:
/usr/local/include/X11/Xfuncproto.h:160:24: warning: ISO C does not permit named variadic macros
slock.c: In function 'readpw':
slock.c:234: error: 'RRScreenChangeNotify' undeclared (first use in this function)
slock.c:234: error: (Each undeclared identifier is reported only once
slock.c:234: error: for each function it appears in.)
slock.c:235: error: 'XRRScreenChangeNotifyEvent' undeclared (first use in this function)
slock.c:235: error: 'rre' undeclared (first use in this function)
slock.c:235: error: expected expression before ')' token
slock.c: In function 'lockscreen':
slock.c:294: warning: implicit declaration of function 'XRRSelectInput'
slock.c:294: error: 'RRScreenChangeNotifyMask' undeclared (first use in this function)
slock.c: In function 'main':
slock.c:356: warning: implicit declaration of function 'XRRQueryExtension'

It looks like you need to add "xrandr" to USE_XORG.
Comment 3 Raphael Kubo da Costa freebsd_committer 2016-02-18 11:04:16 UTC
Err, I meant "it failed to build for me".
Comment 4 Chris Hutchinson 2016-02-23 15:12:40 UTC
(In reply to Raphael Kubo da Costa from comment #3)
> Err, I meant "it failed to build for me".

Hello, Raphael.
Thank you very much for the feedback. It took me all
day yesterday to get FreeBSD to install on my spare
(and only) i386. I'll do some additional testing
later today, after I finish getting 9-STABLE setup
on that box.

Thanks again.

--Chris
Comment 5 Raphael Kubo da Costa freebsd_committer 2016-02-23 15:20:08 UTC
FWIW, I don't think this is a problem only on 9. I'd expect it to come up with any Poudriere build. It probably worked on your tests because you already had xrandr installed when you build the port.
Comment 6 Chris Hutchinson 2016-02-23 16:13:27 UTC
Indeed. I was quite sure your original assessment was correct.
But I've needed an i386 to reliably test for compatibility,
and this was just the kick in the pants I needed to force
me to make the painful effort to build it. :)

Thanks, Raphael.

--Chris
Comment 7 Chris Hutchinson 2016-02-25 02:18:53 UTC
Created attachment 167375 [details]
svn diff for x11/slock

Adds xrandr to USES

OK no harm seems to come from this addition. So let's try this
version. Shall we? :)

Thanks again!

--Chris
Comment 8 commit-hook freebsd_committer 2016-02-25 10:14:30 UTC
A commit references this bug:

Author: rakuco
Date: Thu Feb 25 10:13:29 UTC 2016
New revision: 409502
URL: https://svnweb.freebsd.org/changeset/ports/409502

Log:
  Update to 1.3.

  PR:		207289
  Submitted by:	Chris Hutchinson <portmaster@bsdforge.com> (maintainer)

Changes:
  head/x11/slock/Makefile
  head/x11/slock/distinfo
  head/x11/slock/files/patch-config.mk
  head/x11/slock/files/patch-pam
  head/x11/slock/files/patch-slock.c
  head/x11/slock/pkg-plist
Comment 9 Raphael Kubo da Costa freebsd_committer 2016-02-25 10:14:54 UTC
It worked fine this time, thanks a lot for the patch!
Comment 10 Chris Hutchinson 2016-02-25 16:44:49 UTC
(In reply to Raphael Kubo da Costa from comment #9)
> It worked fine this time,
Of course it does. :-)
> thanks a lot for the patch!
No. Thank *you* Raphael! :-)

--Chris