Merge pull request #5009 from jeremyd2019/msys2-runtime-3.3-update

msys2-runtime-3.3: Update (suppress proc_waiter error messages)
msys2 · Nov 14, 2024 · 8204546 · 8204546
2 parents 56e8b5b + 4ca5d3d
commit 8204546
Show file tree

Hide file tree

Showing 43 changed files with 180 additions and 373 deletions.
diff --git a/msys2-runtime-3.3/0023-CI-add-a-GHA-for-doing-a-basic-build-test.patch b/msys2-runtime-3.3/0023-CI-add-a-GHA-for-doing-a-basic-build-test.patch
diff --git a/...nd-lines-to-other-Win32-processes-b.patch → ...nd-lines-to-other-Win32-processes-b.patch b/...nd-lines-to-other-Win32-processes-b.patch → ...nd-lines-to-other-Win32-processes-b.patch
@@ -1,7 +1,7 @@
 From b37c67a23018d626b4a4228f71c8eda2f6d96f77 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 12 Aug 2020 12:22:38 +0200
-Subject: [PATCH 25/N] Expose full command-lines to other Win32 processes by
+Subject: [PATCH 23/N] Expose full command-lines to other Win32 processes by
  default
 
 In the Cygwin project, it was decided that the command-line of Cygwin

diff --git a/...o-not-show-Error-dialogs-by-default.patch → ...o-not-show-Error-dialogs-by-default.patch b/...o-not-show-Error-dialogs-by-default.patch → ...o-not-show-Error-dialogs-by-default.patch
@@ -1,7 +1,7 @@
 From c20ec3a443668ab7047a383958e1b2d9f687bbf0 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 31 Mar 2021 11:38:41 +0200
-Subject: [PATCH 27/N] Do not show Error dialogs by default
+Subject: [PATCH 24/N] Do not show Error dialogs by default
 
 In https://github.com/msys2/msys2-runtime/pull/18, we discussed a change
 that would allow default Windows error handling of spawned processes to

diff --git a/msys2-runtime-3.3/0024-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch b/msys2-runtime-3.3/0024-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch
diff --git a/...btain-a-function-s-address-in-kerne.patch → ...btain-a-function-s-address-in-kerne.patch b/...btain-a-function-s-address-in-kerne.patch → ...btain-a-function-s-address-in-kerne.patch
@@ -1,7 +1,7 @@
 From 22f77091e940c4d404dd5478c31823745effe5a9 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 16 Apr 2018 14:59:39 +0200
-Subject: [PATCH 28/N] Add a helper to obtain a function's address in
+Subject: [PATCH 25/N] Add a helper to obtain a function's address in
  kernel32.dll
 
 In particular, we are interested in the address of the CtrlRoutine

diff --git a/msys2-runtime-3.3/0026-Disable-the-cygwin-GitHub-workflow.patch b/msys2-runtime-3.3/0026-Disable-the-cygwin-GitHub-workflow.patch
diff --git a/...enerateConsoleCtrlEvent-upon-Ctrl-C.patch → ...enerateConsoleCtrlEvent-upon-Ctrl-C.patch b/...enerateConsoleCtrlEvent-upon-Ctrl-C.patch → ...enerateConsoleCtrlEvent-upon-Ctrl-C.patch
@@ -1,7 +1,7 @@
 From be43d1330988ee93aa837c3f4610ef35a04349e8 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Fri, 20 Mar 2015 09:56:28 +0000
-Subject: [PATCH 29/N] Emulate GenerateConsoleCtrlEvent() upon Ctrl+C
+Subject: [PATCH 26/N] Emulate GenerateConsoleCtrlEvent() upon Ctrl+C
 
 This patch is heavily inspired by the Git for Windows' strategy in
 handling Ctrl+C.

diff --git a/...ll-kill-Win32-processes-more-gently.patch → ...ll-kill-Win32-processes-more-gently.patch b/...ll-kill-Win32-processes-more-gently.patch → ...ll-kill-Win32-processes-more-gently.patch
@@ -1,7 +1,7 @@
 From 486c7601503c313c3fc3d84b1144064067754f2f Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Fri, 20 Mar 2015 10:01:50 +0000
-Subject: [PATCH 30/N] kill: kill Win32 processes more gently
+Subject: [PATCH 27/N] kill: kill Win32 processes more gently
 
 This change is the equivalent to the change to the Ctrl+C handling we
 just made.

diff --git a/...tion-for-native-inner-link-handling.patch → ...tion-for-native-inner-link-handling.patch b/...tion-for-native-inner-link-handling.patch → ...tion-for-native-inner-link-handling.patch
@@ -1,7 +1,7 @@
 From aa9dbc9c9fc47ae4371d5847b358122eb1f54750 Mon Sep 17 00:00:00 2001
 From: Jeremy Drake <github@jdrake.com>
 Date: Thu, 22 Jul 2021 11:59:16 -0700
-Subject: [PATCH 31/N] Cygwin: make option for native inner link handling.
+Subject: [PATCH 28/N] Cygwin: make option for native inner link handling.
 
 This code has been causing issues with SUBST and mapped network drives,
 so add an option (defaulted to on) which can be used to disable it where

diff --git a/...skip-building-texinfo-and-PDF-files.patch → ...skip-building-texinfo-and-PDF-files.patch b/...skip-building-texinfo-and-PDF-files.patch → ...skip-building-texinfo-and-PDF-files.patch
@@ -1,7 +1,7 @@
 From 20f59b414ff39195eb42bca7751ee3b4ae33f870 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 8 Nov 2021 14:20:07 +0100
-Subject: [PATCH 32/N] docs: skip building texinfo and PDF files
+Subject: [PATCH 29/N] docs: skip building texinfo and PDF files
 
 The MSYS2 packages lack the infrastructure to build those.
 

diff --git a/...install-libs-depend-on-the-toollibs.patch → ...install-libs-depend-on-the-toollibs.patch b/...install-libs-depend-on-the-toollibs.patch → ...install-libs-depend-on-the-toollibs.patch
@@ -1,7 +1,7 @@
 From 31b5e84ef74da21c7a8f9fea5c7395154f1ae36b Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 8 Nov 2021 16:22:57 +0100
-Subject: [PATCH 33/N] install-libs: depend on the "toollibs"
+Subject: [PATCH 30/N] install-libs: depend on the "toollibs"
 
 Before symlinking libg.a, we need the symlink source `libmsys-2.0.a`: in
 MSYS2, we copy by default (if we were creating Unix-style symlinks, the

diff --git a/...3/0034-POSIX-ify-the-SHELL-variable.patch → ...3/0031-POSIX-ify-the-SHELL-variable.patch b/...3/0034-POSIX-ify-the-SHELL-variable.patch → ...3/0031-POSIX-ify-the-SHELL-variable.patch
@@ -1,7 +1,7 @@
 From ae6fceff61edab2e97a3af6dcb2ded9a738c8bf0 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 23 Nov 2015 20:03:11 +0100
-Subject: [PATCH 34/N] POSIX-ify the SHELL variable
+Subject: [PATCH 31/N] POSIX-ify the SHELL variable
 
 When calling a non-MSys2 binary, all of the environment is converted from
 POSIX to Win32, including the SHELL environment variable. In Git for

diff --git a/...Handle-ORIGINAL_PATH-just-like-PATH.patch → ...Handle-ORIGINAL_PATH-just-like-PATH.patch b/...Handle-ORIGINAL_PATH-just-like-PATH.patch → ...Handle-ORIGINAL_PATH-just-like-PATH.patch
@@ -1,7 +1,7 @@
 From 7af6781845542e53a96def2997912f68537202e8 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 21 Mar 2017 13:18:38 +0100
-Subject: [PATCH 35/N] Handle ORIGINAL_PATH just like PATH
+Subject: [PATCH 32/N] Handle ORIGINAL_PATH just like PATH
 
 MSYS2 recently introduced that hack where the ORIGINAL_PATH variable is
 set to the original PATH value in /etc/profile, unless previously set.

diff --git a/...w-setting-the-system-name-to-CYGWIN.patch → ...w-setting-the-system-name-to-CYGWIN.patch b/...w-setting-the-system-name-to-CYGWIN.patch → ...w-setting-the-system-name-to-CYGWIN.patch
@@ -1,7 +1,7 @@
 From 1a5f889bdb136397b64e25311ad68c93806b3bea Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 3 Jul 2022 22:39:32 +0200
-Subject: [PATCH 36/N] uname: allow setting the system name to CYGWIN
+Subject: [PATCH 33/N] uname: allow setting the system name to CYGWIN
 
 We are currently trying to move our cygwin build environment closer
 to cygwin and some autotools/bash based build systems call "uname -s"

diff --git a/...ixup-Revert-Default-to-disable_pcon.patch → ...ixup-Revert-Default-to-disable_pcon.patch b/...ixup-Revert-Default-to-disable_pcon.patch → ...ixup-Revert-Default-to-disable_pcon.patch
@@ -1,7 +1,7 @@
 From f5d37650e7077d214ec5895b0175918863172086 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Tue, 13 Sep 2022 09:36:38 +0200
-Subject: [PATCH 37/N] fixup! Revert "Default to `disable_pcon`"
+Subject: [PATCH 34/N] fixup! Revert "Default to `disable_pcon`"
 
 This reverts commit 8e89fffcfb0884da1398dd55f0d0cc57294549ec.
 

diff --git a/...ronment-variables-with-empty-values.patch → ...ronment-variables-with-empty-values.patch b/...ronment-variables-with-empty-values.patch → ...ronment-variables-with-empty-values.patch
@@ -1,7 +1,7 @@
 From 5812c2fb3534a9203cc110cc052fdae730920a3e Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 18 Feb 2015 12:32:17 +0000
-Subject: [PATCH 38/N] Pass environment variables with empty values
+Subject: [PATCH 35/N] Pass environment variables with empty values
 
 There is a difference between an empty value and an unset environment
 variable. We should not confuse both; If the user wants to unset an

diff --git a/...llow-empty-environment-values-again.patch → ...llow-empty-environment-values-again.patch b/...llow-empty-environment-values-again.patch → ...llow-empty-environment-values-again.patch
@@ -1,7 +1,7 @@
 From 96283acb9d8fe69bb921ee84c584bc79b1eb262f Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 6 Sep 2022 10:40:58 +0200
-Subject: [PATCH 39/N] Optionally disallow empty environment values again
+Subject: [PATCH 36/N] Optionally disallow empty environment values again
 
 We just disabled the code that skips environment variables whose values
 are empty.

diff --git a/...spect-the-MSYS-environment-variable.patch → ...spect-the-MSYS-environment-variable.patch b/...spect-the-MSYS-environment-variable.patch → ...spect-the-MSYS-environment-variable.patch
@@ -1,7 +1,7 @@
 From 97c2d7fa8bb424012aad77b8d86f3262a35fab0a Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 6 Sep 2022 12:18:18 +0200
-Subject: [PATCH 40/N] build_env(): respect the `MSYS` environment variable
+Subject: [PATCH 37/N] build_env(): respect the `MSYS` environment variable
 
 With this commit, you can call
 

diff --git a/...d-address-error-when-running-cmd.ex.patch → ...d-address-error-when-running-cmd.ex.patch b/...d-address-error-when-running-cmd.ex.patch → ...d-address-error-when-running-cmd.ex.patch
@@ -1,7 +1,7 @@
 From f975120d20d51ca11217e4abbf16cc51ab8c9290 Mon Sep 17 00:00:00 2001
 From: Takashi Yano <takashi.yano@nifty.ne.jp>
 Date: Sat, 22 Oct 2022 14:05:40 +0900
-Subject: [PATCH 41/N] Cygwin: pty: Fix 'Bad address' error when running
+Subject: [PATCH 38/N] Cygwin: pty: Fix 'Bad address' error when running
  'cmd.exe /c dir'
 
 - If the command executed is 'cmd.exe /c [...]', runpath in spawn.cc

diff --git a/...o-a-Unix-path-avoid-double-trailing.patch → ...o-a-Unix-path-avoid-double-trailing.patch b/...o-a-Unix-path-avoid-double-trailing.patch → ...o-a-Unix-path-avoid-double-trailing.patch
@@ -1,7 +1,7 @@
 From 1a46b7d8d3d3359db09a81f063711e4523aedb68 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 8 Nov 2022 16:24:20 +0100
-Subject: [PATCH 43/N] When converting to a Unix path, avoid double trailing
+Subject: [PATCH 39/N] When converting to a Unix path, avoid double trailing
  slashes
 
 When calling `cygpath -u C:/msys64/` in an MSYS2 setup that was

diff --git a/...e-for-converting-root-directory-to-.patch → ...e-for-converting-root-directory-to-.patch b/...e-for-converting-root-directory-to-.patch → ...e-for-converting-root-directory-to-.patch
@@ -1,7 +1,7 @@
 From 358b4547f7c159ca544a24938aca350b3aac84dd Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 20 Sep 2022 21:47:34 +0200
-Subject: [PATCH 44/N] amend! Special case for converting root directory to
+Subject: [PATCH 40/N] amend! Special case for converting root directory to
  have training slash
 
 path_conv: special-case root directory to have trailing slash

diff --git a/...th_conv-pass-PC_NOFULL-to-path_conv.patch → ...th_conv-pass-PC_NOFULL-to-path_conv.patch b/...th_conv-pass-PC_NOFULL-to-path_conv.patch → ...th_conv-pass-PC_NOFULL-to-path_conv.patch
@@ -1,7 +1,7 @@
 From 68060d237a33743ce94c6c74a39475acfcfaa965 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 20 Nov 2022 13:57:36 +0100
-Subject: [PATCH 45/N] msys2_path_conv: pass PC_NOFULL to path_conv
+Subject: [PATCH 41/N] msys2_path_conv: pass PC_NOFULL to path_conv
 
 In theory this doesn't make a difference because posix_to_win32_path()
 is only called with rooted/absolute paths, but as pointed out in

diff --git a/...-support-the-dev-fd-symlink-and-fri.patch → ...-support-the-dev-fd-symlink-and-fri.patch b/...-support-the-dev-fd-symlink-and-fri.patch → ...-support-the-dev-fd-symlink-and-fri.patch
@@ -1,7 +1,7 @@
 From e2ac480feee393e77b002f88f2c957e19d44fe0d Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Mon, 21 Feb 2022 14:36:37 +0100
-Subject: [PATCH 46/N] Cygwin: Implicitly support the /dev/fd symlink and
+Subject: [PATCH 42/N] Cygwin: Implicitly support the /dev/fd symlink and
  friends
 
 Bash has a very convenient feature that is called process substitution

diff --git a/msys2-runtime-3.3/0042-ci-avoid-using-Node.js-12-Actions.patch b/msys2-runtime-3.3/0042-ci-avoid-using-Node.js-12-Actions.patch
diff --git a/...er-problem-when-libbfd-depends-on-l.patch → ...er-problem-when-libbfd-depends-on-l.patch b/...er-problem-when-libbfd-depends-on-l.patch → ...er-problem-when-libbfd-depends-on-l.patch
@@ -1,7 +1,7 @@
 From 5f8eaff6c86f890ec2fcc366d4d7b9b7050e6bc2 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Tue, 31 Jan 2023 09:32:08 +0100
-Subject: [PATCH 47/N] dumper: avoid linker problem when `libbfd` depends on
+Subject: [PATCH 43/N] dumper: avoid linker problem when `libbfd` depends on
  `libsframe`
 
 A recent binutils version introduced `libsframe` and made it a

diff --git a/...t-there-are-no-spaces-in-POSIX-styl.patch → ...t-there-are-no-spaces-in-POSIX-styl.patch b/...t-there-are-no-spaces-in-POSIX-styl.patch → ...t-there-are-no-spaces-in-POSIX-styl.patch
@@ -1,7 +1,7 @@
 From c86ff309dd42a57dc2f1113b1266e36c01b8c97f Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Wed, 18 Feb 2015 10:45:01 +0000
-Subject: [PATCH 49/N] Stop assuming that there are no spaces in POSIX-style
+Subject: [PATCH 44/N] Stop assuming that there are no spaces in POSIX-style
  paths
 
 Git's test suite most prominently sports a POSIX path with a space in

diff --git a/...mpiling-with-w32api-headers-v11.0.0.patch → ...mpiling-with-w32api-headers-v11.0.0.patch b/...mpiling-with-w32api-headers-v11.0.0.patch → ...mpiling-with-w32api-headers-v11.0.0.patch
@@ -1,7 +1,7 @@
 From 788b777bdf938e38355ae19b22a9b6907046a24f Mon Sep 17 00:00:00 2001
 From: Biswapriyo Nath <nathbappai@gmail.com>
 Date: Sun, 30 Apr 2023 00:03:21 +0530
-Subject: [PATCH 50/N] Cygwin: Fix compiling with w32api-headers v11.0.0
+Subject: [PATCH 45/N] Cygwin: Fix compiling with w32api-headers v11.0.0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/...x-hangup-of-less-on-quit-after-the-.patch → ...x-hangup-of-less-on-quit-after-the-.patch b/...x-hangup-of-less-on-quit-after-the-.patch → ...x-hangup-of-less-on-quit-after-the-.patch
@@ -1,7 +1,7 @@
 From 8148ef7547f1fb8394810f9e24a28ebd2c83a375 Mon Sep 17 00:00:00 2001
 From: Takashi Yano <takashi.yano@nifty.ne.jp>
 Date: Thu, 22 Dec 2022 20:25:22 +0900
-Subject: [PATCH 51/N] Cygwin: console: Fix hangup of less on quit after the
+Subject: [PATCH 46/N] Cygwin: console: Fix hangup of less on quit after the
  window is resized.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

diff --git a/...to-accommodate-for-the-latest-Windo.patch → ...to-accommodate-for-the-latest-Windo.patch b/...to-accommodate-for-the-latest-Windo.patch → ...to-accommodate-for-the-latest-Windo.patch
@@ -1,7 +1,7 @@
 From b00763c145a60347e6cb41a1b5876e08e09887a7 Mon Sep 17 00:00:00 2001
 From: Johannes Schindelin <johannes.schindelin@gmx.de>
 Date: Fri, 12 May 2023 13:37:56 +0200
-Subject: [PATCH 52/N] Adjust CWD magic to accommodate for the latest Windows
+Subject: [PATCH 47/N] Adjust CWD magic to accommodate for the latest Windows
  previews
 
 Reportedly Windows 11 build 25*** from Insider changed the current