{"thread":{"id":"12048","subject":"[PATCH] git-gui: support Git Gui.app under OS X 10.5","startedAt":"2008-02-12T00:17:14Z","lastAt":"2008-02-12T07:33:06Z","messageCount":3,"participants":["jaysoffian@gmail.com","Seth Falcon","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"68467","messageId":"1202775434-28273-1-git-send-email-jaysoffian@gmail.com","threadId":"12048","inReplyTo":null,"subject":"[PATCH] git-gui: support Git Gui.app under OS X 10.5","fromName":"","fromEmail":"jaysoffian@gmail.com","sentAt":"2008-02-12T00:17:14Z","receivedAt":"2008-02-12T00:17:14Z","isPatch":true,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"The Tk Framework moved its location in 10.5 compared to 10.4\n\nSigned-off-by: Jay Soffian \n---\nArgh. Third time's a charm? Sorry, forgot to add my change before\namending and resending.\n\n git-gui/Makefile | 17 +++++++++++++----\n git-gui/macosx/Info.plist | 2 +-\n 2 files changed, 14 insertions(+), 5 deletions(-)\n\ndiff --git a/git-gui/Makefile b/git-gui/Makefile\nindex 34438cd..081d755 100644\n--- a/git-gui/Makefile\n+++ b/git-gui/Makefile\n@@ -13,6 +13,7 @@ GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE\n \n uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')\n uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')\n+uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')\n \n SCRIPT_SH = git-gui.sh\n GITGUI_MAIN := git-gui\n@@ -93,7 +94,14 @@ endif\n \n TCL_PATH ?= tclsh\n TCLTK_PATH ?= wish\n-TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app\n+\n+ifeq ($(uname_S),Darwin)\n+\tTKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app\n+\tifeq ($(shell expr \"$(uname_R)\" : '9\\.'),2)\n+\t\tTKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\\ Shell.app\n+\tendif\n+\tTKEXECUTABLE = $(shell basename \"$(TKFRAMEWORK)\" .app)\n+endif\n \n ifeq ($(findstring $(MAKEFLAGS),s),s)\n QUIET_GEN =\n@@ -147,7 +155,7 @@ git-gui: GIT-VERSION-FILE GIT-GUI-VARS\n \techo then >>$@+ && \\\n \techo '\t'echo \\'git-gui version '$(GITGUI_VERSION)'\\' >>$@+ && \\\n \techo else >>$@+ && \\\n-\techo '\t'exec \\''$(libdir_SQ)/Git Gui.app/Contents/MacOS/Wish'\\' \\\n+\techo '\t'exec \\''$(libdir_SQ)/Git Gui.app/Contents/MacOS/$(subst \\,,$(TKEXECUTABLE))'\\' \\\n \t\t'\"$$0\" \"$$@\"' >>$@+ && \\\n \techo fi >>$@+ && \\\n \tchmod +x $@+ && \\\n@@ -157,14 +165,15 @@ Git\\ Gui.app: GIT-VERSION-FILE GIT-GUI-VARS \\\n \t\tmacosx/Info.plist \\\n \t\tmacosx/git-gui.icns \\\n \t\tmacosx/AppMain.tcl \\\n-\t\t$(TKFRAMEWORK)/Contents/MacOS/Wish\n+\t\t$(TKFRAMEWORK)/Contents/MacOS/$(TKEXECUTABLE)\n \t$(QUIET_GEN)rm -rf '$@' '$@'+ && \\\n \tmkdir -p '$@'+/Contents/MacOS && \\\n \tmkdir -p '$@'+/Contents/Resources/Scripts && \\\n-\tcp '$(subst ','\\'',$(TKFRAMEWORK))/Contents/MacOS/Wish' \\\n+\tcp '$(subst ','\\'',$(subst \\,,$(TKFRAMEWORK)/Contents/MacOS/$(TKEXECUTABLE)))' \\\n \t\t'$@'+/Contents/MacOS && \\\n \tcp macosx/git-gui.icns '$@'+/Contents/Resources && \\\n \tsed -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \\\n+\t\t-e 's/@@GITGUI_TKEXECUTABLE@@/$(TKEXECUTABLE)/g' \\\n \t\tmacosx/Info.plist \\\n \t\t>'$@'+/Contents/Info.plist && \\\n \tsed -e 's|@@gitexecdir@@|$(gitexecdir_SQ)|' \\\ndiff --git a/git-gui/macosx/Info.plist b/git-gui/macosx/Info.plist\nindex 99913ec..b3bf15f 100644\n--- a/git-gui/macosx/Info.plist\n+++ b/git-gui/macosx/Info.plist\n@@ -5,7 +5,7 @@\n \tCFBundleDevelopmentRegion\n \tEnglish\n \tCFBundleExecutable\n-\tWish\n+\t@@GITGUI_TKEXECUTABLE@@\n \tCFBundleGetInfoString\n \tGit Gui @@GITGUI_VERSION@@ © 2006-2007 Shawn Pearce, et. al.\n \tCFBundleIconFile\n-- \n1.5.4.1.1232.g91d0\n"},{"id":"68474","messageId":"m2d4r30yjf.fsf@userprimary.net","threadId":"12048","inReplyTo":"1202775434-28273-1-git-send-email-jaysoffian@gmail.com","subject":"Re: [PATCH] git-gui: support Git Gui.app under OS X 10.5","fromName":"Seth Falcon","fromEmail":"seth@userprimary.net","sentAt":"2008-02-12T01:11:00Z","receivedAt":"2008-02-12T01:11:00Z","isPatch":true,"sender":{"key":"seth@userprimary.net","avatar":"https://gravatar.com/avatar/1db807504c1f8fb0a13bf1056a1e4d5096d17f3a09a1e9540f3af5f8b5ee009c?d=mp&s=160"},"body":"jaysoffian@gmail.com writes:\n> The Tk Framework moved its location in 10.5 compared to 10.4\n>\n> Signed-off-by: Jay Soffian \n> ---\n> Argh. Third time's a charm? Sorry, forgot to add my change before\n> amending and resending.\n\nI applied this and things work much better, thanks!\n\nSo...\n\nTested-by: Seth Falcon \n\nOne thing. When I quit git gui I see the following on the terminal:\n\nTkMacOSXDoHLEvent failed : cppe 1 ,kHighLevelEvent 61657674 0000 tvea,-1708\n\n\n-- \nSeth Falcon | seth@userprimary.net | blog: http://userprimary.net/user/\n"},{"id":"68490","messageId":"20080212073306.GA24004@spearce.org","threadId":"12048","inReplyTo":"m2d4r30yjf.fsf@userprimary.net","subject":"Re: [PATCH] git-gui: support Git Gui.app under OS X 10.5","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-02-12T07:33:06Z","receivedAt":"2008-02-12T07:33:06Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Seth Falcon wrote:\n> jaysoffian@gmail.com writes:\n> > The Tk Framework moved its location in 10.5 compared to 10.4\n> >\n> > Signed-off-by: Jay Soffian \n> > ---\n> > Argh. Third time's a charm? Sorry, forgot to add my change before\n> > amending and resending.\n> \n> I applied this and things work much better, thanks!\n> Tested-by: Seth Falcon \n\nThanks guys. This is now in maint and master. Its going to\nbe part of git-gui 0.9.3, whenever that happens.\n \n> One thing. When I quit git gui I see the following on the terminal:\n> \n> TkMacOSXDoHLEvent failed : cppe 1 ,kHighLevelEvent 61657674 0000 tvea,-1708\n\nYea, I see some random errors from git-gui when I use an option menu.\nI think there's something buggy with Tk on Aqua. Maybe we should\nreport these to the Tk Aqua folks, especially if we could distill\nthe issue down to a really short Tk script.\n\n-- \nShawn.\n"}]}