From: Mark Levedahl <mlevedahl@gmail.com>
Date: Sat, 17 May 2025 02:25:17 +0000 (-0400)
Subject: git-gui: Make TclTk 8.6 the minimum, allow 8.7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed73388f538d681e1da5c9be9d02b7f17a5e4e57;p=thirdparty%2Fgit.git

git-gui: Make TclTk 8.6 the minimum, allow 8.7

git-gui requires that Tcl and Tk are 8.5, though the check using
'package require' allows 8.6. As git-gui runs under wish, both Tcl and
Tk are always available and of the same version, so only one need be
checked.

The 8.5 requirement is very outdated as the earliest Tcl currently
shipping on any supported OS is 8.6. 8.7 is in alpha test and is
generally compatible with 8.6, so should also be allowed.  Tcl 9.0 has
planned compatibility breaking changes so cannot be allowed.

Let's update the requirements to be 8.6 or 8.7, and check only on Tcl as
Tk will be the same version.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---

diff --git a/git-gui.sh b/git-gui.sh
index c77c05edde..fc224e0a34 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -30,9 +30,7 @@ along with this program; if not, see <https://www.gnu.org/licenses/>.}]
 ##
 ## Tcl/Tk sanity check
 
-if {[catch {package require Tcl 8.5} err]
- || [catch {package require Tk  8.5} err]
-} {
+if {[catch {package require Tcl 8.6-8.8} err]} {
 	catch {wm withdraw .}
 	tk_messageBox \
 		-icon error \