diff --git a/msys2-runtime-3.6/0001-Add-MSYS2-triplet.patch b/msys2-runtime/0001-Add-MSYS2-triplet.patch similarity index 100% rename from msys2-runtime-3.6/0001-Add-MSYS2-triplet.patch rename to msys2-runtime/0001-Add-MSYS2-triplet.patch diff --git a/msys2-runtime-3.6/0002-Fix-msys-library-name-in-import-libraries.patch b/msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch similarity index 100% rename from msys2-runtime-3.6/0002-Fix-msys-library-name-in-import-libraries.patch rename to msys2-runtime/0002-Fix-msys-library-name-in-import-libraries.patch diff --git a/msys2-runtime-3.6/0003-Rename-dll-from-cygwin-to-msys.patch b/msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch similarity index 100% rename from msys2-runtime-3.6/0003-Rename-dll-from-cygwin-to-msys.patch rename to msys2-runtime/0003-Rename-dll-from-cygwin-to-msys.patch diff --git a/msys2-runtime-3.6/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch b/msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch similarity index 100% rename from msys2-runtime-3.6/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch rename to msys2-runtime/0004-Add-functionality-for-converting-UNIX-paths-in-argum.patch diff --git a/msys2-runtime-3.6/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch b/msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch similarity index 100% rename from msys2-runtime-3.6/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch rename to msys2-runtime/0005-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch diff --git a/msys2-runtime-3.6/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch b/msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch similarity index 100% rename from msys2-runtime-3.6/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch rename to msys2-runtime/0006-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch diff --git a/msys2-runtime-3.6/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch b/msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch similarity index 100% rename from msys2-runtime-3.6/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch rename to msys2-runtime/0007-Instead-of-creating-Cygwin-symlinks-use-deep-copy-by.patch diff --git a/msys2-runtime-3.6/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch b/msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch similarity index 100% rename from msys2-runtime-3.6/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch rename to msys2-runtime/0008-Automatically-rewrite-TERM-msys-to-TERM-cygwin.patch diff --git a/msys2-runtime-3.6/0009-Do-not-convert-environment-for-strace.patch b/msys2-runtime/0009-Do-not-convert-environment-for-strace.patch similarity index 100% rename from msys2-runtime-3.6/0009-Do-not-convert-environment-for-strace.patch rename to msys2-runtime/0009-Do-not-convert-environment-for-strace.patch diff --git a/msys2-runtime-3.6/0010-strace.cc-Don-t-set-MSYS-noglob.patch b/msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch similarity index 100% rename from msys2-runtime-3.6/0010-strace.cc-Don-t-set-MSYS-noglob.patch rename to msys2-runtime/0010-strace.cc-Don-t-set-MSYS-noglob.patch diff --git a/msys2-runtime-3.6/0011-Add-debugging-for-strace-make_command_line.patch b/msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch similarity index 100% rename from msys2-runtime-3.6/0011-Add-debugging-for-strace-make_command_line.patch rename to msys2-runtime/0011-Add-debugging-for-strace-make_command_line.patch diff --git a/msys2-runtime-3.6/0012-strace-quiet-be-really-quiet.patch b/msys2-runtime/0012-strace-quiet-be-really-quiet.patch similarity index 100% rename from msys2-runtime-3.6/0012-strace-quiet-be-really-quiet.patch rename to msys2-runtime/0012-strace-quiet-be-really-quiet.patch diff --git a/msys2-runtime-3.6/0013-path_conv-special-case-root-directory-to-have-traili.patch b/msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch similarity index 100% rename from msys2-runtime-3.6/0013-path_conv-special-case-root-directory-to-have-traili.patch rename to msys2-runtime/0013-path_conv-special-case-root-directory-to-have-traili.patch diff --git a/msys2-runtime-3.6/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch b/msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch similarity index 100% rename from msys2-runtime-3.6/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch rename to msys2-runtime/0014-When-converting-to-a-Unix-path-avoid-double-trailing.patch diff --git a/msys2-runtime-3.6/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch b/msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch similarity index 100% rename from msys2-runtime-3.6/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch rename to msys2-runtime/0015-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch diff --git a/msys2-runtime-3.6/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch b/msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch similarity index 100% rename from msys2-runtime-3.6/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch rename to msys2-runtime/0016-path-conversion-Introduce-ability-to-switch-off-conv.patch diff --git a/msys2-runtime-3.6/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch b/msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch similarity index 100% rename from msys2-runtime-3.6/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch rename to msys2-runtime/0017-dcrt0.cc-Untangle-allow_glob-from-winshell.patch diff --git a/msys2-runtime-3.6/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch b/msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch similarity index 100% rename from msys2-runtime-3.6/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch rename to msys2-runtime/0018-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch diff --git a/msys2-runtime-3.6/0019-Add-debugging-for-build_argv.patch b/msys2-runtime/0019-Add-debugging-for-build_argv.patch similarity index 100% rename from msys2-runtime-3.6/0019-Add-debugging-for-build_argv.patch rename to msys2-runtime/0019-Add-debugging-for-build_argv.patch diff --git a/msys2-runtime-3.6/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch b/msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch similarity index 100% rename from msys2-runtime-3.6/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch rename to msys2-runtime/0020-environ.cc-New-facility-environment-variable-MSYS2_E.patch diff --git a/msys2-runtime-3.6/0021-Introduce-the-enable_pcon-value-for-MSYS.patch b/msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch similarity index 100% rename from msys2-runtime-3.6/0021-Introduce-the-enable_pcon-value-for-MSYS.patch rename to msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch diff --git a/msys2-runtime-3.6/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch b/msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch similarity index 100% rename from msys2-runtime-3.6/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch rename to msys2-runtime/0022-popen-call-usr-bin-sh-instead-of-bin-sh.patch diff --git a/msys2-runtime-3.6/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch b/msys2-runtime/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch similarity index 100% rename from msys2-runtime-3.6/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch rename to msys2-runtime/0023-Expose-full-command-lines-to-other-Win32-processes-b.patch diff --git a/msys2-runtime-3.6/0024-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch b/msys2-runtime/0024-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch similarity index 100% rename from msys2-runtime-3.6/0024-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch rename to msys2-runtime/0024-Add-a-helper-to-obtain-a-function-s-address-in-kerne.patch diff --git a/msys2-runtime-3.6/0025-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch b/msys2-runtime/0025-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch similarity index 100% rename from msys2-runtime-3.6/0025-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch rename to msys2-runtime/0025-Emulate-GenerateConsoleCtrlEvent-upon-Ctrl-C.patch diff --git a/msys2-runtime-3.6/0026-kill-kill-Win32-processes-more-gently.patch b/msys2-runtime/0026-kill-kill-Win32-processes-more-gently.patch similarity index 100% rename from msys2-runtime-3.6/0026-kill-kill-Win32-processes-more-gently.patch rename to msys2-runtime/0026-kill-kill-Win32-processes-more-gently.patch diff --git a/msys2-runtime-3.6/0027-Cygwin-make-option-for-native-inner-link-handling.patch b/msys2-runtime/0027-Cygwin-make-option-for-native-inner-link-handling.patch similarity index 100% rename from msys2-runtime-3.6/0027-Cygwin-make-option-for-native-inner-link-handling.patch rename to msys2-runtime/0027-Cygwin-make-option-for-native-inner-link-handling.patch diff --git a/msys2-runtime-3.6/0028-docs-skip-building-texinfo-and-PDF-files.patch b/msys2-runtime/0028-docs-skip-building-texinfo-and-PDF-files.patch similarity index 100% rename from msys2-runtime-3.6/0028-docs-skip-building-texinfo-and-PDF-files.patch rename to msys2-runtime/0028-docs-skip-building-texinfo-and-PDF-files.patch diff --git a/msys2-runtime-3.6/0029-install-libs-depend-on-the-toollibs.patch b/msys2-runtime/0029-install-libs-depend-on-the-toollibs.patch similarity index 100% rename from msys2-runtime-3.6/0029-install-libs-depend-on-the-toollibs.patch rename to msys2-runtime/0029-install-libs-depend-on-the-toollibs.patch diff --git a/msys2-runtime-3.6/0030-POSIX-ify-the-SHELL-variable.patch b/msys2-runtime/0030-POSIX-ify-the-SHELL-variable.patch similarity index 100% rename from msys2-runtime-3.6/0030-POSIX-ify-the-SHELL-variable.patch rename to msys2-runtime/0030-POSIX-ify-the-SHELL-variable.patch diff --git a/msys2-runtime-3.6/0031-Handle-ORIGINAL_PATH-just-like-PATH.patch b/msys2-runtime/0031-Handle-ORIGINAL_PATH-just-like-PATH.patch similarity index 100% rename from msys2-runtime-3.6/0031-Handle-ORIGINAL_PATH-just-like-PATH.patch rename to msys2-runtime/0031-Handle-ORIGINAL_PATH-just-like-PATH.patch diff --git a/msys2-runtime-3.6/0032-uname-allow-setting-the-system-name-to-CYGWIN.patch b/msys2-runtime/0032-uname-allow-setting-the-system-name-to-CYGWIN.patch similarity index 100% rename from msys2-runtime-3.6/0032-uname-allow-setting-the-system-name-to-CYGWIN.patch rename to msys2-runtime/0032-uname-allow-setting-the-system-name-to-CYGWIN.patch diff --git a/msys2-runtime-3.6/0033-Pass-environment-variables-with-empty-values.patch b/msys2-runtime/0033-Pass-environment-variables-with-empty-values.patch similarity index 100% rename from msys2-runtime-3.6/0033-Pass-environment-variables-with-empty-values.patch rename to msys2-runtime/0033-Pass-environment-variables-with-empty-values.patch diff --git a/msys2-runtime-3.6/0034-Optionally-disallow-empty-environment-values-again.patch b/msys2-runtime/0034-Optionally-disallow-empty-environment-values-again.patch similarity index 100% rename from msys2-runtime-3.6/0034-Optionally-disallow-empty-environment-values-again.patch rename to msys2-runtime/0034-Optionally-disallow-empty-environment-values-again.patch diff --git a/msys2-runtime-3.6/0035-build_env-respect-the-MSYS-environment-variable.patch b/msys2-runtime/0035-build_env-respect-the-MSYS-environment-variable.patch similarity index 100% rename from msys2-runtime-3.6/0035-build_env-respect-the-MSYS-environment-variable.patch rename to msys2-runtime/0035-build_env-respect-the-MSYS-environment-variable.patch diff --git a/msys2-runtime-3.6/0036-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch b/msys2-runtime/0036-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch similarity index 100% rename from msys2-runtime-3.6/0036-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch rename to msys2-runtime/0036-Revert-Cygwin-Enable-dynamicbase-on-the-Cygwin-DLL-b.patch diff --git a/msys2-runtime-3.6/0037-Avoid-sharing-cygheaps-across-Cygwin-versions.patch b/msys2-runtime/0037-Avoid-sharing-cygheaps-across-Cygwin-versions.patch similarity index 100% rename from msys2-runtime-3.6/0037-Avoid-sharing-cygheaps-across-Cygwin-versions.patch rename to msys2-runtime/0037-Avoid-sharing-cygheaps-across-Cygwin-versions.patch diff --git a/msys2-runtime-3.6/0038-uname-report-msys2-runtime-commit-hash-too.patch b/msys2-runtime/0038-uname-report-msys2-runtime-commit-hash-too.patch similarity index 100% rename from msys2-runtime-3.6/0038-uname-report-msys2-runtime-commit-hash-too.patch rename to msys2-runtime/0038-uname-report-msys2-runtime-commit-hash-too.patch diff --git a/msys2-runtime-3.6/0039-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch b/msys2-runtime/0039-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch similarity index 100% rename from msys2-runtime-3.6/0039-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch rename to msys2-runtime/0039-Cygwin-Adjust-CWD-magic-to-accommodate-for-the-lates.patch diff --git a/msys2-runtime-3.6/PKGBUILD b/msys2-runtime/PKGBUILD similarity index 96% rename from msys2-runtime-3.6/PKGBUILD rename to msys2-runtime/PKGBUILD index 35282aed..6223b249 100644 --- a/msys2-runtime-3.6/PKGBUILD +++ b/msys2-runtime/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Alexey Pavlov # Contributor: Ray Donnelly -pkgbase=msys2-runtime-3.6 -pkgname=('msys2-runtime-3.6' 'msys2-runtime-3.6-devel') +pkgbase=msys2-runtime +pkgname=('msys2-runtime' 'msys2-runtime-devel') pkgver=3.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Cygwin POSIX emulation engine" arch=('x86_64') url="https://www.cygwin.com/" @@ -229,11 +229,10 @@ build() { mv -f usr/bin/msys-2.0.dll.new usr/bin/msys-2.0.dll } -package_msys2-runtime-3.6() { +package_msys2-runtime() { pkgdesc="Posix emulation engine for Windows" - provides=("msys2-runtime=${pkgver}") - conflicts=('catgets' 'libcatgets' 'msys2-runtime') - replaces=('catgets' 'libcatgets') + conflicts=('catgets' 'libcatgets' 'msys2-runtime-3.6') + replaces=('catgets' 'libcatgets' 'msys2-runtime-3.6') mkdir -p "${pkgdir}"/usr cp -rf "${srcdir}"/dest/usr/bin "${pkgdir}"/usr/ @@ -246,12 +245,11 @@ package_msys2-runtime-3.6() { cp -rf "${srcdir}"/dest/usr/share "${pkgdir}"/usr/ } -package_msys2-runtime-3.6-devel() { +package_msys2-runtime-devel() { pkgdesc="MSYS2 headers and libraries" - depends=("msys2-runtime-3.6=${pkgver}") - provides=("msys2-runtime-devel=${pkgver}") - conflicts=('libcatgets-devel' 'msys2-runtime-devel') - replaces=('libcatgets-devel') + depends=("msys2-runtime=${pkgver}") + conflicts=('libcatgets-devel' 'msys2-runtime-3.6-devel') + replaces=('libcatgets-devel' 'msys2-runtime-3.6-devel') # strip breaks the split debug info. msys2/msys2-pacman#52 options=('!strip') diff --git a/msys2-runtime-3.6/README.md b/msys2-runtime/README.md similarity index 100% rename from msys2-runtime-3.6/README.md rename to msys2-runtime/README.md diff --git a/msys2-runtime-3.6/msys2-runtime.commit b/msys2-runtime/msys2-runtime.commit similarity index 100% rename from msys2-runtime-3.6/msys2-runtime.commit rename to msys2-runtime/msys2-runtime.commit diff --git a/msys2-runtime-3.6/update-patches.sh b/msys2-runtime/update-patches.sh similarity index 100% rename from msys2-runtime-3.6/update-patches.sh rename to msys2-runtime/update-patches.sh