From bfbee1a2f6e19683a9740b4fc8f34ca8231188bf Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 24 Mar 2026 19:53:35 +0100 Subject: [PATCH] msys2-runtime: clean up fallout from `/open pr` bug There is currently a bug in `/open pr` where it not only adds the respective parts of the `source` array, but then deletes a large tail of the `PKGBUILD` file, for full details, see https://github.com/git-for-windows/git-for-windows-automation/issues/161 This affected https://github.com/git-for-windows/msys2-runtime/pull/128 and I fixed it manually. However, I failed to realize that the deleted part should have had one crucial edit, namely the part where the new patch is not only added to the sources but also applied... d'oh! Signed-off-by: Johannes Schindelin --- msys2-runtime/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD index 9b18721f024..a7447a161f7 100644 --- a/msys2-runtime/PKGBUILD +++ b/msys2-runtime/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=msys2-runtime pkgname=('msys2-runtime' 'msys2-runtime-devel') pkgver=3.6.7 -pkgrel=2 +pkgrel=3 pkgdesc="Cygwin POSIX emulation engine" arch=('x86_64') url="https://www.cygwin.com/" @@ -224,7 +224,8 @@ prepare() { 0043-Make-paths-WCS-MBS-conversion-explicit.patch \ 0044-Use-MB_CUR_MAX-6-by-default.patch \ 0045-msys2-runtime-restore-fast-path-for-current-user-pri.patch \ - 0046-Change-the-default-base-address-for-x86_64.patch + 0046-Change-the-default-base-address-for-x86_64.patch \ + 0047-fixup-Use-MB_CUR_MAX-6-by-default.patch } build() {