revive port after r495962 qt4 deprecation
- Tobias this needs a Qt person reviewing I have no idea what I am doing
- I assume Jonathan is ok with taking maintainership as port was deleted
- still needs symlinks tidied up from stage-qa check
Details
Details
poudriere 13.0-CURRENT amd64 ok, would be great if others can
check this
Diff Detail
Diff Detail
- Repository
- rP FreeBSD ports repository
- Lint
Lint Not Applicable - Unit
Tests Not Applicable
Event Timeline
Comment Actions
- remove NLS option as the port has no build/config toggle
- clean up dependencies & appease portlint
- poudriere validation is on its way
| MOVED | ||
|---|---|---|
| 11685 ↗ | (On Diff #58036) | thanks, I assume I can only do that at commit time, not during phab diff creation? |
Comment Actions
I will test 11/12 i386/amd64 as soon as our build box becomes available, which will hopefully be tomorrow morning (local time).
| MOVED | ||
|---|---|---|
| 11685 ↗ | (On Diff #58036) | This is one of the few things you cannot do with git svn. :-( |
Comment Actions
Very happy to see this port getting updated for Qt5! And yes, entirely happy to relinquish maintainership... I only know enough about the ports tree to be dangerous. :)
When I build this port I see the following Q/A warning:
====> Running Q/A tests (stage-qa) Warning: Bad symlink '/usr/local/share/icons/hicolor/scalable/apps/git-cola.svg' pointing to an absolute pathname '/usr/local/share/git-cola/icons/git-cola.svg'
Comment Actions
| devel/git-cola/Makefile | ||
|---|---|---|
| 28 ↗ | (On Diff #58429) | Coming back to NLS & the gettext dependency:
There are a number of KDS ports that do this, so I assume its not As the port itself *can't* be built without the NLS libraries, I |
| 30 ↗ | (On Diff #58036) | can you clarify? The app doesn't provide any build or compile-tyime flags to disable translations, is there something else I can/should do here? |
| devel/git-cola/pkg-plist | ||
| 202–217 ↗ | (On Diff #58429) | TBH I am not sure, I am not familiar with NLS. There is no compile-time switches to disable creating these, so they're always generated. |
Comment Actions
If I build in poudriere, I see pkg-plist errors related to the language files.
===> Checking for items in pkg-plist which are not in STAGEDIR Error: Missing: share/locale/cs/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/de/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/es/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/fr/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/hu/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/id_ID/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/it/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/ja/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/pl/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/pt_BR/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/ru/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/sv/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/tr_TR/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/uk/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/zh_CN/LC_MESSAGES/git-cola.mo Error: Missing: share/locale/zh_TW/LC_MESSAGES/git-cola.mo ===> Error: Plist issues found.
If I add an NLS knob, NLS_USES makes sense (OPT_USES implies OPT exists) and everything works for me if I guard those files in pkg-plist with %%NLS%%. What @tcberner says makes sense though, i.e., in a unclean environment with gettext already installed, I would expect those translation files to be unconditionally installed and a pkg-plist error would result. To confirm this I temporarily added USES+=gettext, so that gettext is always installed and turned the NLS knob off and everything installed fine. I don't have time at the moment to dig into why this is the case, but maybe you can confirm that it makes sense (and I am not doing something stupid) given the application does not have any build or compile-time flags to disable the translations.
I'm running poudriere testport for 11/12 i386/amd64 with these changes now.
Comment Actions
Here are the changes I made against above. There is probably a better way to share this diff, but I'm short on time.
jrm@storage2 /usr/ports [arcpatch-D20460|✚2] % git diff diff --git a/devel/git-cola/Makefile b/devel/git-cola/Makefile index d6e43b5ce3e5..cf90b7737503 100644 --- a/devel/git-cola/Makefile +++ b/devel/git-cola/Makefile @@ -25,8 +25,7 @@ NO_ARCH= yes # NO_VENDOR_LIBS ensures we use ports QtPy not embedded version MAKE_ARGS= prefix=${PREFIX} PYTHON=${PYTHON_CMD} NO_VENDOR_LIBS=1 -OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT= DOCS +OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext diff --git a/devel/git-cola/pkg-plist b/devel/git-cola/pkg-plist index e338f4a91e30..92051b9ce4c7 100644 --- a/devel/git-cola/pkg-plist +++ b/devel/git-cola/pkg-plist @@ -199,22 +199,22 @@ share/icons/hicolor/scalable/apps/git-cola.svg %%DATADIR%%/lib/cola/widgets/text.py %%DATADIR%%/lib/cola/widgets/toolbar.py %%DATADIR%%/lib/cola/widgets/toolbarcmds.py -share/locale/cs/LC_MESSAGES/git-cola.mo -share/locale/de/LC_MESSAGES/git-cola.mo -share/locale/es/LC_MESSAGES/git-cola.mo -share/locale/fr/LC_MESSAGES/git-cola.mo -share/locale/hu/LC_MESSAGES/git-cola.mo -share/locale/id_ID/LC_MESSAGES/git-cola.mo -share/locale/it/LC_MESSAGES/git-cola.mo -share/locale/ja/LC_MESSAGES/git-cola.mo -share/locale/pl/LC_MESSAGES/git-cola.mo -share/locale/pt_BR/LC_MESSAGES/git-cola.mo -share/locale/ru/LC_MESSAGES/git-cola.mo -share/locale/sv/LC_MESSAGES/git-cola.mo -share/locale/tr_TR/LC_MESSAGES/git-cola.mo -share/locale/uk/LC_MESSAGES/git-cola.mo -share/locale/zh_CN/LC_MESSAGES/git-cola.mo -share/locale/zh_TW/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/cs/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/de/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/es/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/fr/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/hu/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/id_ID/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/it/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/ja/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/pl/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/ru/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/sv/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/tr_TR/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/uk/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/git-cola.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/git-cola.mo %%PORTDOCS%%%%DOCSDIR%%/git-cola.rst %%PORTDOCS%%%%DOCSDIR%%/git-dag.rst %%PORTDOCS%%%%DOCSDIR%%/hotkeys.html
Comment Actions
I should clarify. Everything looks except the message about the bad symlink that Jonathan already mentioned.
Comment Actions
@jrm I think this is ready to land now, I'm far enough afk not to be able to commit it, would you mind doing the honours? I can't do svn mv from where I am going.
Comment Actions
devel/git-cola: Update to v3.4; Add NLS knob; patch link creation
@dch: Are you OK with these proposed changes?
Comment Actions
Add pkg-message to let users know that git-cola wants devel/git to be built with the GUI option on
Comment Actions
dch@, since you are away, I think I will pull the trigger on this. I'm fairly comfortable that the latest changes are improvements. Let's get this out to users and if you have changes you want to make, you can always make them when you return.
One thing that is not quite ideal for users is that git-cola makes use of gitk, which is only installed with the git package when it's built with the GUI option on which is not the default. For now, I have just added a pkg-message to make users aware. git-cola seems to work well without gitk, but there are a few features missing.