Created attachment 239845 [details] Patch to update port to 0.3.0 Version 0.3.0 of x11-wm/pekwm was released a few days ago. It includes optional support of fonts with PangoCairo and PangoXFT, which drags in many dependencies, so I thought I'd add an option to the port, for people who prefer more minimalism for this WM. It's my first attempt at making an option, but my poudriere doesn't complain with any value. Please let me know if there is anything I should do differently in the future.
^Triage: [tags] in issue Titles are deprecated. ^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field. ^Triage: Please set the maintainer-approval attachment flag (to +) on patches for ports you maintain to signify approval. -- Attachment -> Details -> maintainer-approval [+] ^Triage: Maintainer-feedback flag (+) not required unless requested (?) first. Q/A: You can use PANGO_LIB_DEPENDS and take that out of the if block. Similarly for the USES clause. Would you have a look? See: https://docs.freebsd.org/en/books/porters-handbook/book/#makefile-options-auto-activation Thanks!
Created attachment 239879 [details] Second version of 0.3.0 update patch
Thanks a lot for the review! Here is a modified patch in which I tried to go better. I gather from your comment and my trying PANGO_USE_GNOME that I still need a `.if ${PORT_OPTIONS:MPANGO}`, is that right?
(In reply to Natacha Porté from comment #3) Yes, that's right. Thanks!
Committed, Thanks!
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=a179d5fb0a945424cc4a2ab78ef64f611c66c525 commit a179d5fb0a945424cc4a2ab78ef64f611c66c525 Author: Natacha Porté <natbsd@instinctive.eu> AuthorDate: 2023-02-03 15:39:25 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2023-02-04 18:46:39 +0000 x11-wm/pekwm: update to 0.3.0 ChangeLog: https://github.com/pekwm/pekwm/releases/tag/release-0.3.0 * Pango font support (both Cairo and Xft) * Automatic font type selection * Various updated and improvements to pekwm_panel including a systray widget * Xresources can be used in themes and configuration files as variables. * New default theme named Winter PR: 269281 Reported by: natbsd@instinctive.eu (maintainer) x11-wm/pekwm/Makefile | 23 +++++++++++++++++++-- x11-wm/pekwm/distinfo | 6 +++--- .../pekwm/files/patch-doc__CMakeLists.txt (gone) | 8 -------- .../files/patch-src__CfgParserSource.cc (new) | 11 ++++++++++ x11-wm/pekwm/pkg-plist | 24 ++++++++++++++++++++++ 5 files changed, 59 insertions(+), 13 deletions(-)
(In reply to Natacha Porté from comment #3) > I gather from your comment and my trying PANGO_USE_GNOME that I > still need a `.if ${PORT_OPTIONS:MPANGO}`, is that right? No but the syntax is slightly different. See ports ff427f8d8539 or https://docs.freebsd.org/en/books/porters-handbook/makefiles/#options-use e.g., diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile index 57f91d340b86..c3ed7b462651 100644 --- a/x11-wm/pekwm/Makefile +++ b/x11-wm/pekwm/Makefile @@ -33,12 +33,7 @@ PANGO_LIB_DEPENDS= libpangocairo-1.0.so:x11-toolkits/pango \ libfontconfig.so:x11-fonts/fontconfig \ libharfbuzz.so:print/harfbuzz PANGO_USES= gnome gettext-runtime +PANGO_USE= GNOME=cairo,glib20 PANGO_CMAKE_BOOL=ENABLE_PANGO -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MPANGO} -USE_GNOME= glib20 cairo -.endif - .include <bsd.port.mk>