From 6c32189e39fad741bdb14490d00b033a797d92f3 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 24 Nov 2025 18:59:42 +0100 Subject: [PATCH 1/3] please.sh make-mingw-w64-git: configure `WITH_PDBS` As part of the effort to upstream `mingw-w64-git` to MSYS2, I changed the default to _not_ build `.pdb` files by default (because MSYS2 lacks the `mingw-w64-cv2pdb` package, and it is unlikely that they would accept it either, given that it requires MSBuild and Visual C to build). That means that one no longer sets `WITHOUT_PDBS` when skipping `mingw-w64-pdb`, but `WITH_PDBS` when including it in the build. For the transition period, ensure that the `mingw-w64-git` package of Git for Windows is built using the correct value for those flags, depending whether the DLLs required by cv2pdb are found or not. Signed-off-by: Johannes Schindelin --- please.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/please.sh b/please.sh index 751887894d..89bd6ad289 100755 --- a/please.sh +++ b/please.sh @@ -3551,13 +3551,18 @@ build_mingw_w64_git () { # [--only-i686] [--only-x86_64] [--only-aarch64] [--ski # Work around bug where the incorrect xmlcatalog.exe wrote /etc/xml/catalog sed -i -e 's|C:/git-sdk-64-ci||g' /etc/xml/catalog - test true = "$GITHUB_ACTIONS" || # GitHub Actions' agents have the mspdb.dll, and cv2pdb finds it - test -n "$SYSTEM_COLLECTIONURI$SYSTEM_TASKDEFINITIONSURI" || # Same for Azure Pipelines - test "$MINGW_ARCH" = "clangarm64" || # We don't need cv2pdb when compiling using Clang/LLVM - find_mspdb_dll >/dev/null || { + test true != "$GITHUB_ACTIONS" && # GitHub Actions' agents have the mspdb.dll, and cv2pdb finds it + test -z "$SYSTEM_COLLECTIONURI$SYSTEM_TASKDEFINITIONSURI" && # Same for Azure Pipelines + test "$MINGW_ARCH" != "clangarm64" && # We don't need cv2pdb when compiling using Clang/LLVM + ! find_mspdb_dll >/dev/null && { + WITH_PDBS= WITHOUT_PDBS=1 - export WITHOUT_PDBS + } || { + WITH_PDBS=1 + WITHOUT_PDBS= } + export WITH_PDBS + export WITHOUT_PDBS (if test -n "$(git config alias.signtool)" then From a08718cdd959aed6b444e0923ec85f3d1a19bf86 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 24 Nov 2025 19:08:09 +0100 Subject: [PATCH 2/3] sdk build: set the `WITH_PDBS` flag, too There is logic to skip building the `.pdb` files of `mingw-w64-git` and `mingw-w64-curl` in Git for Windows' package definitions. However, while upstreaming `mingw-w64-git` to the MSYS2 project, it became obvious that the default should not be to build those `.pdb` files, and therefore the flag should not be called `WITHOUT_PDBS`, but instead the default should be to skip them and the flag should be named `WITH_PDBS`. Let's handle both flags when `sdk build`ing packages. Signed-off-by: Johannes Schindelin --- git-extra/git-sdk.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-extra/git-sdk.sh b/git-extra/git-sdk.sh index 97ebec1019..126675b0d8 100755 --- a/git-extra/git-sdk.sh +++ b/git-extra/git-sdk.sh @@ -154,6 +154,7 @@ sdk () { # for building makepkg|makepkg-mingw) cmd=$1; shift + WITH_PDBS="$(! grep -q WITH_PDBS PKGBUILD || ! sdk find_mspdb_dll || echo true)" \ WITHOUT_PDBS="$(! grep -q WITHOUT_PDBS PKGBUILD || sdk find_mspdb_dll || echo true)" \ MAKEFLAGS=${MAKEFLAGS:--j$(nproc)} PKGEXT='.pkg.tar.xz' $cmd --syncdeps --noconfirm --skipchecksums --skippgpcheck "$@" ;; From 9986fc653c77359fe293c63030c3c5e50c2a34ec Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 24 Nov 2025 18:20:42 +0000 Subject: [PATCH 3/3] git-extra: update checksums Signed-off-by: Johannes Schindelin --- git-extra/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-extra/PKGBUILD b/git-extra/PKGBUILD index 7b295e05a6..ca41219301 100644 --- a/git-extra/PKGBUILD +++ b/git-extra/PKGBUILD @@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}" pkgname=($_realname "${MINGW_PACKAGE_PREFIX}-${_realname}") _ver_base=1.1 -pkgver=1.1.683.0c63e840c +pkgver=1.1.685.a08718cdd pkgrel=1 pkgdesc="Git for Windows extra files" arch=('any') @@ -82,7 +82,7 @@ sha256sums=('8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72' '683ab066be19cb4defec470ebd53f165ca5dbf761fd40c13aee8abe31ba42803' '1cf2c13fb97c51375a76ed479362c3cbcdb51ab4d3a745e8d2c3a780badd8d46' '32223da4e1264d0c9663dd3d4b347131a634e96c2676d673ca58b2a6c58d2aea' - '2cd753e134a9050037a5cbada81d91af6ec9c85e9da696ae908a3633f2c5340a' + '1fae4ff3ce1e75ac90fe6f6130db4d041bc34f59deea679501f57d2c41d37560' '22f41610dea842890955032af30efdb60e80f310e95a04e57ab36b10e0376923' '8120b41b869693e07acc4707a0ab45505e7c5e4156a3a44b19152f1f425df85f' '15b40ab72dea884f659cfbe441e9a40b2d8d63e490a3c14824a55607368e476d'