Bug 201414
| Summary: | [patch] x11-fm/pcmanfm: fix NLS option, sort USES | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Andriy Voskoboinyk <avos> | ||||||||||||||||||
| Component: | Individual Port(s) | Assignee: | Philip M. Gollucci <pgollucci> | ||||||||||||||||||
| Status: | Closed FIXED | ||||||||||||||||||||
| Severity: | Affects Only Me | CC: | horia, koobs | ||||||||||||||||||
| Priority: | --- | Keywords: | needs-patch, patch | ||||||||||||||||||
| Version: | Latest | Flags: | bugzilla:
maintainer-feedback?
(horia) |
||||||||||||||||||
| Hardware: | Any | ||||||||||||||||||||
| OS: | Any | ||||||||||||||||||||
| Attachments: |
|
||||||||||||||||||||
Created attachment 158517 [details]
portlint.log
Created attachment 158518 [details]
poudriere-9.3-i386.log
USES=gettext-tools can/should be made conditional using an options helper as well: NLS_USES=gettext-tools (In reply to Kubilay Kocak from comment #3) Not with intltool - they are will be checked/used even when NLS is disabled. Also, gettext-runtime (libintl.so) seems to be used anyway (via glib/gi18n.h?). Created attachment 158540 [details]
Patch2.diff
- Add gettext-runtime into USES.
- Regenerate patch.
Created attachment 158541 [details]
portlint.log
Created attachment 158543 [details]
poudriere-9.3-i386-no-nls.log
Created attachment 158563 [details] pcmanfm.diff Andriy, you are right. In this case, autoreconf sets NLS on and intltool runs anyway. As koobs@ mentioned in comment 3 and the portlint warning, gettext should be made conditional using an options helper. Also, there is no need to add FLAGS here. Please take a look at this patch. I will run more tests later. (In reply to Horia Racoviceanu from comment #8) > As koobs@ mentioned in comment 3 and the portlint warning, gettext should be > made conditional using an options helper. gettext(-runtime) cannot be used conditionally, since devel/glib20 uses it. For example > fm_show_error(NULL, NULL, _("Desktop manager is not active.")); will be converted into > fm_show_error(NULL, NULL, libintl_gettext("Desktop manager is not active.")); > Also, there is no need to add FLAGS here. They're required for correct libintl.h detection: > checking libintl.h usability... no > checking libintl.h presence... no > checking for libintl.h... no Created attachment 158573 [details]
pcmanfm.diff
I accept this patch, with small modifications.
Thank you.
- Bump PORTREVISION
- Add gettext-runtime into USES
- Sort USES
- Fix NLS option
- Regenerate patch
# portlint -AC
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: Makefile: new ports should not set PORTREVISION.
0 fatal errors and 2 warnings found.
Take. A commit references this bug: Author: pgollucci Date: Wed Jul 15 20:59:09 UTC 2015 New revision: 392223 URL: https://svnweb.freebsd.org/changeset/ports/392223 Log: x11-fm/pcmanfm: cleanup - Bump PORTREVISION - Add gettext-runtime into USES - Sort USES - Fix NLS option - Regenerate patch PR: 201414 Submitted by: s3erios@gmail.com and maintainer Approved by: horia@racoviceanu.com (maintainer) Changes: head/x11-fm/pcmanfm/Makefile head/x11-fm/pcmanfm/files/patch-src__Makefile.am |
Created attachment 158516 [details] Makefile.diff