Bug 257664
| Summary: | [NEW PORT] x11/i3lock-color: improved i3lock | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Fadel <fjachuf> | ||||||||||||
| Component: | Individual Port(s) | Assignee: | Rainer Hurling <rhurlin> | ||||||||||||
| Status: | Closed FIXED | ||||||||||||||
| Severity: | Affects Only Me | CC: | lwhsu, rhurlin | ||||||||||||
| Priority: | --- | ||||||||||||||
| Version: | Latest | ||||||||||||||
| Hardware: | Any | ||||||||||||||
| OS: | Any | ||||||||||||||
| URL: | https://github.com/Raymo111/i3lock-color | ||||||||||||||
| Attachments: |
|
||||||||||||||
Created attachment 227008 [details]
Fix Conflicts Install
Created attachment 227024 [details]
patch with refinements
Hi Fadel,
Thanks for the patch and the new port. I tried it on CURRENT and it seems to work quite nice.
Attached you will find an updated patch, with some smaller and some bigger changes:
- Add 'SUBDIR += i3lock-color' to x11/Makefile (for the NEW port!)
- BUILD_DEPENDS=${LOCALBASE}/bin/autoreconf:devel/autoconf not needed
- Reorderd LIB_DEPENDS= (alphabetical)
- Reorderd USES= (alphabetical)
- Add USE_XORG=xinerama xrandr and delete them from LIB_DEPENDS=
- Removed GH_PROJECT= and GH_TAGNAME=, not necessary because of PORTNAME and DISTVERSION
- Reorderd some Makefile vars, like wanted by portclippy (from portfmt)
*** Most probably it is also needed to add 'CONFLICTS_INSTALL=i3lock-color-[0-9]*' to x11/i3lock!
Could you please check this for x11/i3lock and test the newest patch and report back? If the port is ok now, it seems to be ready to commit ;)
Best wishes,
Rainer
(In reply to Rainer Hurling from comment #2) I tried the modifications that he made, and they are excellent, I also added to x11/i3lock "CONFLICTS_INSTALL=i3lock-color-[0-9]*" and when testing it, everything works excellent A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=253114334fe1638401337028521b271ee952e973 commit 253114334fe1638401337028521b271ee952e973 Author: Fadel <fjachuf@gmail.com> AuthorDate: 2021-08-09 05:06:59 +0000 Commit: Rainer Hurling <rhurlin@FreeBSD.org> CommitDate: 2021-08-09 05:12:49 +0000 x11/i3lock-color: Add new port: Improved i3lock version A modern version of i3lock with color functionality and other features. https://github.com/Raymo111/i3lock-color PR: 257664 x11/Makefile | 1 + x11/i3lock-color/Makefile (new) | 50 ++++++++++++++++++++++++++++++++++++++++ x11/i3lock-color/distinfo (new) | 3 +++ x11/i3lock-color/pkg-descr (new) | 3 +++ x11/i3lock/Makefile | 3 +++ 5 files changed, 60 insertions(+) Committed, thanks! Have fun with your new port ;) It looks this suppresses https://reviews.freebsd.org/D22941 ? Maybe it's worth to check if there is anything could be merged. (In reply to Li-Wen Hsu from comment #6) Many thanks for the hint. I wasn't aware of it. I will try to contact Jacob, the author of the mentioned review. (In reply to Rainer Hurling from comment #7) I should add the following lines that Jacob suggested to me: post-install-DOCS-on: $ {MKDIR} $ {STAGEDIR} $ {DOCSDIR} $ {INSTALL_DATA} $ {DOC_FILES: S | ^ | $ {WRKSRC} / |} $ {STAGEDIR} $ {DOCSDIR} Created attachment 227087 [details]
Jacob lines added
Created attachment 227132 [details]
diff against the existing version
Hi Fadel,
I think it is a good idea to add the doc files, thanks.
While here, other suggestions from the review are also interesting:
1) USES=gnome and USE_GNOME=cairo makes LIB_DEPENDS=libcairo.so:graphics/cairo obsolete
2) USES=jpeg makes LIB_DEPENDS=libjpeg.so:graphics/jpeg-turbo obsolete
3) Adding Jacob as the original author in pkg-descr is not common practice. Better is to add him in the first line of the Makefile. Have you asked him if he agrees to be added?
Instead of adding a full patch of the entire port, changes to an existing port usually only require a diff of the changes. It is much easier for a reviewer and/or a committer to assess the diff. That's why I only put a diff in my attachment.
If you agree with my changes they should be ready for a commit. So please give a short feedback ;)
BTW: To keep it clearer, I have hidden attachments that are no longer needed. They are still accessible via the links in the comments.
It's all good, you can proceed to commit :) A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=267a02d98d97b45e2edb95435a95c4970b4f3675 commit 267a02d98d97b45e2edb95435a95c4970b4f3675 Author: Rainer Hurling <rhurlin@FreeBSD.org> AuthorDate: 2021-08-12 18:47:36 +0000 Commit: Rainer Hurling <rhurlin@FreeBSD.org> CommitDate: 2021-08-12 18:55:44 +0000 x11/i3lock-color: Add DOCS option, move some deps in USES The changes came mostly from an already abandoned review[1]. [1] https://reviews.freebsd.org/D22941 PR: 257664 x11/i3lock-color/Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) |
Created attachment 226998 [details] i3lock-color 2.13.c.4 An improved version of i3lock, with more capabilities