From df41037be019863d1de86e5bacce91d7218758b1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas@gmail.com>
Date: Thu, 31 Jul 2025 01:06:26 -0700
Subject: [PATCH] git-gui: retire Git Gui.app
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

In a recent commit, the minimum version of Tcl/Tk was raised to
8.6, but the "app" relies on the system provided Framework that
is based on 8.5.

Remove it, and let git-gui use a third party version of Wish if
available.

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 .gitignore                |   1 -
 GIT-GUI-BUILD-OPTIONS.in  |   1 -
 Makefile                  |  51 ----------------------------------
 generate-macos-app.sh     |  30 --------------------
 generate-macos-wrapper.sh |  35 -----------------------
 macosx/AppMain.tcl        |  29 -------------------
 macosx/Info.plist         |  30 --------------------
 macosx/git-gui.icns       | Bin 28866 -> 0 bytes
 meson.build               |  57 --------------------------------------
 9 files changed, 234 deletions(-)
 delete mode 100755 generate-macos-app.sh
 delete mode 100755 generate-macos-wrapper.sh
 delete mode 100644 macosx/AppMain.tcl
 delete mode 100644 macosx/Info.plist
 delete mode 100644 macosx/git-gui.icns

diff --git a/.gitignore b/.gitignore
index ff6e0be4b4..ba845f3f3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 .DS_Store
 config.mak
-Git Gui.app*
 git-gui.tcl
 GIT-GUI-BUILD-OPTIONS
 GIT-VERSION-FILE
diff --git a/GIT-GUI-BUILD-OPTIONS.in b/GIT-GUI-BUILD-OPTIONS.in
index 5fd885c2bf..3c112af578 100644
--- a/GIT-GUI-BUILD-OPTIONS.in
+++ b/GIT-GUI-BUILD-OPTIONS.in
@@ -4,4 +4,3 @@ GITGUI_RELATIVE=@GITGUI_RELATIVE@
 SHELL_PATH=@SHELL_PATH@
 TCLTK_PATH=@TCLTK_PATH@
 TCL_PATH=@TCL_PATH@
-TKEXECUTABLE=@TKEXECUTABLE@
diff --git a/Makefile b/Makefile
index 179857d088..2ac5f442f4 100644
--- a/Makefile
+++ b/Makefile
@@ -52,8 +52,6 @@ INSTALL_R0 = $(INSTALL) -m 644 # space is required here
 INSTALL_R1 =
 INSTALL_X0 = $(INSTALL) -m 755 # space is required here
 INSTALL_X1 =
-INSTALL_A0 = find # space is required here
-INSTALL_A1 = | cpio -pud
 INSTALL_L0 = rm -f # space is required here
 INSTALL_L1 = && ln # space is required here
 INSTALL_L2 =
@@ -78,8 +76,6 @@ ifndef V
 	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src
 	INSTALL_X0 = src=
 	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src
-	INSTALL_A0 = src=
-	INSTALL_A1 = && echo '   ' INSTALL '   ' `basename "$$src"` && find "$$src" | cpio -pud
 
 	INSTALL_L0 = dst=
 	INSTALL_L1 = && src=
@@ -100,18 +96,6 @@ else
 	TCL_PATH ?= $(dir $(TCLTK_PATH))$(notdir $(subst wish,tclsh,$(TCLTK_PATH)))
 endif
 
-ifeq ($(uname_S),Darwin)
-	TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
-        ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 9) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n)
-		TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app
-                ifeq ($(shell test -d $(TKFRAMEWORK) || echo n),n)
-			TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app
-                endif
-        endif
-	TKEXECUTABLE = $(TKFRAMEWORK)/Contents/MacOS/$(shell basename "$(TKFRAMEWORK)" .app)
-	TKEXECUTABLE_SQ = $(subst ','\'',$(TKEXECUTABLE))
-endif
-
 ifeq ($(findstring $(firstword -$(MAKEFLAGS)),s),s)
 QUIET_GEN =
 endif
@@ -129,16 +113,10 @@ libdir_SQ  = $(subst ','\'',$(gg_libdir))
 exedir     = $(dir $(gitexecdir))share/git-gui/lib
 
 GITGUI_RELATIVE :=
-GITGUI_MACOSXAPP :=
 
 ifeq ($(exedir),$(gg_libdir))
 	GITGUI_RELATIVE := 1
 endif
-ifeq ($(uname_S),Darwin)
-        ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)
-		GITGUI_MACOSXAPP := YesPlease
-        endif
-endif
 ifneq (,$(findstring MINGW,$(uname_S)))
 ifeq ($(shell expr "$(uname_R)" : '1\.'),2)
 	NO_MSGFMT=1
@@ -147,20 +125,6 @@ endif
 	GITGUI_RELATIVE := 1
 endif
 
-ifdef GITGUI_MACOSXAPP
-GITGUI_MAIN := git-gui.tcl
-
-git-gui: generate-macos-wrapper.sh GIT-VERSION-FILE GIT-GUI-BUILD-OPTIONS
-	$(QUIET_GEN)$(SHELL_PATH) generate-macos-wrapper.sh "$@" ./GIT-GUI-BUILD-OPTIONS ./GIT-VERSION-FILE
-
-Git\ Gui.app: GIT-VERSION-FILE GIT-GUI-BUILD-OPTIONS \
-		macosx/Info.plist \
-		macosx/git-gui.icns \
-		macosx/AppMain.tcl \
-		$(TKEXECUTABLE)
-	$(QUIET_GEN)$(SHELL_PATH) generate-macos-app.sh . "$@" ./GIT-GUI-BUILD-OPTIONS ./GIT-VERSION-FILE
-endif
-
 ifdef GITGUI_WINDOWS_WRAPPER
 GITGUI_MAIN := git-gui.tcl
 
@@ -205,14 +169,10 @@ GIT-GUI-BUILD-OPTIONS: FORCE
 		-e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
 		-e 's|@TCLTK_PATH@|$(TCLTK_PATH_SQ)|' \
 		-e 's|@TCL_PATH@|$(TCL_PATH_SQ)|' \
-		-e 's|@TKEXECUTABLE@|$(TKEXECUTABLE_SQ)|' \
 		$@.in >$@+
 	@if grep -q '^[A-Z][A-Z_]*=@.*@$$' $@+; then echo "Unsubstituted build options in $@" >&2 && exit 1; fi
 	@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
 
-ifdef GITGUI_MACOSXAPP
-all:: git-gui Git\ Gui.app
-endif
 ifdef GITGUI_WINDOWS_WRAPPER
 all:: git-gui
 endif
@@ -228,10 +188,6 @@ ifdef GITGUI_WINDOWS_WRAPPER
 endif
 	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)
 	$(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
-ifdef GITGUI_MACOSXAPP
-	$(QUIET)$(INSTALL_A0)'Git Gui.app' $(INSTALL_A1) '$(DESTDIR_SQ)$(libdir_SQ)'
-	$(QUIET)$(INSTALL_X0)git-gui.tcl $(INSTALL_X1) '$(DESTDIR_SQ)$(libdir_SQ)'
-endif
 	$(QUIET)$(foreach p,$(ALL_LIBFILES) $(NONTCL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true
 	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)
 	$(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
@@ -246,10 +202,6 @@ ifdef GITGUI_WINDOWS_WRAPPER
 endif
 	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(libdir_SQ)'
 	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/tclIndex $(REMOVE_F1)
-ifdef GITGUI_MACOSXAPP
-	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)/Git Gui.app' $(REMOVE_F1)
-	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/git-gui.tcl $(REMOVE_F1)
-endif
 	$(QUIET)$(foreach p,$(ALL_LIBFILES) $(NONTCL_LIBFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
 	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(msgsdir_SQ)'
 	$(QUIET)$(foreach p,$(ALL_MSGFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
@@ -265,9 +217,6 @@ dist-version: GIT-VERSION-FILE
 clean::
 	$(RM_RF) $(GITGUI_MAIN) lib/tclIndex po/*.msg $(PO_TEMPLATE)
 	$(RM_RF) GIT-VERSION-FILE GIT-GUI-BUILD-OPTIONS
-ifdef GITGUI_MACOSXAPP
-	$(RM_RF) 'Git Gui.app'* git-gui
-endif
 ifdef GITGUI_WINDOWS_WRAPPER
 	$(RM_RF) git-gui
 endif
diff --git a/generate-macos-app.sh b/generate-macos-app.sh
deleted file mode 100755
index 71b9fa67a4..0000000000
--- a/generate-macos-app.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-set -e
-
-SOURCE_DIR="$1"
-OUTPUT="$2"
-BUILD_OPTIONS="$3"
-VERSION_FILE="$4"
-
-. "$BUILD_OPTIONS"
-. "$VERSION_FILE"
-
-rm -rf "$OUTPUT" "$OUTPUT+"
-
-mkdir -p "$OUTPUT+/Contents/MacOS"
-mkdir -p "$OUTPUT+/Contents/Resources/Scripts"
-
-cp "$TKEXECUTABLE" "$OUTPUT+/Contents/MacOS"
-cp "$SOURCE_DIR/macosx/git-gui.icns" "$OUTPUT+/Contents/Resources"
-sed \
-	-e "s/@@GITGUI_VERSION@@/$GITGUI_VERSION/g" \
-	-e "s/@@GITGUI_TKEXECUTABLE@@/$(basename "$TKEXECUTABLE")/g" \
-	"$SOURCE_DIR/macosx/Info.plist" \
-	>"$OUTPUT+/Contents/Info.plist"
-sed \
-	-e "s|@@gitexecdir@@|$GITGUI_GITEXECDIR|" \
-	-e "s|@@GITGUI_LIBDIR@@|$GITGUI_LIBDIR|" \
-	"$SOURCE_DIR/macosx/AppMain.tcl" \
-	>"$OUTPUT+/Contents/Resources/Scripts/AppMain.tcl"
-mv "$OUTPUT+" "$OUTPUT"
diff --git a/generate-macos-wrapper.sh b/generate-macos-wrapper.sh
deleted file mode 100755
index 0304937f41..0000000000
--- a/generate-macos-wrapper.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if test "$#" -ne 3
-then
-	echo >&2 "usage: $0 <OUTPUT> <BUILD_OPTIONS> <VERSION_FILE>"
-	exit 1
-fi
-
-OUTPUT="$1"
-BUILD_OPTIONS="$2"
-VERSION_FILE="$3"
-
-. "$BUILD_OPTIONS"
-
-rm -f "$OUTPUT" "$OUTPUT+"
-
-(
-	echo "#!$SHELL_PATH"
-	cat "$BUILD_OPTIONS" "$VERSION_FILE"
-	cat <<-'EOF'
-	if test "z$*" = zversion ||
-	   test "z$*" = z--version
-	then
-		echo "git-gui version $GITGUI_VERSION"
-	else
-		libdir="${GIT_GUI_LIB_DIR:-$GITGUI_LIBDIR}"
-		exec "$libdir/Git Gui.app/Contents/MacOS/$(basename "$TKEXECUTABLE")" "$0" "$@"
-	fi
-	EOF
-) >"$OUTPUT+"
-
-chmod +x "$OUTPUT+"
-mv "$OUTPUT+" "$OUTPUT"
diff --git a/macosx/AppMain.tcl b/macosx/AppMain.tcl
deleted file mode 100644
index b6c6dc3500..0000000000
--- a/macosx/AppMain.tcl
+++ /dev/null
@@ -1,29 +0,0 @@
-set gitexecdir {@@gitexecdir@@}
-if { [info exists ::env(GIT_GUI_LIB_DIR) ] } {
-	set gitguilib $::env(GIT_GUI_LIB_DIR)
-} else {
-	set gitguilib {@@GITGUI_LIBDIR@@}
-}
-
-set env(PATH) "$gitexecdir:$env(PATH)"
-
-if {[string first -psn [lindex $argv 0]] == 0} {
-	lset argv 0 [file join $gitexecdir git-gui]
-}
-
-if {[file tail [lindex $argv 0]] eq {gitk}} {
-	set argv0 [lindex $argv 0]
-	set AppMain_source $argv0
-} else {
-	set argv0 [file join $gitexecdir [file tail [lindex $argv 0]]]
-	set AppMain_source [file join $gitguilib git-gui.tcl]
-	if {[info exists env(PWD)]} {
-		cd $env(PWD)
-	} elseif {[pwd] eq {/}} {
-		cd $env(HOME)
-	}
-}
-
-unset gitexecdir gitguilib
-set argv [lrange $argv 1 end]
-source $AppMain_source
diff --git a/macosx/Info.plist b/macosx/Info.plist
deleted file mode 100644
index 1ade121c4c..0000000000
--- a/macosx/Info.plist
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>@@GITGUI_TKEXECUTABLE@@</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Git Gui @@GITGUI_VERSION@@ © 2006-2007 Shawn Pearce, et. al.</string>
-	<key>CFBundleIconFile</key>
-	<string>git-gui.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>cz.or.repo.git-gui</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Git Gui</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>@@GITGUI_VERSION@@</string>
-	<key>CFBundleSignature</key>
-	<string>GITg</string>
-	<key>CFBundleVersion</key>
-	<string>@@GITGUI_VERSION@@</string>
-	<key>NSHighResolutionCapable</key>
-	<true/>
-</dict>
-</plist>
diff --git a/macosx/git-gui.icns b/macosx/git-gui.icns
deleted file mode 100644
index 77d88a77a7669667335cf6fd5767c8b40f3ce6e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc-jL100001

literal 28866
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
ZCa=iK8j8*n@2R5DUc11Wd$^5({vQ)kBD4Si

diff --git a/meson.build b/meson.build
index cdae85e4b9..1cedc823de 100644
--- a/meson.build
+++ b/meson.build
@@ -19,17 +19,6 @@ build_options_config.set_quoted('GITGUI_LIBDIR', get_option('prefix') / get_opti
 build_options_config.set_quoted('SHELL_PATH', fs.as_posix(shell.full_path()))
 build_options_config.set_quoted('TCLTK_PATH', fs.as_posix(wish.full_path()))
 build_options_config.set_quoted('TCL_PATH', fs.as_posix(tclsh.full_path()))
-if target_machine.system() == 'darwin'
-  tkexecutables = [
-    '/Library/Frameworks/Tk.framework/Resources/Wish.app/Contents/MacOS/Wish',
-    '/System/Library/Frameworks/Tk.framework/Resources/Wish.app/Contents/MacOS/Wish',
-    '/System/Library/Frameworks/Tk.framework/Resources/Wish Shell.app/Contents/MacOS/Wish Shell',
-  ]
-  tkexecutable = find_program(tkexecutables)
-  build_options_config.set_quoted('TKEXECUTABLE', tkexecutable.full_path())
-else
-  build_options_config.set('TKEXECUTABLE', '')
-endif
 
 build_options = configure_file(
   input: 'GIT-GUI-BUILD-OPTIONS.in',
@@ -70,52 +59,6 @@ if target_machine.system() == 'windows'
     install: true,
     install_dir: get_option('libexecdir') / 'git-core',
   )
-elif target_machine.system() == 'darwin'
-  gitgui_main = 'git-gui.tcl'
-  gitgui_main_install_dir = get_option('datadir') / 'git-gui/lib'
-
-  custom_target(
-    output: 'git-gui',
-    command: [
-      shell,
-      meson.current_source_dir() / 'generate-macos-wrapper.sh',
-      '@OUTPUT@',
-      meson.current_build_dir() / 'GIT-GUI-BUILD-OPTIONS',
-      meson.current_build_dir() / 'GIT-VERSION-FILE',
-    ],
-    depends: [
-      version_file,
-    ],
-    depend_files: [
-      build_options,
-    ],
-    install: true,
-    install_dir: get_option('libexecdir') / 'git-core',
-  )
-
-  custom_target(
-    output: 'Git Gui.app',
-    command: [
-      shell,
-      meson.current_source_dir() / 'generate-macos-app.sh',
-      meson.current_source_dir(),
-      meson.current_build_dir() / 'Git Gui.app',
-      meson.current_build_dir() / 'GIT-GUI-BUILD-OPTIONS',
-      meson.current_build_dir() / 'GIT-VERSION-FILE',
-    ],
-    depends: [
-      version_file,
-    ],
-    depend_files: [
-      build_options,
-      'macosx/AppMain.tcl',
-      'macosx/Info.plist',
-      'macosx/git-gui.icns',
-    ],
-    build_by_default: true,
-    install: true,
-    install_dir: get_option('datadir') / 'git-gui/lib',
-  )
 endif
 
 custom_target(
-- 
2.47.3