On Wed, Feb 05, 2020 at 12:37:56PM +0100, Björn Ketelaars wrote: > Diff below changes our port of git-cola a bit: > - Switch from py-qt4 to py-qt5 > - Switch to python3 > - Drop dependency on textproc/xxdiff. > > Rationale for the latter is that git-cola per default uses git.tool from > .gitconfig. A user can easily pkg_add xxdiff, or one of its > alternatives.
i've tried it and in the parameters, the "diff tool" and "merge tool" still default to xxdiff, so if you have no .gitconfig xxdif should be present :) Not sure removing the RDEP is ok unless you patch that and use a contraption to run xterm -e diff... which might not be worth the trouble. Given that xxdiff can now use Qt5 and works fine, i'd keep the dependency. That said, ok for the xxdiff update & this git-cola move to py3, both work fine here.
