Re: [PATCH 0/5] git-gui: workaround deprecation of Tcl/TK 8.5 in macOS

From: Johannes Sixt <j6t@kdbg.org>
Date: Jul 30, 2025, 19:09 UTC
Message-ID: <74891c16-8850-4148-ba15-d5b3e5571bcb@kdbg.org>
In-Reply-To: <20250730164052.15371-1-carenas@gmail.com>

Am 30.07.25 um 18:40 schrieb Carlo Marcelo Arenas Belón:

Show 7 quoted lines

> This series, add improvements to allow running `git-gui` in macOS, which is
> stuck in an ancient version of Tcl/TK that is no longer supported by git.
> 
> Patches 1 and 2 are minor fixes that could also apply to maint, but the main
> change is in Patch 3, which removes the long obsoleted "Git Gui" app that was
> tied to the system provided Tcl/TK framework and that has been broken for a
> while.

This sounds like the lifted requirement of Tcl 8.6 isn't the cause why this part is broken. But the commit message of patch 3 says it is. Which one is it?

Show 5 quoted lines

> 
> Patches 4 and 5 are needed to avoid the system framework and facilitate using
> a third party provided package of Tcl/TK 8.6 instead, but the last patch also
> protects against a conflict with the Xcode provided git that for some reason
> includes a copy pf `git-gui--askpass` even if `git-gui` is missing.

Patch 5, I fear, needs a different approach as it breaks RUNTIME_PREFIX builds. I say that after having looked at the patch; I haven't test it.

Any help would be appreciated on the Meson parts and whether the updated git-gui--askpass build still works. I don't use either of them.

Show 32 quoted lines

> 
> Carlo Marcelo Arenas Belón (5):
>   git-gui: remove uname_O in Makefile
>   git-gui: fix dependency of GITGUI_MAIN on generator
>   git-gui: retire Git Gui.app
>   git-gui: honor TCLTK_PATH in git-gui--askpass
>   git-gui: ensure own version of git-gui--askpass is used
> 
>  .gitignore                              |   2 +-
>  GIT-GUI-BUILD-OPTIONS.in                |   1 -
>  Makefile                                |  63 +++----------------
>  generate-git-gui.sh                     |   1 +
>  generate-macos-app.sh                   |  30 ---------
>  generate-macos-wrapper.sh               |  35 -----------
>  generate-script.sh                      |  22 +++++++
>  git-gui--askpass => git-gui--askpass.sh |   0
>  git-gui.sh                              |  10 ++-
>  lib/about.tcl                           |   4 +-
>  macosx/AppMain.tcl                      |  29 ---------
>  macosx/Info.plist                       |  30 ---------
>  macosx/git-gui.icns                     | Bin 28866 -> 0 bytes
>  meson.build                             |  79 +++++-------------------
>  14 files changed, 56 insertions(+), 250 deletions(-)
>  delete mode 100755 generate-macos-app.sh
>  delete mode 100755 generate-macos-wrapper.sh
>  create mode 100755 generate-script.sh
>  rename git-gui--askpass => git-gui--askpass.sh (100%)
>  delete mode 100644 macosx/AppMain.tcl
>  delete mode 100644 macosx/Info.plist
>  delete mode 100644 macosx/git-gui.icns
> 
> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>

-- Hannes