From 4d249d13e6751d45a8068d44df999f3f7b3947fe Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Thu, 14 Nov 2024 11:35:28 -0800 Subject: [PATCH 1/2] msys2-runtime-3.3: sync update-patches.sh with msys2-runtime --- msys2-runtime-3.3/update-patches.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/msys2-runtime-3.3/update-patches.sh b/msys2-runtime-3.3/update-patches.sh index c9221a2f05d..65f3bc5f251 100755 --- a/msys2-runtime-3.3/update-patches.sh +++ b/msys2-runtime-3.3/update-patches.sh @@ -21,8 +21,10 @@ base_tag=refs/tags/cygwin-"$(sed -ne 'y/./_/' -e 's/^pkgver=//p' Date: Thu, 14 Nov 2024 11:46:07 -0800 Subject: [PATCH 2/2] msys2-runtime-3.3: Update (suppress proc_waiter error messages) See msys2/msys2-runtime#237 --- ...d-a-GHA-for-doing-a-basic-build-test.patch | 52 ---- ...nd-lines-to-other-Win32-processes-b.patch} | 2 +- ...o-not-show-Error-dialogs-by-default.patch} | 2 +- ...b-Action-to-keep-in-sync-with-Cygwin.patch | 43 ---- ...btain-a-function-s-address-in-kerne.patch} | 2 +- ...6-Disable-the-cygwin-GitHub-workflow.patch | 32 --- ...enerateConsoleCtrlEvent-upon-Ctrl-C.patch} | 2 +- ...ll-kill-Win32-processes-more-gently.patch} | 2 +- ...tion-for-native-inner-link-handling.patch} | 2 +- ...skip-building-texinfo-and-PDF-files.patch} | 2 +- ...install-libs-depend-on-the-toollibs.patch} | 2 +- ...> 0031-POSIX-ify-the-SHELL-variable.patch} | 2 +- ...Handle-ORIGINAL_PATH-just-like-PATH.patch} | 2 +- ...w-setting-the-system-name-to-CYGWIN.patch} | 2 +- ...ixup-Revert-Default-to-disable_pcon.patch} | 2 +- ...ronment-variables-with-empty-values.patch} | 2 +- ...llow-empty-environment-values-again.patch} | 2 +- ...spect-the-MSYS-environment-variable.patch} | 2 +- ...d-address-error-when-running-cmd.ex.patch} | 2 +- ...o-a-Unix-path-avoid-double-trailing.patch} | 2 +- ...e-for-converting-root-directory-to-.patch} | 2 +- ...th_conv-pass-PC_NOFULL-to-path_conv.patch} | 2 +- ...-support-the-dev-fd-symlink-and-fri.patch} | 2 +- ...42-ci-avoid-using-Node.js-12-Actions.patch | 39 --- ...er-problem-when-libbfd-depends-on-l.patch} | 2 +- ...t-there-are-no-spaces-in-POSIX-styl.patch} | 2 +- ...mpiling-with-w32api-headers-v11.0.0.patch} | 2 +- ...x-hangup-of-less-on-quit-after-the-.patch} | 2 +- ...to-accommodate-for-the-latest-Windo.patch} | 2 +- ...ild-with-disable-dependency-tracking.patch | 24 -- ...nality-for-converting-UNIX-paths-in.patch} | 2 +- ...nality-for-converting-UNIX-paths-in.patch} | 2 +- ...k-around-an-overzealous-GCC-warning.patch} | 2 +- ...cygheap_start-into-.cygheap-section.patch} | 2 +- ...o-link-with-libzstd-as-libbfd-may-r.patch} | 2 +- .../0053-CI-fix-the-build-with-gcc-13.patch | 25 -- ...Add-option-to-disable-building-dump.patch} | 2 +- ...-around-fragile-include-in-binutils.patch} | 2 +- ...cwd-don-t-run-assembler-checking-co.patch} | 2 +- ...d-suspend-thread-before-terminating.patch} | 2 +- ...ad-suspend-thread-before-terminating.patch | 33 +++ msys2-runtime-3.3/PKGBUILD | 227 ++++++++---------- 42 files changed, 173 insertions(+), 370 deletions(-) delete mode 100644 msys2-runtime-3.3/0023-CI-add-a-GHA-for-doing-a-basic-build-test.patch rename msys2-runtime-3.3/{0025-Expose-full-command-lines-to-other-Win32-processes-b.patch => 0023-Expose-full-command-lines-to-other-Win32-processes-b.patch} (96%) rename msys2-runtime-3.3/{0027-Do-not-show-Error-dialogs-by-default.patch => 0024-Do-not-show-Error-dialogs-by-default.patch} (97%) delete mode 100644 msys2-runtime-3.3/0024-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch rename msys2-runtime-3.3/{0028-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch => 0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch} (99%) delete mode 100644 msys2-runtime-3.3/0026-Disable-the-cygwin-GitHub-workflow.patch rename msys2-runtime-3.3/{0029-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch => 0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch} (99%) rename msys2-runtime-3.3/{0030-kill-kill-Win32-processes-more-gently.patch => 0027-kill-kill-Win32-processes-more-gently.patch} (96%) rename msys2-runtime-3.3/{0031-Cygwin-make-option-for-native-inner-link-handling.patch => 0028-Cygwin-make-option-for-native-inner-link-handling.patch} (96%) rename msys2-runtime-3.3/{0032-docs-skip-building-texinfo-and-PDF-files.patch => 0029-docs-skip-building-texinfo-and-PDF-files.patch} (95%) rename msys2-runtime-3.3/{0033-install-libs-depend-on-the-toollibs.patch => 0030-install-libs-depend-on-the-toollibs.patch} (94%) rename msys2-runtime-3.3/{0034-POSIX-ify-the-SHELL-variable.patch => 0031-POSIX-ify-the-SHELL-variable.patch} (98%) rename msys2-runtime-3.3/{0035-Handle-ORIGINAL_PATH-just-like-PATH.patch => 0032-Handle-ORIGINAL_PATH-just-like-PATH.patch} (97%) rename msys2-runtime-3.3/{0036-uname-allow-setting-the-system-name-to-CYGWIN.patch => 0033-uname-allow-setting-the-system-name-to-CYGWIN.patch} (97%) rename msys2-runtime-3.3/{0037-fixup-Revert-Default-to-disable_pcon.patch => 0034-fixup-Revert-Default-to-disable_pcon.patch} (92%) rename msys2-runtime-3.3/{0038-Pass-environment-variables-with-empty-values.patch => 0035-Pass-environment-variables-with-empty-values.patch} (96%) rename msys2-runtime-3.3/{0039-Optionally-disallow-empty-environment-values-again.patch => 0036-Optionally-disallow-empty-environment-values-again.patch} (97%) rename msys2-runtime-3.3/{0040-build_env-respect-the-MSYS-environment-variable.patch => 0037-build_env-respect-the-MSYS-environment-variable.patch} (94%) rename msys2-runtime-3.3/{0041-Cygwin-pty-Fix-Bad-address-error-when-running-cmd.ex.patch => 0038-Cygwin-pty-Fix-Bad-address-error-when-running-cmd.ex.patch} (96%) rename msys2-runtime-3.3/{0043-When-converting-to-a-Unix-path-avoid-double-trailing.patch => 0039-When-converting-to-a-Unix-path-avoid-double-trailing.patch} (95%) rename msys2-runtime-3.3/{0044-amend-Special-case-for-converting-root-directory-to-.patch => 0040-amend-Special-case-for-converting-root-directory-to-.patch} (97%) rename msys2-runtime-3.3/{0045-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch => 0041-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch} (96%) rename msys2-runtime-3.3/{0046-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch => 0042-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch} (99%) delete mode 100644 msys2-runtime-3.3/0042-ci-avoid-using-Node.js-12-Actions.patch rename msys2-runtime-3.3/{0047-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch => 0043-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch} (95%) rename msys2-runtime-3.3/{0049-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch => 0044-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch} (96%) rename msys2-runtime-3.3/{0050-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch => 0045-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch} (94%) rename msys2-runtime-3.3/{0051-Cygwin-console-Fix-hangup-of-less-on-quit-after-the-.patch => 0046-Cygwin-console-Fix-hangup-of-less-on-quit-after-the-.patch} (96%) rename msys2-runtime-3.3/{0052-Adjust-CWD-magic-to-accommodate-for-the-latest-Windo.patch => 0047-Adjust-CWD-magic-to-accommodate-for-the-latest-Windo.patch} (96%) delete mode 100644 msys2-runtime-3.3/0048-CI-build-with-disable-dependency-tracking.patch rename msys2-runtime-3.3/{0054-fixup-Add-functionality-for-converting-UNIX-paths-in.patch => 0048-fixup-Add-functionality-for-converting-UNIX-paths-in.patch} (93%) rename msys2-runtime-3.3/{0055-fixup-Add-functionality-for-converting-UNIX-paths-in.patch => 0049-fixup-Add-functionality-for-converting-UNIX-paths-in.patch} (95%) rename msys2-runtime-3.3/{0056-nlsfuncs-work-around-an-overzealous-GCC-warning.patch => 0050-nlsfuncs-work-around-an-overzealous-GCC-warning.patch} (98%) rename msys2-runtime-3.3/{0057-Move-_cygheap_start-into-.cygheap-section.patch => 0051-Move-_cygheap_start-into-.cygheap-section.patch} (94%) rename msys2-runtime-3.3/{0058-Cygwin-dumper-also-link-with-libzstd-as-libbfd-may-r.patch => 0052-Cygwin-dumper-also-link-with-libzstd-as-libbfd-may-r.patch} (97%) delete mode 100644 msys2-runtime-3.3/0053-CI-fix-the-build-with-gcc-13.patch rename msys2-runtime-3.3/{0059-Cygwin-configure-Add-option-to-disable-building-dump.patch => 0053-Cygwin-configure-Add-option-to-disable-building-dump.patch} (96%) rename msys2-runtime-3.3/{0060-Work-around-fragile-include-in-binutils.patch => 0054-Work-around-fragile-include-in-binutils.patch} (97%) rename msys2-runtime-3.3/{0061-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch => 0055-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch} (97%) rename msys2-runtime-3.3/{0062-cygthread-suspend-thread-before-terminating.patch => 0056-cygthread-suspend-thread-before-terminating.patch} (98%) create mode 100644 msys2-runtime-3.3/0057-fixup-cygthread-suspend-thread-before-terminating.patch 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 deleted file mode 100644 index 74774b381d0..00000000000 --- a/msys2-runtime-3.3/0023-CI-add-a-GHA-for-doing-a-basic-build-test.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 69029b18df8090e071eb8a8c1446a532c0c71d0b Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sun, 9 Aug 2020 14:02:51 +0200 -Subject: [PATCH 23/N] CI: add a GHA for doing a basic build test - ---- - .github/workflows/build.yaml | 36 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - create mode 100644 .github/workflows/build.yaml - -diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml -new file mode 100644 -index 0000000..4e1d498 ---- /dev/null -+++ b/.github/workflows/build.yaml -@@ -0,0 +1,36 @@ -+name: build -+ -+on: [push, pull_request] -+ -+jobs: -+ build: -+ runs-on: windows-latest -+ -+ steps: -+ - name: Checkout code -+ uses: actions/checkout@v2 -+ -+ - name: setup-msys2 -+ uses: msys2/setup-msys2@v2 -+ with: -+ msystem: MSYS -+ update: true -+ install: msys2-devel base-devel autotools cocom diffutils gcc gettext-devel libiconv-devel make mingw-w64-cross-crt mingw-w64-cross-gcc mingw-w64-cross-zlib perl zlib-devel xmlto docbook-xsl -+ -+ - name: Build -+ shell: msys2 {0} -+ run: | -+ (cd winsup && ./autogen.sh) -+ ./configure -+ make -j8 -+ -+ - name: Install -+ shell: msys2 {0} -+ run: | -+ make DESTDIR="$(pwd)"/_dest install -+ -+ - name: Upload -+ uses: actions/upload-artifact@v2 -+ with: -+ name: install -+ path: _dest/ diff --git a/msys2-runtime-3.3/0025-Expose-full-command-lines-to-other-Win32-processes-b.patch b/msys2-runtime-3.3/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch similarity index 96% rename from msys2-runtime-3.3/0025-Expose-full-command-lines-to-other-Win32-processes-b.patch rename to msys2-runtime-3.3/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch index 3a9080472fd..85f58f240fd 100644 --- a/msys2-runtime-3.3/0025-Expose-full-command-lines-to-other-Win32-processes-b.patch +++ b/msys2-runtime-3.3/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch @@ -1,7 +1,7 @@ From b37c67a23018d626b4a4228f71c8eda2f6d96f77 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0027-Do-not-show-Error-dialogs-by-default.patch b/msys2-runtime-3.3/0024-Do-not-show-Error-dialogs-by-default.patch similarity index 97% rename from msys2-runtime-3.3/0027-Do-not-show-Error-dialogs-by-default.patch rename to msys2-runtime-3.3/0024-Do-not-show-Error-dialogs-by-default.patch index 55f1369f825..e80cdba6747 100644 --- a/msys2-runtime-3.3/0027-Do-not-show-Error-dialogs-by-default.patch +++ b/msys2-runtime-3.3/0024-Do-not-show-Error-dialogs-by-default.patch @@ -1,7 +1,7 @@ From c20ec3a443668ab7047a383958e1b2d9f687bbf0 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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 deleted file mode 100644 index 52854fab37e..00000000000 --- a/msys2-runtime-3.3/0024-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 51766aba40e36ad9527442410693a0fa282a5e77 Mon Sep 17 00:00:00 2001 -From: Johannes Schindelin -Date: Fri, 22 Nov 2019 11:20:22 +0100 -Subject: [PATCH 24/N] Set up a GitHub Action to keep in sync with Cygwin - -This will help us by automating an otherwise tedious task. - -Signed-off-by: Johannes Schindelin ---- - .github/workflows/sync-with-cygwin.yml | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - create mode 100644 .github/workflows/sync-with-cygwin.yml - -diff --git a/.github/workflows/sync-with-cygwin.yml b/.github/workflows/sync-with-cygwin.yml -new file mode 100644 -index 0000000..57bd30e ---- /dev/null -+++ b/.github/workflows/sync-with-cygwin.yml -@@ -0,0 +1,24 @@ -+name: sync-with-cygwin -+ -+# File: .github/workflows/repo-sync.yml -+ -+on: -+ workflow_dispatch: -+ schedule: -+ - cron: "42 * * * *" -+jobs: -+ repo-sync: -+ runs-on: ubuntu-latest -+ permissions: -+ contents: write -+ steps: -+ - name: Fetch Cygwin's latest master and tags -+ run: | -+ git init --bare -+ # Potentially use git://sourceware.org/git/newlib-cygwin.git directly, but GitHub seems more reliable -+ git fetch https://github.com/cygwin/cygwin master:refs/heads/cygwin/master 'refs/tags/*:refs/tags/*' -+ - name: Push to our fork -+ env: -+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -+ run: | -+ git push https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY refs/heads/cygwin/master 'refs/tags/*:refs/tags/*' diff --git a/msys2-runtime-3.3/0028-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch b/msys2-runtime-3.3/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch similarity index 99% rename from msys2-runtime-3.3/0028-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch rename to msys2-runtime-3.3/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch index e04efee4855..7a3888e0a79 100644 --- a/msys2-runtime-3.3/0028-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch +++ b/msys2-runtime-3.3/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch @@ -1,7 +1,7 @@ From 22f77091e940c4d404dd5478c31823745effe5a9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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 deleted file mode 100644 index f26658bf643..00000000000 --- a/msys2-runtime-3.3/0026-Disable-the-cygwin-GitHub-workflow.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 991789ad7a8e0dd65c2969c677a889cede8b37fe Mon Sep 17 00:00:00 2001 -From: Johannes Schindelin -Date: Wed, 17 Mar 2021 17:41:02 +0100 -Subject: [PATCH 26/N] Disable the 'cygwin' GitHub workflow - -It does not work at all. For example, `rpm -E %fedora` says that there -should be version 33 of rpmsphere at -https://github.com/rpmsphere/noarch/tree/master/r, but there is only -version 32. - -Another thing that is broken: Cygwin now assumes that a recent -mingw-w64-headers version is available, but Fedora apparently only -offers v7.0.0, which is definitely too old to accommodate for the -expectation of https://github.com/cygwin/cygwin/commit/c1f7c4d1b6d7. - -Signed-off-by: Johannes Schindelin ---- - .github/workflows/cygwin.yml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml -index f9a9a7a..4b541a8 100644 ---- a/.github/workflows/cygwin.yml -+++ b/.github/workflows/cygwin.yml -@@ -1,6 +1,6 @@ - name: cygwin - --on: push -+on: workflow_dispatch - - jobs: - fedora-build: diff --git a/msys2-runtime-3.3/0029-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch b/msys2-runtime-3.3/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch similarity index 99% rename from msys2-runtime-3.3/0029-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch rename to msys2-runtime-3.3/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch index 48698403560..53ff7090af4 100644 --- a/msys2-runtime-3.3/0029-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch +++ b/msys2-runtime-3.3/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch @@ -1,7 +1,7 @@ From be43d1330988ee93aa837c3f4610ef35a04349e8 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0030-kill-kill-Win32-processes-more-gently.patch b/msys2-runtime-3.3/0027-kill-kill-Win32-processes-more-gently.patch similarity index 96% rename from msys2-runtime-3.3/0030-kill-kill-Win32-processes-more-gently.patch rename to msys2-runtime-3.3/0027-kill-kill-Win32-processes-more-gently.patch index f696c6a3fb5..45e9d0d66c4 100644 --- a/msys2-runtime-3.3/0030-kill-kill-Win32-processes-more-gently.patch +++ b/msys2-runtime-3.3/0027-kill-kill-Win32-processes-more-gently.patch @@ -1,7 +1,7 @@ From 486c7601503c313c3fc3d84b1144064067754f2f Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0031-Cygwin-make-option-for-native-inner-link-handling.patch b/msys2-runtime-3.3/0028-Cygwin-make-option-for-native-inner-link-handling.patch similarity index 96% rename from msys2-runtime-3.3/0031-Cygwin-make-option-for-native-inner-link-handling.patch rename to msys2-runtime-3.3/0028-Cygwin-make-option-for-native-inner-link-handling.patch index 800c6c1b97f..72cad16a5bd 100644 --- a/msys2-runtime-3.3/0031-Cygwin-make-option-for-native-inner-link-handling.patch +++ b/msys2-runtime-3.3/0028-Cygwin-make-option-for-native-inner-link-handling.patch @@ -1,7 +1,7 @@ From aa9dbc9c9fc47ae4371d5847b358122eb1f54750 Mon Sep 17 00:00:00 2001 From: Jeremy Drake 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/msys2-runtime-3.3/0032-docs-skip-building-texinfo-and-PDF-files.patch b/msys2-runtime-3.3/0029-docs-skip-building-texinfo-and-PDF-files.patch similarity index 95% rename from msys2-runtime-3.3/0032-docs-skip-building-texinfo-and-PDF-files.patch rename to msys2-runtime-3.3/0029-docs-skip-building-texinfo-and-PDF-files.patch index 5f00c9c672b..1b319520827 100644 --- a/msys2-runtime-3.3/0032-docs-skip-building-texinfo-and-PDF-files.patch +++ b/msys2-runtime-3.3/0029-docs-skip-building-texinfo-and-PDF-files.patch @@ -1,7 +1,7 @@ From 20f59b414ff39195eb42bca7751ee3b4ae33f870 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0033-install-libs-depend-on-the-toollibs.patch b/msys2-runtime-3.3/0030-install-libs-depend-on-the-toollibs.patch similarity index 94% rename from msys2-runtime-3.3/0033-install-libs-depend-on-the-toollibs.patch rename to msys2-runtime-3.3/0030-install-libs-depend-on-the-toollibs.patch index 85d09e1fe06..8c664884f6e 100644 --- a/msys2-runtime-3.3/0033-install-libs-depend-on-the-toollibs.patch +++ b/msys2-runtime-3.3/0030-install-libs-depend-on-the-toollibs.patch @@ -1,7 +1,7 @@ From 31b5e84ef74da21c7a8f9fea5c7395154f1ae36b Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0034-POSIX-ify-the-SHELL-variable.patch b/msys2-runtime-3.3/0031-POSIX-ify-the-SHELL-variable.patch similarity index 98% rename from msys2-runtime-3.3/0034-POSIX-ify-the-SHELL-variable.patch rename to msys2-runtime-3.3/0031-POSIX-ify-the-SHELL-variable.patch index 53c66bb3002..fe9a32cce2d 100644 --- a/msys2-runtime-3.3/0034-POSIX-ify-the-SHELL-variable.patch +++ b/msys2-runtime-3.3/0031-POSIX-ify-the-SHELL-variable.patch @@ -1,7 +1,7 @@ From ae6fceff61edab2e97a3af6dcb2ded9a738c8bf0 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0035-Handle-ORIGINAL_PATH-just-like-PATH.patch b/msys2-runtime-3.3/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch similarity index 97% rename from msys2-runtime-3.3/0035-Handle-ORIGINAL_PATH-just-like-PATH.patch rename to msys2-runtime-3.3/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch index 0734ceb4b07..7f647c3b5c9 100644 --- a/msys2-runtime-3.3/0035-Handle-ORIGINAL_PATH-just-like-PATH.patch +++ b/msys2-runtime-3.3/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch @@ -1,7 +1,7 @@ From 7af6781845542e53a96def2997912f68537202e8 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0036-uname-allow-setting-the-system-name-to-CYGWIN.patch b/msys2-runtime-3.3/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch similarity index 97% rename from msys2-runtime-3.3/0036-uname-allow-setting-the-system-name-to-CYGWIN.patch rename to msys2-runtime-3.3/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch index 56a10b7ce51..917aca0d2ef 100644 --- a/msys2-runtime-3.3/0036-uname-allow-setting-the-system-name-to-CYGWIN.patch +++ b/msys2-runtime-3.3/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch @@ -1,7 +1,7 @@ From 1a5f889bdb136397b64e25311ad68c93806b3bea Mon Sep 17 00:00:00 2001 From: Christoph Reiter 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/msys2-runtime-3.3/0037-fixup-Revert-Default-to-disable_pcon.patch b/msys2-runtime-3.3/0034-fixup-Revert-Default-to-disable_pcon.patch similarity index 92% rename from msys2-runtime-3.3/0037-fixup-Revert-Default-to-disable_pcon.patch rename to msys2-runtime-3.3/0034-fixup-Revert-Default-to-disable_pcon.patch index 6fb38ac280e..d2dd1c2cb63 100644 --- a/msys2-runtime-3.3/0037-fixup-Revert-Default-to-disable_pcon.patch +++ b/msys2-runtime-3.3/0034-fixup-Revert-Default-to-disable_pcon.patch @@ -1,7 +1,7 @@ From f5d37650e7077d214ec5895b0175918863172086 Mon Sep 17 00:00:00 2001 From: Christoph Reiter 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/msys2-runtime-3.3/0038-Pass-environment-variables-with-empty-values.patch b/msys2-runtime-3.3/0035-Pass-environment-variables-with-empty-values.patch similarity index 96% rename from msys2-runtime-3.3/0038-Pass-environment-variables-with-empty-values.patch rename to msys2-runtime-3.3/0035-Pass-environment-variables-with-empty-values.patch index 4053637e23c..7d0ffce91f1 100644 --- a/msys2-runtime-3.3/0038-Pass-environment-variables-with-empty-values.patch +++ b/msys2-runtime-3.3/0035-Pass-environment-variables-with-empty-values.patch @@ -1,7 +1,7 @@ From 5812c2fb3534a9203cc110cc052fdae730920a3e Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0039-Optionally-disallow-empty-environment-values-again.patch b/msys2-runtime-3.3/0036-Optionally-disallow-empty-environment-values-again.patch similarity index 97% rename from msys2-runtime-3.3/0039-Optionally-disallow-empty-environment-values-again.patch rename to msys2-runtime-3.3/0036-Optionally-disallow-empty-environment-values-again.patch index ce556379f51..c4ceb64a024 100644 --- a/msys2-runtime-3.3/0039-Optionally-disallow-empty-environment-values-again.patch +++ b/msys2-runtime-3.3/0036-Optionally-disallow-empty-environment-values-again.patch @@ -1,7 +1,7 @@ From 96283acb9d8fe69bb921ee84c584bc79b1eb262f Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0040-build_env-respect-the-MSYS-environment-variable.patch b/msys2-runtime-3.3/0037-build_env-respect-the-MSYS-environment-variable.patch similarity index 94% rename from msys2-runtime-3.3/0040-build_env-respect-the-MSYS-environment-variable.patch rename to msys2-runtime-3.3/0037-build_env-respect-the-MSYS-environment-variable.patch index e31c0c86a45..a4d849e99ba 100644 --- a/msys2-runtime-3.3/0040-build_env-respect-the-MSYS-environment-variable.patch +++ b/msys2-runtime-3.3/0037-build_env-respect-the-MSYS-environment-variable.patch @@ -1,7 +1,7 @@ From 97c2d7fa8bb424012aad77b8d86f3262a35fab0a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0041-Cygwin-pty-Fix-Bad-address-error-when-running-cmd.ex.patch b/msys2-runtime-3.3/0038-Cygwin-pty-Fix-Bad-address-error-when-running-cmd.ex.patch similarity index 96% rename from msys2-runtime-3.3/0041-Cygwin-pty-Fix-Bad-address-error-when-running-cmd.ex.patch rename to msys2-runtime-3.3/0038-Cygwin-pty-Fix-Bad-address-error-when-running-cmd.ex.patch index 8a500392885..6ab67c1c870 100644 --- a/msys2-runtime-3.3/0041-Cygwin-pty-Fix-Bad-address-error-when-running-cmd.ex.patch +++ b/msys2-runtime-3.3/0038-Cygwin-pty-Fix-Bad-address-error-when-running-cmd.ex.patch @@ -1,7 +1,7 @@ From f975120d20d51ca11217e4abbf16cc51ab8c9290 Mon Sep 17 00:00:00 2001 From: Takashi Yano 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/msys2-runtime-3.3/0043-When-converting-to-a-Unix-path-avoid-double-trailing.patch b/msys2-runtime-3.3/0039-When-converting-to-a-Unix-path-avoid-double-trailing.patch similarity index 95% rename from msys2-runtime-3.3/0043-When-converting-to-a-Unix-path-avoid-double-trailing.patch rename to msys2-runtime-3.3/0039-When-converting-to-a-Unix-path-avoid-double-trailing.patch index 35519d6d152..84346d85031 100644 --- a/msys2-runtime-3.3/0043-When-converting-to-a-Unix-path-avoid-double-trailing.patch +++ b/msys2-runtime-3.3/0039-When-converting-to-a-Unix-path-avoid-double-trailing.patch @@ -1,7 +1,7 @@ From 1a46b7d8d3d3359db09a81f063711e4523aedb68 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0044-amend-Special-case-for-converting-root-directory-to-.patch b/msys2-runtime-3.3/0040-amend-Special-case-for-converting-root-directory-to-.patch similarity index 97% rename from msys2-runtime-3.3/0044-amend-Special-case-for-converting-root-directory-to-.patch rename to msys2-runtime-3.3/0040-amend-Special-case-for-converting-root-directory-to-.patch index 4402602801a..dcb9f425bdd 100644 --- a/msys2-runtime-3.3/0044-amend-Special-case-for-converting-root-directory-to-.patch +++ b/msys2-runtime-3.3/0040-amend-Special-case-for-converting-root-directory-to-.patch @@ -1,7 +1,7 @@ From 358b4547f7c159ca544a24938aca350b3aac84dd Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0045-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch b/msys2-runtime-3.3/0041-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch similarity index 96% rename from msys2-runtime-3.3/0045-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch rename to msys2-runtime-3.3/0041-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch index f226dbeeb15..7e603463d03 100644 --- a/msys2-runtime-3.3/0045-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch +++ b/msys2-runtime-3.3/0041-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch @@ -1,7 +1,7 @@ From 68060d237a33743ce94c6c74a39475acfcfaa965 Mon Sep 17 00:00:00 2001 From: Christoph Reiter 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/msys2-runtime-3.3/0046-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch b/msys2-runtime-3.3/0042-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch similarity index 99% rename from msys2-runtime-3.3/0046-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch rename to msys2-runtime-3.3/0042-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch index 064df159aa2..d6af73de87f 100644 --- a/msys2-runtime-3.3/0046-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch +++ b/msys2-runtime-3.3/0042-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch @@ -1,7 +1,7 @@ From e2ac480feee393e77b002f88f2c957e19d44fe0d Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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 deleted file mode 100644 index 2bc331503aa..00000000000 --- a/msys2-runtime-3.3/0042-ci-avoid-using-Node.js-12-Actions.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 205042e70b50cdd688b3891cca53c90859597df6 Mon Sep 17 00:00:00 2001 -From: Johannes Schindelin -Date: Tue, 8 Nov 2022 17:05:57 +0100 -Subject: [PATCH 42/N] ci: avoid using Node.js 12 Actions - -As mentioned in -https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ -GitHub workflows should avoid using Actions that use Node.js 12 and -instead upgrade to versions of those Actions that use Node.js 16. - -So let's do that. - -Signed-off-by: Johannes Schindelin ---- - .github/workflows/build.yaml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml -index 4e1d498..5069dbd 100644 ---- a/.github/workflows/build.yaml -+++ b/.github/workflows/build.yaml -@@ -8,7 +8,7 @@ jobs: - - steps: - - name: Checkout code -- uses: actions/checkout@v2 -+ uses: actions/checkout@v3 - - - name: setup-msys2 - uses: msys2/setup-msys2@v2 -@@ -30,7 +30,7 @@ jobs: - make DESTDIR="$(pwd)"/_dest install - - - name: Upload -- uses: actions/upload-artifact@v2 -+ uses: actions/upload-artifact@v3 - with: - name: install - path: _dest/ diff --git a/msys2-runtime-3.3/0047-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch b/msys2-runtime-3.3/0043-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch similarity index 95% rename from msys2-runtime-3.3/0047-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch rename to msys2-runtime-3.3/0043-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch index 927230a89b9..8a1c5626fed 100644 --- a/msys2-runtime-3.3/0047-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch +++ b/msys2-runtime-3.3/0043-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch @@ -1,7 +1,7 @@ From 5f8eaff6c86f890ec2fcc366d4d7b9b7050e6bc2 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0049-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch b/msys2-runtime-3.3/0044-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch similarity index 96% rename from msys2-runtime-3.3/0049-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch rename to msys2-runtime-3.3/0044-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch index 8a1e9885ada..24d0de46ace 100644 --- a/msys2-runtime-3.3/0049-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch +++ b/msys2-runtime-3.3/0044-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch @@ -1,7 +1,7 @@ From c86ff309dd42a57dc2f1113b1266e36c01b8c97f Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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/msys2-runtime-3.3/0050-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch b/msys2-runtime-3.3/0045-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch similarity index 94% rename from msys2-runtime-3.3/0050-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch rename to msys2-runtime-3.3/0045-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch index 9ea46836955..e877caf1ffa 100644 --- a/msys2-runtime-3.3/0050-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch +++ b/msys2-runtime-3.3/0045-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch @@ -1,7 +1,7 @@ From 788b777bdf938e38355ae19b22a9b6907046a24f Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath 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/msys2-runtime-3.3/0051-Cygwin-console-Fix-hangup-of-less-on-quit-after-the-.patch b/msys2-runtime-3.3/0046-Cygwin-console-Fix-hangup-of-less-on-quit-after-the-.patch similarity index 96% rename from msys2-runtime-3.3/0051-Cygwin-console-Fix-hangup-of-less-on-quit-after-the-.patch rename to msys2-runtime-3.3/0046-Cygwin-console-Fix-hangup-of-less-on-quit-after-the-.patch index 019b6ed322f..7f65be3d714 100644 --- a/msys2-runtime-3.3/0051-Cygwin-console-Fix-hangup-of-less-on-quit-after-the-.patch +++ b/msys2-runtime-3.3/0046-Cygwin-console-Fix-hangup-of-less-on-quit-after-the-.patch @@ -1,7 +1,7 @@ From 8148ef7547f1fb8394810f9e24a28ebd2c83a375 Mon Sep 17 00:00:00 2001 From: Takashi Yano 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/msys2-runtime-3.3/0052-Adjust-CWD-magic-to-accommodate-for-the-latest-Windo.patch b/msys2-runtime-3.3/0047-Adjust-CWD-magic-to-accommodate-for-the-latest-Windo.patch similarity index 96% rename from msys2-runtime-3.3/0052-Adjust-CWD-magic-to-accommodate-for-the-latest-Windo.patch rename to msys2-runtime-3.3/0047-Adjust-CWD-magic-to-accommodate-for-the-latest-Windo.patch index 4baceb611c9..ed43d402413 100644 --- a/msys2-runtime-3.3/0052-Adjust-CWD-magic-to-accommodate-for-the-latest-Windo.patch +++ b/msys2-runtime-3.3/0047-Adjust-CWD-magic-to-accommodate-for-the-latest-Windo.patch @@ -1,7 +1,7 @@ From b00763c145a60347e6cb41a1b5876e08e09887a7 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin 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 diff --git a/msys2-runtime-3.3/0048-CI-build-with-disable-dependency-tracking.patch b/msys2-runtime-3.3/0048-CI-build-with-disable-dependency-tracking.patch deleted file mode 100644 index 5777764c96d..00000000000 --- a/msys2-runtime-3.3/0048-CI-build-with-disable-dependency-tracking.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 91dcbe36f2fbeadc96362c7ad28c18eca90c44e6 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Wed, 29 Mar 2023 10:52:43 +0200 -Subject: [PATCH 48/N] CI: build with --disable-dependency-tracking - -We only build once in CI, so dependency tracking isn't needed. -This saves 3-4 minutes in CI. ---- - .github/workflows/build.yaml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml -index 5069dbd..1775bb9 100644 ---- a/.github/workflows/build.yaml -+++ b/.github/workflows/build.yaml -@@ -21,7 +21,7 @@ jobs: - shell: msys2 {0} - run: | - (cd winsup && ./autogen.sh) -- ./configure -+ ./configure --disable-dependency-tracking - make -j8 - - - name: Install diff --git a/msys2-runtime-3.3/0054-fixup-Add-functionality-for-converting-UNIX-paths-in.patch b/msys2-runtime-3.3/0048-fixup-Add-functionality-for-converting-UNIX-paths-in.patch similarity index 93% rename from msys2-runtime-3.3/0054-fixup-Add-functionality-for-converting-UNIX-paths-in.patch rename to msys2-runtime-3.3/0048-fixup-Add-functionality-for-converting-UNIX-paths-in.patch index 31ca3006036..497a4c84caf 100644 --- a/msys2-runtime-3.3/0054-fixup-Add-functionality-for-converting-UNIX-paths-in.patch +++ b/msys2-runtime-3.3/0048-fixup-Add-functionality-for-converting-UNIX-paths-in.patch @@ -1,7 +1,7 @@ From b9149f75436c8a912e3edbcae9f66324e596f151 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 21 Nov 2023 09:24:03 +0100 -Subject: [PATCH 54/N] fixup! Add functionality for converting UNIX paths in +Subject: [PATCH 48/N] fixup! Add functionality for converting UNIX paths in arguments and environment variables to Windows form for native Win32 applications. diff --git a/msys2-runtime-3.3/0055-fixup-Add-functionality-for-converting-UNIX-paths-in.patch b/msys2-runtime-3.3/0049-fixup-Add-functionality-for-converting-UNIX-paths-in.patch similarity index 95% rename from msys2-runtime-3.3/0055-fixup-Add-functionality-for-converting-UNIX-paths-in.patch rename to msys2-runtime-3.3/0049-fixup-Add-functionality-for-converting-UNIX-paths-in.patch index 4d8f41605d2..34df24db67f 100644 --- a/msys2-runtime-3.3/0055-fixup-Add-functionality-for-converting-UNIX-paths-in.patch +++ b/msys2-runtime-3.3/0049-fixup-Add-functionality-for-converting-UNIX-paths-in.patch @@ -1,7 +1,7 @@ From 6a4927f2daba82f3a08ffb68c342394a33e68944 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 21 Nov 2023 09:25:58 +0100 -Subject: [PATCH 55/N] fixup! Add functionality for converting UNIX paths in +Subject: [PATCH 49/N] fixup! Add functionality for converting UNIX paths in arguments and environment variables to Windows form for native Win32 applications. diff --git a/msys2-runtime-3.3/0056-nlsfuncs-work-around-an-overzealous-GCC-warning.patch b/msys2-runtime-3.3/0050-nlsfuncs-work-around-an-overzealous-GCC-warning.patch similarity index 98% rename from msys2-runtime-3.3/0056-nlsfuncs-work-around-an-overzealous-GCC-warning.patch rename to msys2-runtime-3.3/0050-nlsfuncs-work-around-an-overzealous-GCC-warning.patch index e97c800deca..ff1472688ae 100644 --- a/msys2-runtime-3.3/0056-nlsfuncs-work-around-an-overzealous-GCC-warning.patch +++ b/msys2-runtime-3.3/0050-nlsfuncs-work-around-an-overzealous-GCC-warning.patch @@ -1,7 +1,7 @@ From 3cba82a63c4f3a8c10565ab531fb64a5d2117474 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 25 Nov 2023 02:25:00 +0100 -Subject: [PATCH 56/N] nlsfuncs: work around an overzealous GCC warning +Subject: [PATCH 50/N] nlsfuncs: work around an overzealous GCC warning GCC 13 (and maybe 12, too), warn about pointers used after `free()`. diff --git a/msys2-runtime-3.3/0057-Move-_cygheap_start-into-.cygheap-section.patch b/msys2-runtime-3.3/0051-Move-_cygheap_start-into-.cygheap-section.patch similarity index 94% rename from msys2-runtime-3.3/0057-Move-_cygheap_start-into-.cygheap-section.patch rename to msys2-runtime-3.3/0051-Move-_cygheap_start-into-.cygheap-section.patch index 94823dc19c2..ace128e7f83 100644 --- a/msys2-runtime-3.3/0057-Move-_cygheap_start-into-.cygheap-section.patch +++ b/msys2-runtime-3.3/0051-Move-_cygheap_start-into-.cygheap-section.patch @@ -1,7 +1,7 @@ From 1f3be1e79303711927bf7462625a7522ef57a3d9 Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Tue, 20 Feb 2024 10:18:56 -0800 -Subject: [PATCH 57/N] Move _cygheap_start into .cygheap section. +Subject: [PATCH 51/N] Move _cygheap_start into .cygheap section. Binutils >= 2.41 started making .rsrc section read-only, which caused memset(_cygheap_start, ...) to segfault. Instead, put _cygheap_start in diff --git a/msys2-runtime-3.3/0058-Cygwin-dumper-also-link-with-libzstd-as-libbfd-may-r.patch b/msys2-runtime-3.3/0052-Cygwin-dumper-also-link-with-libzstd-as-libbfd-may-r.patch similarity index 97% rename from msys2-runtime-3.3/0058-Cygwin-dumper-also-link-with-libzstd-as-libbfd-may-r.patch rename to msys2-runtime-3.3/0052-Cygwin-dumper-also-link-with-libzstd-as-libbfd-may-r.patch index ac95abd8ad3..1e0bf4eb5ac 100644 --- a/msys2-runtime-3.3/0058-Cygwin-dumper-also-link-with-libzstd-as-libbfd-may-r.patch +++ b/msys2-runtime-3.3/0052-Cygwin-dumper-also-link-with-libzstd-as-libbfd-may-r.patch @@ -1,7 +1,7 @@ From 69e4fbea86b07a7960c1fd98b0e17bd5bdb4d2b8 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 14 Feb 2023 13:52:39 +0000 -Subject: [PATCH 58/N] Cygwin: dumper: also link with libzstd, as libbfd may +Subject: [PATCH 52/N] Cygwin: dumper: also link with libzstd, as libbfd may require it Also allow that linkage to be dynamic, as libzstd-devel doesn't diff --git a/msys2-runtime-3.3/0053-CI-fix-the-build-with-gcc-13.patch b/msys2-runtime-3.3/0053-CI-fix-the-build-with-gcc-13.patch deleted file mode 100644 index 8696b647d6f..00000000000 --- a/msys2-runtime-3.3/0053-CI-fix-the-build-with-gcc-13.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 99b8001f7d6456cddd4db254016321e4e9449353 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Fri, 10 Nov 2023 15:31:10 +0100 -Subject: [PATCH 53/N] CI: fix the build with gcc 13 - ---- - .github/workflows/build.yaml | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml -index 1775bb9..f89cfcb 100644 ---- a/.github/workflows/build.yaml -+++ b/.github/workflows/build.yaml -@@ -20,6 +20,11 @@ jobs: - - name: Build - shell: msys2 {0} - run: | -+ # XXX: cygwin still uses gcc v11 so we get new warnings with v13, -+ # resulting in errors. We can't selectively disable warnigns since our -+ # cross compiler is also too old and doesn't understand the new -+ # warning flags, so we need to disable all errors for now. -+ export CXXFLAGS="-Wno-error -Wno-narrowing" - (cd winsup && ./autogen.sh) - ./configure --disable-dependency-tracking - make -j8 diff --git a/msys2-runtime-3.3/0059-Cygwin-configure-Add-option-to-disable-building-dump.patch b/msys2-runtime-3.3/0053-Cygwin-configure-Add-option-to-disable-building-dump.patch similarity index 96% rename from msys2-runtime-3.3/0059-Cygwin-configure-Add-option-to-disable-building-dump.patch rename to msys2-runtime-3.3/0053-Cygwin-configure-Add-option-to-disable-building-dump.patch index 92751b37771..b4347993593 100644 --- a/msys2-runtime-3.3/0059-Cygwin-configure-Add-option-to-disable-building-dump.patch +++ b/msys2-runtime-3.3/0053-Cygwin-configure-Add-option-to-disable-building-dump.patch @@ -1,7 +1,7 @@ From de1cae81d52a9f011a72e36d45e28b4066d4cb68 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 13 Dec 2022 23:17:48 +0000 -Subject: [PATCH 59/N] Cygwin: configure: Add option to disable building +Subject: [PATCH 53/N] Cygwin: configure: Add option to disable building 'dumper' Rather than guessing, based on just the presence of libbfd, add an diff --git a/msys2-runtime-3.3/0060-Work-around-fragile-include-in-binutils.patch b/msys2-runtime-3.3/0054-Work-around-fragile-include-in-binutils.patch similarity index 97% rename from msys2-runtime-3.3/0060-Work-around-fragile-include-in-binutils.patch rename to msys2-runtime-3.3/0054-Work-around-fragile-include-in-binutils.patch index 98b04313465..d7012688278 100644 --- a/msys2-runtime-3.3/0060-Work-around-fragile-include-in-binutils.patch +++ b/msys2-runtime-3.3/0054-Work-around-fragile-include-in-binutils.patch @@ -1,7 +1,7 @@ From 5d96b10d53d19eeba5326a0c0bc2387a93c7c6ef Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 2 Feb 2024 13:40:28 +0100 -Subject: [PATCH 60/N] Work around fragile `#include` in binutils +Subject: [PATCH 54/N] Work around fragile `#include` in binutils MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/msys2-runtime-3.3/0061-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch b/msys2-runtime-3.3/0055-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch similarity index 97% rename from msys2-runtime-3.3/0061-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch rename to msys2-runtime-3.3/0055-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch index 66c42414716..2bce2e14414 100644 --- a/msys2-runtime-3.3/0061-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch +++ b/msys2-runtime-3.3/0055-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch @@ -1,7 +1,7 @@ From bb6258c2ba359726cdffc268bf1d1f14f9c68037 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 13 Feb 2024 16:47:51 +0100 -Subject: [PATCH 61/N] Cygwin: find_fast_cwd: don't run assembler checking +Subject: [PATCH 55/N] Cygwin: find_fast_cwd: don't run assembler checking code on ARM64 https://cygwin.com/pipermail/cygwin/2024-February/255397.html diff --git a/msys2-runtime-3.3/0062-cygthread-suspend-thread-before-terminating.patch b/msys2-runtime-3.3/0056-cygthread-suspend-thread-before-terminating.patch similarity index 98% rename from msys2-runtime-3.3/0062-cygthread-suspend-thread-before-terminating.patch rename to msys2-runtime-3.3/0056-cygthread-suspend-thread-before-terminating.patch index 25e856c6dec..a720d716504 100644 --- a/msys2-runtime-3.3/0062-cygthread-suspend-thread-before-terminating.patch +++ b/msys2-runtime-3.3/0056-cygthread-suspend-thread-before-terminating.patch @@ -1,7 +1,7 @@ From 32c179db9db373b1278f64bcba6ec7e059500a01 Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Mon, 11 Nov 2024 20:09:49 -0800 -Subject: [PATCH 62/N] cygthread: suspend thread before terminating. +Subject: [PATCH 56/N] cygthread: suspend thread before terminating. This addresses an extremely difficult to debug deadlock when running under emulation on ARM64. diff --git a/msys2-runtime-3.3/0057-fixup-cygthread-suspend-thread-before-terminating.patch b/msys2-runtime-3.3/0057-fixup-cygthread-suspend-thread-before-terminating.patch new file mode 100644 index 00000000000..c9f3cbecfc6 --- /dev/null +++ b/msys2-runtime-3.3/0057-fixup-cygthread-suspend-thread-before-terminating.patch @@ -0,0 +1,33 @@ +From 41e8b455d7e73ac05ca051bf114f7fa36ef5f0fe Mon Sep 17 00:00:00 2001 +From: Jeremy Drake +Date: Wed, 13 Nov 2024 15:13:04 -0800 +Subject: [PATCH 57/N] fixup! cygthread: suspend thread before terminating. + +Suppress error output if ReadFile on child wait pipe returns +ERROR_OPERATION_ABORTED due to addition of CancelSynchronousIo call. +--- + winsup/cygwin/pinfo.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc +index dcd0285..5d148e9 100644 +--- a/winsup/cygwin/pinfo.cc ++++ b/winsup/cygwin/pinfo.cc +@@ -1210,13 +1210,14 @@ proc_waiter (void *arg) + + for (;;) + { +- DWORD nb; ++ DWORD nb, err; + char buf = '\0'; + + if (!ReadFile (vchild.rd_proc_pipe, &buf, 1, &nb, NULL) +- && GetLastError () != ERROR_BROKEN_PIPE) ++ && (err = GetLastError ()) != ERROR_BROKEN_PIPE) + { +- system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe); ++ if (err != ERROR_OPERATION_ABORTED) ++ system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe); + break; + } + diff --git a/msys2-runtime-3.3/PKGBUILD b/msys2-runtime-3.3/PKGBUILD index 55fd12722f4..f3b96267403 100644 --- a/msys2-runtime-3.3/PKGBUILD +++ b/msys2-runtime-3.3/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=msys2-runtime-3.3 pkgname=('msys2-runtime-3.3' 'msys2-runtime-3.3-devel') pkgver=3.3.6 -pkgrel=10 +pkgrel=11 pkgdesc="Cygwin POSIX emulation engine" arch=('i686' 'x86_64') url="https://www.cygwin.com/" @@ -51,46 +51,41 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$ 0020-Default-to-disable_pcon.patch 0021-Introduce-the-enable_pcon-value-for-MSYS.patch 0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch - 0023-CI-add-a-GHA-for-doing-a-basic-build-test.patch - 0024-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch - 0025-Expose-full-command-lines-to-other-Win32-processes-b.patch - 0026-Disable-the-cygwin-GitHub-workflow.patch - 0027-Do-not-show-Error-dialogs-by-default.patch - 0028-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch - 0029-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch - 0030-kill-kill-Win32-processes-more-gently.patch - 0031-Cygwin-make-option-for-native-inner-link-handling.patch - 0032-docs-skip-building-texinfo-and-PDF-files.patch - 0033-install-libs-depend-on-the-toollibs.patch - 0034-POSIX-ify-the-SHELL-variable.patch - 0035-Handle-ORIGINAL_PATH-just-like-PATH.patch - 0036-uname-allow-setting-the-system-name-to-CYGWIN.patch - 0037-fixup-Revert-Default-to-disable_pcon.patch - 0038-Pass-environment-variables-with-empty-values.patch - 0039-Optionally-disallow-empty-environment-values-again.patch - 0040-build_env-respect-the-MSYS-environment-variable.patch - 0041-Cygwin-pty-Fix-Bad-address-error-when-running-cmd.ex.patch - 0042-ci-avoid-using-Node.js-12-Actions.patch - 0043-When-converting-to-a-Unix-path-avoid-double-trailing.patch - 0044-amend-Special-case-for-converting-root-directory-to-.patch - 0045-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch - 0046-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch - 0047-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch - 0048-CI-build-with-disable-dependency-tracking.patch - 0049-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch - 0050-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch - 0051-Cygwin-console-Fix-hangup-of-less-on-quit-after-the-.patch - 0052-Adjust-CWD-magic-to-accommodate-for-the-latest-Windo.patch - 0053-CI-fix-the-build-with-gcc-13.patch - 0054-fixup-Add-functionality-for-converting-UNIX-paths-in.patch - 0055-fixup-Add-functionality-for-converting-UNIX-paths-in.patch - 0056-nlsfuncs-work-around-an-overzealous-GCC-warning.patch - 0057-Move-_cygheap_start-into-.cygheap-section.patch - 0058-Cygwin-dumper-also-link-with-libzstd-as-libbfd-may-r.patch - 0059-Cygwin-configure-Add-option-to-disable-building-dump.patch - 0060-Work-around-fragile-include-in-binutils.patch - 0061-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch - 0062-cygthread-suspend-thread-before-terminating.patch) + 0023-Expose-full-command-lines-to-other-Win32-processes-b.patch + 0024-Do-not-show-Error-dialogs-by-default.patch + 0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch + 0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch + 0027-kill-kill-Win32-processes-more-gently.patch + 0028-Cygwin-make-option-for-native-inner-link-handling.patch + 0029-docs-skip-building-texinfo-and-PDF-files.patch + 0030-install-libs-depend-on-the-toollibs.patch + 0031-POSIX-ify-the-SHELL-variable.patch + 0032-Handle-ORIGINAL_PATH-just-like-PATH.patch + 0033-uname-allow-setting-the-system-name-to-CYGWIN.patch + 0034-fixup-Revert-Default-to-disable_pcon.patch + 0035-Pass-environment-variables-with-empty-values.patch + 0036-Optionally-disallow-empty-environment-values-again.patch + 0037-build_env-respect-the-MSYS-environment-variable.patch + 0038-Cygwin-pty-Fix-Bad-address-error-when-running-cmd.ex.patch + 0039-When-converting-to-a-Unix-path-avoid-double-trailing.patch + 0040-amend-Special-case-for-converting-root-directory-to-.patch + 0041-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch + 0042-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch + 0043-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch + 0044-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch + 0045-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch + 0046-Cygwin-console-Fix-hangup-of-less-on-quit-after-the-.patch + 0047-Adjust-CWD-magic-to-accommodate-for-the-latest-Windo.patch + 0048-fixup-Add-functionality-for-converting-UNIX-paths-in.patch + 0049-fixup-Add-functionality-for-converting-UNIX-paths-in.patch + 0050-nlsfuncs-work-around-an-overzealous-GCC-warning.patch + 0051-Move-_cygheap_start-into-.cygheap-section.patch + 0052-Cygwin-dumper-also-link-with-libzstd-as-libbfd-may-r.patch + 0053-Cygwin-configure-Add-option-to-disable-building-dump.patch + 0054-Work-around-fragile-include-in-binutils.patch + 0055-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch + 0056-cygthread-suspend-thread-before-terminating.patch + 0057-fixup-cygthread-suspend-thread-before-terminating.patch) sha256sums=('1495f90ffd49a3ef4835a879881fa5dbb28dc6aa3ee55be3c4327bbab471e9b8' 'c375315e58181ee5589b7966101aa095de3f864a579c3c3f0f0683595d4e428d' '01ea2b131cf5a3b27fdbc458019eac14e45a36782ce3ce33e62328eefcd2d02e' @@ -114,46 +109,41 @@ sha256sums=('1495f90ffd49a3ef4835a879881fa5dbb28dc6aa3ee55be3c4327bbab471e9b8' 'cee973f136152e6a5cd987bba85937584c9459aff1c2777134a99526b2d5512d' '221dacc354d4f27443665bfe32b114235ef7305c55c9189c77f636c46522ee80' 'bd985989895e51688072d7751976ecb83720c8e0786126d7025ba355b64f6edc' - '0f9e96fab22bb5ea0d4d6dc4a943ab56f28c0dab675e57a75b892c491d51808b' - '61a9684bde1165f4afbf1ace3ddb873e6c8cc92e65930aff0c45e20b4d12a86a' - 'a02f701e524e0508149e3f16296db4f76382482ff114b170a1cc136d3ad65b2d' - '205a6b56ab3bfa9209c3c1f89aac1491a75b6700e7656252f9afd84800bb3bc1' - '8f817df7130fdec6477a69ba77394183c0dd7d8c2edb133b680f3be542e2896f' - '5e7661cb53a050bc5470ea2d749d5e7524b02ae89dc929d17a9272508ddc6d4c' - '13bbe25b3b60791b327163109e697ba160a70f58d13684aa52ab9bac00d5a555' - '0b2c75b5f7e04c479d0a5ec7170e430e641b5449aa24232b5c3f073767a8fdbc' - '53e11ea902756768f8601fa243ed6602b54c30df514a652c0d8e15de245a46c3' - '1f03ce6418812425494695290711b7076c8678aeca36b2683ef0ec1875d1e0c3' - '25c1e568b9f03772ca7a1bce1c90b6a9e22d49e15b7b372a0921dcd0e66c98d2' - 'bf0ff70c2ee6a4b9db7ed52154f5ba02d4a1d92cbfc2618ac86723c49156034f' - '658ee069e968c7def37300bb7058bb17cd6e079eb789fe86b3af0fe1ae86a4cb' - '59836bc012a3cf8dd245615f4cbeb4c3cb141434a30226c5e9647f265b589faf' - 'de0e56d2f01f02f1d4014cade92b4c78a90fb85f2409846a932b57b3c6d0b213' - '30a3f2c7fba69aa9942f18f98c4289a8d89d6a6187f84a57895dbaa65f54d30e' - 'fcf8caa3cab42f0ea228b8e3213238ce2354f13dea27289c6899b0a209ffd204' - '0e5ba38fa125822330b1842d487aee78126bf7ea503eb1fe970440cf1504f25f' - 'd5f6913d0d1439973a3687b3ef8948b6859ec302c0f810e9343c7e44f9146176' - '65af62e9ca7870930b5d2b673f8eadfe3ce72c9672b8554790bd7dc65c0039dd' - '6d062c34feca04b5dbd38273f8bb7d270947a368ade550fdfc8b11f0daa1a17c' - '0454442f2ad3312df83ec86bf872b5ad0bc1c014ed13dad1fbac7dd8e8de8f7a' - '61276aec4c9b7132487fd1d91e6c5991a24909f24a6de0312f62f1f99608e9c0' - '202f3aaf82e001f7972d5d73152c424858d193108372453a52dbe6ab05b08922' - '5647a4675b1f1f7c0a221f077d1d892c3e6bdb0635b2b23563838fe8ebfe0637' - 'c209bb6147094390e71d024367859f04e112eb2c90cbb289b24c4903224b2ae8' - '5e690151d40a180138e198b19200b2e9840a9d4510da21896b027dc6b8e47f7d' - 'b37dbd1f70b3843a9917d4ec19bb57b1003893ccba79bbc5881ef3753838d8e4' - '37019d648c72147173a847212d77241d3a9e6e4ae458f50587f60106a761061e' - '9b0e31682c86d4f61677413f7a536bed04d631471d009dd4351c53e0b2f5c9e5' - '8024edf0bcce8900061fae947bb46b4c3fbdea09d327a3c6048e0af292c8e991' - 'bf366ac49fb1c4e9d6d16eb38267cf04cf12a1ca510bd7d1ddfc0b834146c295' - '168025561b2d0150e40509bd028545dc0e7af4ae1dbca7aa9b8f37da801e37e3' - '6d985b7f92307cbe376af31fa1fc8010e2dc56e1354938b13423d4da06bc1d6c' - '658288b4dc8306fc56bfd37b32326cf9d05aba1960205c4ba73821c0341a56f9' - '1cdf4bff5af6b71c0710e608439f5fda3a097a895a565ad4c2542f301c108d3b' - '66193f7b677f46edfba8d054365d58a79b5f141354c9614adb788f89a7360d53' - 'b6a286617f1c3278c2303db8e0bc7d94c455e1fb47e8bb8fd55aa9c5f477ccf0' - '4034d57ac610d860e79dd61893057a7fde32eecef094ed75e4cd715bcfa40728' - 'e9aac8ae9d1a6f035f1d64a968f0f295fe112c3cdbf354d1f5ac3e2e941c56e5') + '19cf0b89327e148763d19608cffbbc29fd4309048a65ede9dff808eea4858727' + '20d35886e3bf1c2f4fa7f3996739d674fd0eb26be357268219c522c35187ec3e' + 'ff01c5404f80dd4d013316930f26063877f561c8698a1223269cf06f0df56d16' + '6c249925a88679544572fb4810119e008bb47ae2412cd261b02c786ee1c93dc4' + '3fd1c68bc249d52bb464390f2f0c5f1401882cc179f2b6f4adfb4e4b496804d9' + 'c7ab2e59d4ff4016dd3336bf34f79a71a28ba892e6b6a005b618519071496db8' + '8a2b9b9ae1d376d2868967cb64a804d1ee2f6075b9a9b2747570e3da2c816d1e' + '00096872abc028236ebec61fba79483159b88b4f8fe7217026d9371a69dd7d0f' + '611f6d4835e9c1525448dc85bb62fced7375fc13d42379d448d8e15ada0f4f4a' + 'a2eb84544c7e4ccd73d2388a80d04d4fa9e4bc26d77815d134f56ab44c4589e5' + 'a84b205133f13ed41b154198c0ea60875bddb523711e77a870954b17eb2636de' + '1681880728535c3057ebe0326031a68cac077bbef4fbf15f50aa0a29b3d965cf' + 'd8418588d9bf4c3bbf6d354e2fb126acebc6351aecf74b1f762b5c4ea22b6e46' + 'efced6714a787dd2f482ac9e96d7c72bed2d794642b32b1bf7d6e2d614a9d8fb' + 'dfd1e3ea9638665a9b4c851da8d43d4d5555050e5acbc2be99705bfec46653d1' + '675dc4d1aa6a7c10e67aa33e5886d3cb2c32afe509b58b94bd170f61798a1d27' + 'b62d3609d57c18e9ded3d538326d9637ce1fe09188ed9d319145addb853274fd' + 'c9867ef9adea4146e5da4458bdd41ea911692ea14543c06623ed44ede63f1e81' + 'a703c6e4cd69df18e39c9043632523809b33ac9ed32c9724cdc72d20a06b25bb' + 'bd6db82cfa9c5be1ce990fb2af002f46c0991478bb0b829011ccb55341112450' + '66837166b7094d8ec61d60fca43b6b852907de71aaf3593cbd024e4a6fe750a7' + 'a500aa443bb23c3b8cbb3dc8439e36249246894e031bca855dbde32add55a187' + 'ce0bb0bb681de79411b86c8cb1230583ad0af101a341739f1e0d1d72a9af5672' + '9581f3b95c9fcaf6f9d47e98e801be778e05124088e61afa4434b6fbdaf9c185' + '43b9f4304956b92ae62489e37d26af5ebb05e51e39c3254d7750cc6a29baccb7' + '40d9cb8d0c492bf54532b6b2aae559970cb2aa9159a4be58161b1e682d51e3b4' + '1a716d94cc8c65d7774d7f2d2d666d8ed4e694ad9c6d23479bf3efb2fa176362' + 'a799ad2c2225e917df782ef59be4a7ed6f4a9aaafea1ff3ba58721229fce6eff' + 'df54b846ad2a0583a7d52aef4ed8bb4c4183fdd9e99108b8c15a960e677daca0' + '96d51768fd4c1814b0ba4c104b4b0fcfe560ab9a2402fd0939098b31df8000a4' + 'c27c0267d45a85e14dc970b29e09c417ae44700f867b1af017debb91b685421f' + 'd5cc90aa4cba718892439f7c67276c77c718ecfb5be691b7438ce55e16557270' + '2d5a808bfa9b0c5c2e055552829d960aa3e6197592b8c51e5558de9de51ed87f' + '67a060066f26446f21e08c8fed4fc855529b6e786f0789c9b5385881026d3fd0' + 'f4e2a1595e7fe9bdceb17f7e909d6eb51b7a8d3f1a2d0b2ad938e2127308d9b4') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -213,46 +203,41 @@ prepare() { 0020-Default-to-disable_pcon.patch \ 0021-Introduce-the-enable_pcon-value-for-MSYS.patch \ 0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch \ - 0023-CI-add-a-GHA-for-doing-a-basic-build-test.patch \ - 0024-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch \ - 0025-Expose-full-command-lines-to-other-Win32-processes-b.patch \ - 0026-Disable-the-cygwin-GitHub-workflow.patch \ - 0027-Do-not-show-Error-dialogs-by-default.patch \ - 0028-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch \ - 0029-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch \ - 0030-kill-kill-Win32-processes-more-gently.patch \ - 0031-Cygwin-make-option-for-native-inner-link-handling.patch \ - 0032-docs-skip-building-texinfo-and-PDF-files.patch \ - 0033-install-libs-depend-on-the-toollibs.patch \ - 0034-POSIX-ify-the-SHELL-variable.patch \ - 0035-Handle-ORIGINAL_PATH-just-like-PATH.patch \ - 0036-uname-allow-setting-the-system-name-to-CYGWIN.patch \ - 0037-fixup-Revert-Default-to-disable_pcon.patch \ - 0038-Pass-environment-variables-with-empty-values.patch \ - 0039-Optionally-disallow-empty-environment-values-again.patch \ - 0040-build_env-respect-the-MSYS-environment-variable.patch \ - 0041-Cygwin-pty-Fix-Bad-address-error-when-running-cmd.ex.patch \ - 0042-ci-avoid-using-Node.js-12-Actions.patch \ - 0043-When-converting-to-a-Unix-path-avoid-double-trailing.patch \ - 0044-amend-Special-case-for-converting-root-directory-to-.patch \ - 0045-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch \ - 0046-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch \ - 0047-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch \ - 0048-CI-build-with-disable-dependency-tracking.patch \ - 0049-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch \ - 0050-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch \ - 0051-Cygwin-console-Fix-hangup-of-less-on-quit-after-the-.patch \ - 0052-Adjust-CWD-magic-to-accommodate-for-the-latest-Windo.patch \ - 0053-CI-fix-the-build-with-gcc-13.patch \ - 0054-fixup-Add-functionality-for-converting-UNIX-paths-in.patch \ - 0055-fixup-Add-functionality-for-converting-UNIX-paths-in.patch \ - 0056-nlsfuncs-work-around-an-overzealous-GCC-warning.patch \ - 0057-Move-_cygheap_start-into-.cygheap-section.patch \ - 0058-Cygwin-dumper-also-link-with-libzstd-as-libbfd-may-r.patch \ - 0059-Cygwin-configure-Add-option-to-disable-building-dump.patch \ - 0060-Work-around-fragile-include-in-binutils.patch \ - 0061-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch \ - 0062-cygthread-suspend-thread-before-terminating.patch + 0023-Expose-full-command-lines-to-other-Win32-processes-b.patch \ + 0024-Do-not-show-Error-dialogs-by-default.patch \ + 0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch \ + 0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch \ + 0027-kill-kill-Win32-processes-more-gently.patch \ + 0028-Cygwin-make-option-for-native-inner-link-handling.patch \ + 0029-docs-skip-building-texinfo-and-PDF-files.patch \ + 0030-install-libs-depend-on-the-toollibs.patch \ + 0031-POSIX-ify-the-SHELL-variable.patch \ + 0032-Handle-ORIGINAL_PATH-just-like-PATH.patch \ + 0033-uname-allow-setting-the-system-name-to-CYGWIN.patch \ + 0034-fixup-Revert-Default-to-disable_pcon.patch \ + 0035-Pass-environment-variables-with-empty-values.patch \ + 0036-Optionally-disallow-empty-environment-values-again.patch \ + 0037-build_env-respect-the-MSYS-environment-variable.patch \ + 0038-Cygwin-pty-Fix-Bad-address-error-when-running-cmd.ex.patch \ + 0039-When-converting-to-a-Unix-path-avoid-double-trailing.patch \ + 0040-amend-Special-case-for-converting-root-directory-to-.patch \ + 0041-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch \ + 0042-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch \ + 0043-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch \ + 0044-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch \ + 0045-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch \ + 0046-Cygwin-console-Fix-hangup-of-less-on-quit-after-the-.patch \ + 0047-Adjust-CWD-magic-to-accommodate-for-the-latest-Windo.patch \ + 0048-fixup-Add-functionality-for-converting-UNIX-paths-in.patch \ + 0049-fixup-Add-functionality-for-converting-UNIX-paths-in.patch \ + 0050-nlsfuncs-work-around-an-overzealous-GCC-warning.patch \ + 0051-Move-_cygheap_start-into-.cygheap-section.patch \ + 0052-Cygwin-dumper-also-link-with-libzstd-as-libbfd-may-r.patch \ + 0053-Cygwin-configure-Add-option-to-disable-building-dump.patch \ + 0054-Work-around-fragile-include-in-binutils.patch \ + 0055-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch \ + 0056-cygthread-suspend-thread-before-terminating.patch \ + 0057-fixup-cygthread-suspend-thread-before-terminating.patch } build() {