Commit Graph

210 Commits

Author SHA1 Message Date
Johannes Schindelin
35fb61781b msys2-runtime: stop trimming trailing colons
This corresponds to https://github.com/msys2/msys2-runtime/pull/95

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-05-30 20:52:30 +02:00
Christoph Reiter
b88f5ff9b8 msys2-runtime: Update to 3.3.5 2022-05-13 15:37:08 +02:00
Christoph Reiter
21b0990c25 runtime: revert rebuild
See https://github.com/msys2/MSYS2-packages/pull/2954#issuecomment-1113284892
2022-04-29 16:40:58 +02:00
Christoph Reiter
0830c7dd23 msys2-runtime: build fixes for mingw-w64 v10
https://github.com/msys2/msys2-runtime/pull/92
2022-04-27 18:33:17 +02:00
Christoph Reiter
633a6e7884 Use git apply instead fo git am
So we don't depend on a committer being set
2022-03-04 15:15:17 +01:00
Johannes Schindelin
f1413819a4 msys2-runtime: backport recent console patches
These hacks were proposed in Cygwin as a more complete set of
workarounds superseding Git for Windows'
https://github.com/git-for-windows/msys2-runtime/commit/1d0701d

This commit corresponds to
https://github.com/msys2/msys2-runtime/pull/86

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-02-15 09:58:40 +01:00
Johannes Schindelin
ff07714b85 msys2-runtime: update to v3.3.4
This corresponds to https://github.com/msys2/msys2-runtime/pull/85.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-02-01 09:34:31 +01:00
Johannes Schindelin
e412f31430 msys2-runtime: a directory with .lnk suffix is not a .lnk file
This corresponds to https://github.com/msys2/msys2-runtime/pull/82.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-01-18 12:34:41 +01:00
Christoph Reiter
52e56a9a72 msys2-runtime: backport for 32bit posix_spawn issue
Fixes #2801
2022-01-16 14:43:51 +01:00
Johannes Schindelin
f33f945644 msys2-runtime: special case the SHELL and ORIGINAL_PATH env vars
In MSYS2 <-> MINGW transitions, we convert a couple of environment
variables between Unix and Windows styles, most notably `PATH`.

In the Git for Windows project, we realized that the environment
variables `SHELL` and `ORIGINAL_PATH` need the same treatment. These
patches have proved their worth for years, and it is time for them to be
integrated back into the actual MSYS2 runtime.

This should fix https://github.com/msys2/msys2-runtime/issues/43.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-01-13 17:44:33 +01:00
Johannes Schindelin
bc88668bfc msys2-runtime: we now need to depend on xmlto and 'docbook-xsl` explicitly
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-01-13 17:44:18 +01:00
Jeremy Drake
62de84f5db msys2-runtime: update patches 2021-12-29 14:36:06 -08:00
Christoph Reiter
5bcd978cb0 Get rid of the msys2-devel group
For now adds a "provides=(msys2-devel)" to gcc to keep installation
working and install the same set of packages.

Next step is to makedepend on gcc where needed and remove msys2-devel
from the docs.
2021-12-13 20:35:56 +01:00
Christoph Reiter
38126d763e makedepend on autotools for packages using configure
In some cases this will introduce cycles which could likely be cleaned
up by only depending on some unix tools instead of the whole autotools.

Rebuilding doesn't make much sense at this point since it just adds a subset
of base-devel which is still installed by default.
2021-12-12 14:20:50 +01:00
Christoph Reiter
0ba0ce5472 msys2-runtime: Update 2021-12-10 13:29:09 +01:00
Johannes Schindelin
fe77839180 msys2-runtime: update to v3.3.3
This corresponds to https://github.com/msys2/msys2-runtime/pull/71.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-12-03 21:52:54 +01:00
Johannes Schindelin
e0c97231af msys2-runtime: backport the fix for emojis in the Windows Terminal
With this patch, it is now possible to paste Unicode characters outside
the U+0000-U+FFFF range, most notably emojis, when running MSYS2's Bash
in Windows Terminal.

This fixes https://github.com/msys2/msys2-runtime/issues/66

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-17 15:48:17 +01:00
Christoph Reiter
c4e50cf985 msys2-runtime: backport some fixes 2021-11-14 06:57:29 +01:00
Christoph Reiter
b3c1faddab msys2-runtime: don't compress man pages to avoid a file conflict
See https://github.com/msys2/MSYS2-packages/pull/2687#issuecomment-965714874
2021-11-11 09:23:53 +01:00
Johannes Schindelin
c0baa84dac msys2-runtime: upgrade to Cygwin v3.3.2
See https://github.com/msys2/msys2-runtime/pull/63

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 00:34:55 +01:00
Jeremy Drake
8570fac56c msys2-runtime: add patch for native inner links
msys2/msys2-runtime#46
2021-07-31 13:32:26 -07:00
Jeremy Drake
c1d7dd3a2e msys2-runtime: update ctrl-c handling for ARM64.
msys2/msys2-runtime#47
2021-07-01 16:10:12 -07:00
Jeremy Drake
1decd13054 msys2-runtime: update patch for getprocaddr 2021-06-25 00:20:28 -07:00
Johannes Schindelin
0394a7f1ec msys2-runtime: bump pkgrel
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-06-22 11:28:18 +02:00
Johannes Schindelin
0e1a96a9c0 msys2-runtime: do not fall back to ExitProcess() on Ctrl+C
As long as the return value of `CtrlRoutine` indicates that it has been
handled, do not insist on the process to go away. This is in line with
`SIGINT` handlers on Linux/Unix/macOS that can prevent the process from
terminating on the process' side.

This brings over https://github.com/msys2/msys2-runtime/pull/50 into
MSYS2-packages.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-06-22 11:09:27 +02:00
Jeremy Drake
b44f8b33eb msys2-runtime: patch to fix ctrl-c handling 2021-06-21 16:15:25 -07:00
Naveen M K
f7457b07b9 msys2-runtime: copy usr/libexec folder also
it was missed in https://github.com/msys2/MSYS2-packages/pull/2547
2021-06-18 22:36:47 +05:30
Christoph Reiter
7fbc294a72 msys2-runtime: bump pkgrel 2021-06-18 15:19:17 +02:00
Johannes Schindelin
18472f9dc3 msys2-runtime: handle Ctrl+C with MINGW executables
The idea is that we handle Ctrl+C not by terminating the processes
(which would reflect `kill -KILL`, not `kill -INT`) but by imitating
what Windows does in a CMD window: we inject a remote thread that runs
the `CtrlRoutine` function. This lets the `atexit()` handlers and the
ConsoleCtrlEvent handlers do their job.

This commit brings the goodness from
https://github.com/msys2/msys2-runtime/pull/31 over into MSYS2-packages,
which cherry-picked and edited the patches from Git for Windows.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-06-18 13:03:48 +02:00
Jeremy Drake
4e7a1f3011 msys2-runtime: add arm64 FAST_CWD warning fix. 2021-05-22 22:33:59 -07:00
Orgad Shaneh
8e32f0f7ae msys2-runtime: Update 2021-05-20 09:00:38 +03:00
Christoph Reiter
7ecabe03f1 msys2-runtime: Update 2021-05-06 06:34:07 +02:00
Christoph Reiter
bd2ba45509 msys2-runtime: backport another fix for hanging pipes
See #2471
2021-05-03 18:02:07 +02:00
Orgad Shaneh
31b2ff1708 msys2-runtime: Backport fix for symlink resolving
Reported here: https://cygwin.com/pipermail/cygwin/2021-April/248307.html
2021-05-03 11:11:10 +03:00
Christoph Reiter
28aa374794 msys2-runtime: bring back the uname change lost in the last rebase 2021-04-01 20:31:41 +02:00
Johannes Schindelin
a9ad014634 msys2-runtime: make default Windows error reporting an opt-in
Unless `MSYS` contains `winjitdebug`, with this change we won't show
that annoying message box e.g. when a DLL is missing.

This is essentially forwarding
https://github.com/msys2/msys2-runtime/pull/35 to MSYS2-packages.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-03-31 15:14:25 +02:00
Johannes Schindelin
30d9915b43 msys2-runtime: upgrade to v3.2.0
Apart from setting `pkgver` and re-setting `pkgrel`, all of the work was
done by the `./update-patches.sh` script, picking up the patches
prepared in https://github.com/msys2/msys2-runtime/pull/30.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-03-30 10:21:43 +02:00
Christoph Reiter
edff8901c1 msys2-runtime: improve uname compatibility again 2021-03-24 22:37:48 +01:00
Christoph Reiter
0a30e075ed msys2-runtime: Update (uname change)
With this uname no longer exposes $MSYSTEM directly but just "MSYS" in
an MSYS env and "MINGW" everywhere else.
2021-03-24 19:12:06 +01:00
Christoph Reiter
241620dc5f msys2-runtime: update 2021-03-17 07:46:02 +01:00
Johannes Schindelin
b5829a87d0 msys2-runtime: use the correct import library name
This fixes https://github.com/msys2/msys2-runtime/issues/26

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-03-15 11:05:02 +01:00
Christoph Reiter
d88c4706bd Use zstd for all packages now
It's been long enough and everyone should have a pacman that supports it
2020-12-19 17:48:10 +01:00
Christoph Reiter
39481ed0f0 msys2-runtime: refresh patches
For https://github.com/msys2/msys2-runtime/pull/17
2020-11-08 10:31:24 +01:00
Johannes Schindelin
b1c8e2fbc5 msys2-runtime: expose the "deep-copy" symlink behavior via a new mode
This patch synchronizes msys2/MSYS2-packages/msys2-runtime with
msys2/msys2-runtime after merging
https://github.com/msys2/msys2-runtime/pull/16.

We specifically override Cygwin's symlink() behavior to make deep copies
instead of creating a special-crafted system file that Cygwin (MSYS2,
and only those two) will recognize as symbolic link.

The patch to override this behavior is incomplete, though: it hacks up
the WSYM_sysfile code path, which causes all kinds of problems:

- Contrary to the documentation, MSYS=winsymlinks:native won't fall back
  to creating Cygwin-style symbolic links. Instead, it (quite
  surprisingly) creates deep copies instead.

- There is no way to opt into the original Cygwin behavior because that
  code path is now dead code.

- The fact that the WSYM_sysfile code path is modified to do something
  very different from what it is intended to do means that all changes
  that Cygwin makes to that code path have to be inspected, and
  occasionally even more hacks have to be put on top, such as 44bb133,
  where we specifically had to disable Cygwin's code to try creating WSL
  symlinks before falling back to creating system files instead).

Let's fix this by introducing a proper new mode:
MSYS=winsymlinks:deepcopy. This mode is made the default so
that users should be unaffected by this PR.

Users wishing to let the MSYS2 runtime create Cygwin-style
symbolic links can ask for that by setting
MSYS=winsymlinks:sysfile.

By fixing this issue, we can now stop disabling Cygwin's WSL
symlink behavior, too: it is in the sysfile code path and
won't affect the default behavior of the MSYS2 runtime.

While at it, the indentation of the original patch is fixed,
too.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-10-22 13:38:14 +02:00
Christoph Reiter
e3d2dae6a3 msys2-runtime: Update patches
See https://github.com/msys2/msys2-runtime/pull/15
2020-09-22 20:16:15 +02:00
Christoph Reiter
906e033002 msys2-runtime: Update to 3.1.7 2020-08-24 08:10:51 +02:00
Johannes Schindelin
526d2fc776 msys2-runtime: fix MSYS=wincmdln and turn it on by default
This ports the patches from https://github.com/msys2/Cygwin/pull/10 to
the actual package definition used to build the `msys2-runtime` package.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-08-14 15:11:44 +02:00
Christoph Reiter
bb27db732f msys2-runtime: Update patches
Fixes #2060
2020-08-10 09:41:08 +02:00
Christoph Reiter
a1d708c81d msys2-runtime: add a README to note that the patches are auto generated 2020-08-09 20:29:51 +02:00
Alexey Pavlov
63bc219cc8 msys2-runtime: Update to 3.1.6 2020-07-17 09:56:48 +03:00