Re: git gui: Tcl version error

2020-01-20 Thread Stuart Cassoff
On 2020-01-19 13:11, Stuart Henderson wrote: ..but the wish interpreter path is set (eventually) based on whatever version ports is telling it to use, so wish8.5. The only way I can see that it would work is if you run "wish8.6 /usr/local/libexec/git/git-gui". Anyway here is the fix, also moves

Re: git gui: Tcl version error

2020-01-19 Thread Laurence Tratt
On Sun, Jan 19, 2020 at 06:11:48PM +, Stuart Henderson wrote: Hello Stuart, > I don't see how it would work at all beforehand, the git-gui script has an > explicit check to make sure that it's using Tcl/Tk 8.6: > > if {[catch {package require Tcl 8.6} err] > || [catch {package require Tk 8

Re: git gui: Tcl version error

2020-01-19 Thread Klemens Nanni
On Sun, Jan 19, 2020 at 06:11:48PM +, Stuart Henderson wrote: > Anyway here is the fix, also moves a file to the correct PLIST and > uses the correct wish interpreter path in git-gui--askpass (it's subst'ed > in git-gui.sh -> git-gui in git-gui/Makefile, but not in git-gui--askpass) Thanks for

Re: git gui: Tcl version error

2020-01-19 Thread Stuart Henderson
On 2020/01/19 14:37, Laurence Tratt wrote: > On a freshly installed OpenBSD -current machine with git-x11-2.25.0, "git > gui" gives me the following error when I try and run it: > > version conflict for package "Tcl": > have 8.5.19, need 8.6 > > whereas on an older machine, even after upgradi

git gui: Tcl version error

2020-01-19 Thread Laurence Tratt
On a freshly installed OpenBSD -current machine with git-x11-2.25.0, "git gui" gives me the following error when I try and run it: version conflict for package "Tcl": have 8.5.19, need 8.6 whereas on an older machine, even after upgrading git-x11-2.24.0 to 2.25.0, "git gui" works correctly.