public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Johannes Sixt <j6t@kdbg.org>,
	Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2] meson: wire up gitk and git-gui
Date: Fri, 6 Feb 2026 16:39:24 +0100	[thread overview]
Message-ID: <aYYLLI2Gb7YlBtKt@pks.im> (raw)
In-Reply-To: <aYSFGG7lCg6Sw8vy@pks.im>

On Thu, Feb 05, 2026 at 12:55:04PM +0100, Patrick Steinhardt wrote:
> On Thu, Feb 05, 2026 at 04:37:48AM -0500, Jeff King wrote:
> > On Wed, Feb 04, 2026 at 09:38:11AM +0100, Patrick Steinhardt wrote:
> > 
> > > Wire up both gitk and git-gui in Meson as subprojects. These two
> > > programs should be the last missing pieces for feature compatibility
> > > with our Makefile for distributors.
> > > 
> > > Note that Meson expects subprojects to live in the "subprojects/"
> > > directory. Create symlinks to fulfill this requirement.
> > 
> > The GitHub Actions win+Meson job fails for 'jch' with:
> > 
> >   Project name: gitk
> >   Project version: undefined
> >   Program sh found: YES (C:\Program Files\Git\bin\sh.EXE)
> >   Program wish found: YES (C:\Program Files\Git\mingw64\bin\wish.EXE)
> >   Program chmod found: YES (C:\Program Files\Git\usr\bin\chmod.EXE)
> >   Program mv found: YES (C:\Program Files\Git\usr\bin\mv.EXE)
> >   Program sed found: YES (C:\Program Files\Git\usr\bin\sed.EXE)
> >   Program msgfmt found: NO
> > 
> >   subprojects\gitk\meson.build:28:3: ERROR: Program 'msgfmt' not found or not executable
> > 
> > I didn't investigate, but presumably it is related to this topic.
> 
> Oh, indeed. It seems like the logic to handle a missing msgfmt
> executable already exists, but that I forgot to mark the executable as
> optional itself. So we need the below patch to fix this.
> 
> The nice thing is that this verifies that things actually work with the
> symlink on Windows :)
> 
> I've created https://github.com/j6t/gitk/pull/37 to fix the issue,
> thanks!

The fix has been merged upstream. I've created [1] to verify that the CI
now succeeds.

Junio, I'm not really sure how to proceed here, as I cannot send the
subtree merge via mail to the best of my knowledge. Shall I instead send
a new version that just includes the upstream commit, or will you handle
the update?

Thanks!

Patrick

[1]: https://github.com/git/git/pull/2190

  reply	other threads:[~2026-02-06 15:39 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-19  8:18 [PATCH 0/3] meson: wire up gitk and git-gui Patrick Steinhardt
2025-08-19  8:18 ` [PATCH 1/3] git-gui: move into "subprojects/" Patrick Steinhardt
2025-08-19  9:36   ` Karthik Nayak
2025-08-19  8:18 ` [PATCH 2/3] gitk: " Patrick Steinhardt
2025-08-20  5:49   ` [PATCH] doc/gitk: update reference to the external project Johannes Sixt
2025-08-20  6:16     ` [PATCH v2] " Johannes Sixt
2025-08-20 15:34       ` Junio C Hamano
2025-08-19  8:18 ` [PATCH 3/3] meson: wire up gitk and git-gui Patrick Steinhardt
2025-08-19  9:40   ` Karthik Nayak
2025-08-24 17:25     ` Patrick Steinhardt
2025-08-19 15:49 ` [PATCH 0/3] " Junio C Hamano
2025-08-24 17:25   ` Patrick Steinhardt
2025-08-26  0:40     ` Junio C Hamano
2025-09-02 13:00       ` Patrick Steinhardt
2025-08-19 22:25 ` Ramsay Jones
2025-08-24 17:25   ` Patrick Steinhardt
2026-02-04  8:38 ` [PATCH v2] " Patrick Steinhardt
2026-02-04 10:00   ` Karthik Nayak
2026-02-04 11:56     ` Patrick Steinhardt
2026-02-04 17:53   ` Junio C Hamano
2026-02-05  6:58     ` Patrick Steinhardt
2026-02-05  9:37   ` Jeff King
2026-02-05 11:55     ` Patrick Steinhardt
2026-02-06 15:39       ` Patrick Steinhardt [this message]
2026-02-06 22:23         ` Junio C Hamano
2026-02-09  8:32           ` Patrick Steinhardt
2026-02-11 21:05         ` Junio C Hamano
2026-02-11 22:41           ` Johannes Sixt
2026-02-11 22:56             ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=aYYLLI2Gb7YlBtKt@pks.im \
    --to=ps@pks.im \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox