From e7673212e18c7fc69fe0d0431c35f93753a6a9be Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 10 Apr 2025 09:17:14 +0200 Subject: [PATCH] Move msys2-runtime to msys2-runtime-3.5 --- .../0001-Add-MSYS2-triplet.patch | 0 ...sys-library-name-in-import-libraries.patch | 0 .../0003-Rename-dll-from-cygwin-to-msys.patch | 0 ...y-for-converting-UNIX-paths-in-argum.patch | 0 ...y-for-changing-OS-name-via-MSYSTEM-e.patch | 0 ....-Change-sorting-mount-points.-By-de.patch | 0 ...ing-Cygwin-symlinks-use-deep-copy-by.patch | 0 ...lly-rewrite-TERM-msys-to-TERM-cygwin.patch | 0 ...o-not-convert-environment-for-strace.patch | 0 ...0010-strace.cc-Don-t-set-MSYS-noglob.patch | 0 ...bugging-for-strace-make_command_line.patch | 0 .../0012-strace-quiet-be-really-quiet.patch | 0 ...l-case-root-directory-to-have-traili.patch | 0 ...to-a-Unix-path-avoid-double-trailing.patch | 0 ...ath_conv-pass-PC_NOFULL-to-path_conv.patch | 0 ...Introduce-ability-to-switch-off-conv.patch | 0 ...cc-Untangle-allow_glob-from-winshell.patch | 0 ...-Don-t-quote-literal-strings-differe.patch | 0 .../0019-Add-debugging-for-build_argv.patch | 0 ...acility-environment-variable-MSYS2_E.patch | 0 ...mbolic-link-spawn-passing-wrong-arg0.patch | 0 ...oduce-the-enable_pcon-value-for-MSYS.patch | 0 ...en-call-usr-bin-sh-instead-of-bin-sh.patch | 0 ...and-lines-to-other-Win32-processes-b.patch | 0 ...obtain-a-function-s-address-in-kerne.patch | 0 ...GenerateConsoleCtrlEvent-upon-Ctrl-C.patch | 0 ...ill-kill-Win32-processes-more-gently.patch | 0 ...ption-for-native-inner-link-handling.patch | 0 ...-skip-building-texinfo-and-PDF-files.patch | 0 ...-install-libs-depend-on-the-toollibs.patch | 0 .../0031-POSIX-ify-the-SHELL-variable.patch | 0 ...-Handle-ORIGINAL_PATH-just-like-PATH.patch | 0 ...ow-setting-the-system-name-to-CYGWIN.patch | 0 ...ironment-variables-with-empty-values.patch | 0 ...allow-empty-environment-values-again.patch | 0 ...espect-the-MSYS-environment-variable.patch | 0 ...able-dynamicbase-on-the-Cygwin-DLL-b.patch | 0 ...ring-cygheaps-across-Cygwin-versions.patch | 0 ...report-msys2-runtime-commit-hash-too.patch | 0 ..._cwd-don-t-run-assembler-checking-co.patch | 0 ...ad-suspend-thread-before-terminating.patch | 0 ...e-of-CancelSyncronousIo-on-wait_thre.patch | 0 ...-IsWow64Process2-host-arch-in-wincap.patch | 0 ...name-add-host-machine-tag-to-sysname.patch | 0 ...-creating-Cygwin-symlinks-use-deep-c.patch | 0 ...-creating-Cygwin-symlinks-use-deep-c.patch | 0 ...-creating-Cygwin-symlinks-use-deep-c.patch | 0 ...-creating-Cygwin-symlinks-use-deep-c.patch | 0 ...-creating-Cygwin-symlinks-use-deep-c.patch | 0 ...-creating-Cygwin-symlinks-use-deep-c.patch | 0 ...-creating-Cygwin-symlinks-use-deep-c.patch | 0 ...-creating-Cygwin-symlinks-use-deep-c.patch | 0 ...-Redesign-mode-set-strategy-on-close.patch | 0 ...D-magic-to-accommodate-for-the-lates.patch | 0 {msys2-runtime => msys2-runtime-3.5}/PKGBUILD | 22 ++++++++++--------- .../README.md | 0 .../msys2-runtime.commit | 0 .../tests/do_new.bat | 0 .../tests/do_new2.bat | 0 .../tests/do_old.bat | 0 .../update-patches.sh | 0 61 files changed, 12 insertions(+), 10 deletions(-) rename {msys2-runtime => msys2-runtime-3.5}/0001-Add-MSYS2-triplet.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0002-Fix-msys-library-name-in-import-libraries.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0003-Rename-dll-from-cygwin-to-msys.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0009-Do-not-convert-environment-for-strace.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0010-strace.cc-Don-t-set-MSYS-noglob.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0011-Add-debugging-for-strace-make_command_line.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0012-strace-quiet-be-really-quiet.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0013-path_conv-special-case-root-directory-to-have-traili.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0019-Add-debugging-for-build_argv.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0022-Introduce-the-enable_pcon-value-for-MSYS.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0027-kill-kill-Win32-processes-more-gently.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0028-Cygwin-make-option-for-native-inner-link-handling.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0029-docs-skip-building-texinfo-and-PDF-files.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0030-install-libs-depend-on-the-toollibs.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0031-POSIX-ify-the-SHELL-variable.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0034-Pass-environment-variables-with-empty-values.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0035-Optionally-disallow-empty-environment-values-again.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0036-build_env-respect-the-MSYS-environment-variable.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0039-uname-report-msys2-runtime-commit-hash-too.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0041-cygthread-suspend-thread-before-terminating.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0045-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0046-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0047-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0048-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0049-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0050-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0051-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0052-amend-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0053-Cygwin-console-Redesign-mode-set-strategy-on-close.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/0054-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch (100%) rename {msys2-runtime => msys2-runtime-3.5}/PKGBUILD (97%) rename {msys2-runtime => msys2-runtime-3.5}/README.md (100%) rename {msys2-runtime => msys2-runtime-3.5}/msys2-runtime.commit (100%) rename {msys2-runtime => msys2-runtime-3.5}/tests/do_new.bat (100%) rename {msys2-runtime => msys2-runtime-3.5}/tests/do_new2.bat (100%) rename {msys2-runtime => msys2-runtime-3.5}/tests/do_old.bat (100%) rename {msys2-runtime => msys2-runtime-3.5}/update-patches.sh (100%) mode change 100755 => 100644 diff --git a/msys2-runtime/0001-Add-MSYS2-triplet.patch b/msys2-runtime-3.5/0001-Add-MSYS2-triplet.patch similarity index 100% rename from msys2-runtime/0001-Add-MSYS2-triplet.patch rename to msys2-runtime-3.5/0001-Add-MSYS2-triplet.patch diff --git a/msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch b/msys2-runtime-3.5/0002-Fix-msys-library-name-in-import-libraries.patch similarity index 100% rename from msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch rename to msys2-runtime-3.5/0002-Fix-msys-library-name-in-import-libraries.patch diff --git a/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch b/msys2-runtime-3.5/0003-Rename-dll-from-cygwin-to-msys.patch similarity index 100% rename from msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch rename to msys2-runtime-3.5/0003-Rename-dll-from-cygwin-to-msys.patch diff --git a/msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch b/msys2-runtime-3.5/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch similarity index 100% rename from msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch rename to msys2-runtime-3.5/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch diff --git a/msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch b/msys2-runtime-3.5/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch similarity index 100% rename from msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch rename to msys2-runtime-3.5/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch diff --git a/msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch b/msys2-runtime-3.5/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch similarity index 100% rename from msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch rename to msys2-runtime-3.5/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch diff --git a/msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch b/msys2-runtime-3.5/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch similarity index 100% rename from msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch rename to msys2-runtime-3.5/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch diff --git a/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch b/msys2-runtime-3.5/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch similarity index 100% rename from msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch rename to msys2-runtime-3.5/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch diff --git a/msys2-runtime/0009-Do-not-convert-environment-for-strace.patch b/msys2-runtime-3.5/0009-Do-not-convert-environment-for-strace.patch similarity index 100% rename from msys2-runtime/0009-Do-not-convert-environment-for-strace.patch rename to msys2-runtime-3.5/0009-Do-not-convert-environment-for-strace.patch diff --git a/msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch b/msys2-runtime-3.5/0010-strace.cc-Don-t-set-MSYS-noglob.patch similarity index 100% rename from msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch rename to msys2-runtime-3.5/0010-strace.cc-Don-t-set-MSYS-noglob.patch diff --git a/msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch b/msys2-runtime-3.5/0011-Add-debugging-for-strace-make_command_line.patch similarity index 100% rename from msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch rename to msys2-runtime-3.5/0011-Add-debugging-for-strace-make_command_line.patch diff --git a/msys2-runtime/0012-strace-quiet-be-really-quiet.patch b/msys2-runtime-3.5/0012-strace-quiet-be-really-quiet.patch similarity index 100% rename from msys2-runtime/0012-strace-quiet-be-really-quiet.patch rename to msys2-runtime-3.5/0012-strace-quiet-be-really-quiet.patch diff --git a/msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch b/msys2-runtime-3.5/0013-path_conv-special-case-root-directory-to-have-traili.patch similarity index 100% rename from msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch rename to msys2-runtime-3.5/0013-path_conv-special-case-root-directory-to-have-traili.patch diff --git a/msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch b/msys2-runtime-3.5/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch similarity index 100% rename from msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch rename to msys2-runtime-3.5/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch diff --git a/msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch b/msys2-runtime-3.5/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch similarity index 100% rename from msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch rename to msys2-runtime-3.5/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch diff --git a/msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch b/msys2-runtime-3.5/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch similarity index 100% rename from msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch rename to msys2-runtime-3.5/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch diff --git a/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch b/msys2-runtime-3.5/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch similarity index 100% rename from msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch rename to msys2-runtime-3.5/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch diff --git a/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch b/msys2-runtime-3.5/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch similarity index 100% rename from msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch rename to msys2-runtime-3.5/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch diff --git a/msys2-runtime/0019-Add-debugging-for-build_argv.patch b/msys2-runtime-3.5/0019-Add-debugging-for-build_argv.patch similarity index 100% rename from msys2-runtime/0019-Add-debugging-for-build_argv.patch rename to msys2-runtime-3.5/0019-Add-debugging-for-build_argv.patch diff --git a/msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch b/msys2-runtime-3.5/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch similarity index 100% rename from msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch rename to msys2-runtime-3.5/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch diff --git a/msys2-runtime/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch b/msys2-runtime-3.5/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch similarity index 100% rename from msys2-runtime/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch rename to msys2-runtime-3.5/0021-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch diff --git a/msys2-runtime/0022-Introduce-the-enable_pcon-value-for-MSYS.patch b/msys2-runtime-3.5/0022-Introduce-the-enable_pcon-value-for-MSYS.patch similarity index 100% rename from msys2-runtime/0022-Introduce-the-enable_pcon-value-for-MSYS.patch rename to msys2-runtime-3.5/0022-Introduce-the-enable_pcon-value-for-MSYS.patch diff --git a/msys2-runtime/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch b/msys2-runtime-3.5/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch similarity index 100% rename from msys2-runtime/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch rename to msys2-runtime-3.5/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch diff --git a/msys2-runtime/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch b/msys2-runtime-3.5/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch similarity index 100% rename from msys2-runtime/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch rename to msys2-runtime-3.5/0024-Expose-full-command-lines-to-other-Win32-processes-b.patch diff --git a/msys2-runtime/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch b/msys2-runtime-3.5/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch similarity index 100% rename from msys2-runtime/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch rename to msys2-runtime-3.5/0025-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch diff --git a/msys2-runtime/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch b/msys2-runtime-3.5/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch similarity index 100% rename from msys2-runtime/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch rename to msys2-runtime-3.5/0026-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch diff --git a/msys2-runtime/0027-kill-kill-Win32-processes-more-gently.patch b/msys2-runtime-3.5/0027-kill-kill-Win32-processes-more-gently.patch similarity index 100% rename from msys2-runtime/0027-kill-kill-Win32-processes-more-gently.patch rename to msys2-runtime-3.5/0027-kill-kill-Win32-processes-more-gently.patch diff --git a/msys2-runtime/0028-Cygwin-make-option-for-native-inner-link-handling.patch b/msys2-runtime-3.5/0028-Cygwin-make-option-for-native-inner-link-handling.patch similarity index 100% rename from msys2-runtime/0028-Cygwin-make-option-for-native-inner-link-handling.patch rename to msys2-runtime-3.5/0028-Cygwin-make-option-for-native-inner-link-handling.patch diff --git a/msys2-runtime/0029-docs-skip-building-texinfo-and-PDF-files.patch b/msys2-runtime-3.5/0029-docs-skip-building-texinfo-and-PDF-files.patch similarity index 100% rename from msys2-runtime/0029-docs-skip-building-texinfo-and-PDF-files.patch rename to msys2-runtime-3.5/0029-docs-skip-building-texinfo-and-PDF-files.patch diff --git a/msys2-runtime/0030-install-libs-depend-on-the-toollibs.patch b/msys2-runtime-3.5/0030-install-libs-depend-on-the-toollibs.patch similarity index 100% rename from msys2-runtime/0030-install-libs-depend-on-the-toollibs.patch rename to msys2-runtime-3.5/0030-install-libs-depend-on-the-toollibs.patch diff --git a/msys2-runtime/0031-POSIX-ify-the-SHELL-variable.patch b/msys2-runtime-3.5/0031-POSIX-ify-the-SHELL-variable.patch similarity index 100% rename from msys2-runtime/0031-POSIX-ify-the-SHELL-variable.patch rename to msys2-runtime-3.5/0031-POSIX-ify-the-SHELL-variable.patch diff --git a/msys2-runtime/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch b/msys2-runtime-3.5/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch similarity index 100% rename from msys2-runtime/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch rename to msys2-runtime-3.5/0032-Handle-ORIGINAL_PATH-just-like-PATH.patch diff --git a/msys2-runtime/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch b/msys2-runtime-3.5/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch similarity index 100% rename from msys2-runtime/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch rename to msys2-runtime-3.5/0033-uname-allow-setting-the-system-name-to-CYGWIN.patch diff --git a/msys2-runtime/0034-Pass-environment-variables-with-empty-values.patch b/msys2-runtime-3.5/0034-Pass-environment-variables-with-empty-values.patch similarity index 100% rename from msys2-runtime/0034-Pass-environment-variables-with-empty-values.patch rename to msys2-runtime-3.5/0034-Pass-environment-variables-with-empty-values.patch diff --git a/msys2-runtime/0035-Optionally-disallow-empty-environment-values-again.patch b/msys2-runtime-3.5/0035-Optionally-disallow-empty-environment-values-again.patch similarity index 100% rename from msys2-runtime/0035-Optionally-disallow-empty-environment-values-again.patch rename to msys2-runtime-3.5/0035-Optionally-disallow-empty-environment-values-again.patch diff --git a/msys2-runtime/0036-build_env-respect-the-MSYS-environment-variable.patch b/msys2-runtime-3.5/0036-build_env-respect-the-MSYS-environment-variable.patch similarity index 100% rename from msys2-runtime/0036-build_env-respect-the-MSYS-environment-variable.patch rename to msys2-runtime-3.5/0036-build_env-respect-the-MSYS-environment-variable.patch diff --git a/msys2-runtime/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch b/msys2-runtime-3.5/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch similarity index 100% rename from msys2-runtime/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch rename to msys2-runtime-3.5/0037-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch diff --git a/msys2-runtime/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch b/msys2-runtime-3.5/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch similarity index 100% rename from msys2-runtime/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch rename to msys2-runtime-3.5/0038-Avoid-sharing-cygheaps-across-Cygwin-versions.patch diff --git a/msys2-runtime/0039-uname-report-msys2-runtime-commit-hash-too.patch b/msys2-runtime-3.5/0039-uname-report-msys2-runtime-commit-hash-too.patch similarity index 100% rename from msys2-runtime/0039-uname-report-msys2-runtime-commit-hash-too.patch rename to msys2-runtime-3.5/0039-uname-report-msys2-runtime-commit-hash-too.patch diff --git a/msys2-runtime/0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch b/msys2-runtime-3.5/0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch similarity index 100% rename from msys2-runtime/0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch rename to msys2-runtime-3.5/0040-Cygwin-find_fast_cwd-don-t-run-assembler-checking-co.patch diff --git a/msys2-runtime/0041-cygthread-suspend-thread-before-terminating.patch b/msys2-runtime-3.5/0041-cygthread-suspend-thread-before-terminating.patch similarity index 100% rename from msys2-runtime/0041-cygthread-suspend-thread-before-terminating.patch rename to msys2-runtime-3.5/0041-cygthread-suspend-thread-before-terminating.patch diff --git a/msys2-runtime/0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch b/msys2-runtime-3.5/0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch similarity index 100% rename from msys2-runtime/0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch rename to msys2-runtime-3.5/0042-Cygwin-revert-use-of-CancelSyncronousIo-on-wait_thre.patch diff --git a/msys2-runtime/0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch b/msys2-runtime-3.5/0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch similarity index 100% rename from msys2-runtime/0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch rename to msys2-runtime-3.5/0043-Cygwin-cache-IsWow64Process2-host-arch-in-wincap.patch diff --git a/msys2-runtime/0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch b/msys2-runtime-3.5/0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch similarity index 100% rename from msys2-runtime/0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch rename to msys2-runtime-3.5/0044-Cygwin-uname-add-host-machine-tag-to-sysname.patch diff --git a/msys2-runtime/0045-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch b/msys2-runtime-3.5/0045-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch similarity index 100% rename from msys2-runtime/0045-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch rename to msys2-runtime-3.5/0045-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch diff --git a/msys2-runtime/0046-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch b/msys2-runtime-3.5/0046-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch similarity index 100% rename from msys2-runtime/0046-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch rename to msys2-runtime-3.5/0046-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch diff --git a/msys2-runtime/0047-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch b/msys2-runtime-3.5/0047-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch similarity index 100% rename from msys2-runtime/0047-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch rename to msys2-runtime-3.5/0047-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch diff --git a/msys2-runtime/0048-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch b/msys2-runtime-3.5/0048-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch similarity index 100% rename from msys2-runtime/0048-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch rename to msys2-runtime-3.5/0048-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch diff --git a/msys2-runtime/0049-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch b/msys2-runtime-3.5/0049-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch similarity index 100% rename from msys2-runtime/0049-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch rename to msys2-runtime-3.5/0049-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch diff --git a/msys2-runtime/0050-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch b/msys2-runtime-3.5/0050-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch similarity index 100% rename from msys2-runtime/0050-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch rename to msys2-runtime-3.5/0050-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch diff --git a/msys2-runtime/0051-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch b/msys2-runtime-3.5/0051-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch similarity index 100% rename from msys2-runtime/0051-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch rename to msys2-runtime-3.5/0051-fixup-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch diff --git a/msys2-runtime/0052-amend-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch b/msys2-runtime-3.5/0052-amend-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch similarity index 100% rename from msys2-runtime/0052-amend-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch rename to msys2-runtime-3.5/0052-amend-Instead-of-creating-Cygwin-symlinks-use-deep-c.patch diff --git a/msys2-runtime/0053-Cygwin-console-Redesign-mode-set-strategy-on-close.patch b/msys2-runtime-3.5/0053-Cygwin-console-Redesign-mode-set-strategy-on-close.patch similarity index 100% rename from msys2-runtime/0053-Cygwin-console-Redesign-mode-set-strategy-on-close.patch rename to msys2-runtime-3.5/0053-Cygwin-console-Redesign-mode-set-strategy-on-close.patch diff --git a/msys2-runtime/0054-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch b/msys2-runtime-3.5/0054-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch similarity index 100% rename from msys2-runtime/0054-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch rename to msys2-runtime-3.5/0054-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime-3.5/PKGBUILD similarity index 97% rename from msys2-runtime/PKGBUILD rename to msys2-runtime-3.5/PKGBUILD index c3a47825..243b359d 100644 --- a/msys2-runtime/PKGBUILD +++ b/msys2-runtime-3.5/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Alexey Pavlov # Contributor: Ray Donnelly -pkgbase=msys2-runtime -pkgname=('msys2-runtime' 'msys2-runtime-devel') +pkgbase=msys2-runtime-3.5 +pkgname=('msys2-runtime-3.5' 'msys2-runtime-3.5-devel') pkgver=3.5.7 -pkgrel=4 +pkgrel=5 pkgdesc="Cygwin POSIX emulation engine" arch=('x86_64') url="https://www.cygwin.com/" @@ -273,10 +273,11 @@ build() { mv -f usr/bin/msys-2.0.dll.new usr/bin/msys-2.0.dll } -package_msys2-runtime() { +package_msys2-runtime-3.5() { pkgdesc="Posix emulation engine for Windows" - conflicts=('catgets' 'libcatgets' 'msys2-runtime-3.4' 'msys2-runtime-3.5') - replaces=('catgets' 'libcatgets' 'msys2-runtime-3.5') + provides=("msys2-runtime=${pkgver}") + conflicts=('catgets' 'libcatgets' 'msys2-runtime') + replaces=('catgets' 'libcatgets') mkdir -p "${pkgdir}"/usr cp -rf "${srcdir}"/dest/usr/bin "${pkgdir}"/usr/ @@ -289,11 +290,12 @@ package_msys2-runtime() { cp -rf "${srcdir}"/dest/usr/share "${pkgdir}"/usr/ } -package_msys2-runtime-devel() { +package_msys2-runtime-3.5-devel() { pkgdesc="MSYS2 headers and libraries" - depends=("msys2-runtime=${pkgver}") - conflicts=('libcatgets-devel' 'msys2-runtime-3.4-devel' 'msys2-runtime-3.5-devel') - replaces=('libcatgets-devel' 'msys2-runtime-3.5-devel') + depends=("msys2-runtime-3.5=${pkgver}") + provides=("msys2-runtime-devel=${pkgver}") + conflicts=('libcatgets-devel' 'msys2-runtime-devel') + replaces=('libcatgets-devel') # strip breaks the split debug info. msys2/msys2-pacman#52 options=('!strip') diff --git a/msys2-runtime/README.md b/msys2-runtime-3.5/README.md similarity index 100% rename from msys2-runtime/README.md rename to msys2-runtime-3.5/README.md diff --git a/msys2-runtime/msys2-runtime.commit b/msys2-runtime-3.5/msys2-runtime.commit similarity index 100% rename from msys2-runtime/msys2-runtime.commit rename to msys2-runtime-3.5/msys2-runtime.commit diff --git a/msys2-runtime/tests/do_new.bat b/msys2-runtime-3.5/tests/do_new.bat similarity index 100% rename from msys2-runtime/tests/do_new.bat rename to msys2-runtime-3.5/tests/do_new.bat diff --git a/msys2-runtime/tests/do_new2.bat b/msys2-runtime-3.5/tests/do_new2.bat similarity index 100% rename from msys2-runtime/tests/do_new2.bat rename to msys2-runtime-3.5/tests/do_new2.bat diff --git a/msys2-runtime/tests/do_old.bat b/msys2-runtime-3.5/tests/do_old.bat similarity index 100% rename from msys2-runtime/tests/do_old.bat rename to msys2-runtime-3.5/tests/do_old.bat diff --git a/msys2-runtime/update-patches.sh b/msys2-runtime-3.5/update-patches.sh old mode 100755 new mode 100644 similarity index 100% rename from msys2-runtime/update-patches.sh rename to msys2-runtime-3.5/update-patches.sh