Skip to content

Commit

Permalink
Fix various outdated URLs
Browse files Browse the repository at this point in the history
+ one internal wrong anchor
+ replace mirbsd.org with the web archive
  • Loading branch information
lazka committed May 4, 2024
1 parent 52e19f1 commit 4677601
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion web/dev/package-licensing.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ licenses are recorded in a package:
#### The license array field

* Values starting with `spdx:` are [SPDX license
expressions](https://spdx.github.io/spdx-spec/SPDX-license-expressions/).
expressions](https://spdx.github.io/spdx-spec/v3.0/annexes/SPDX-license-expressions/).
Example: `('spdx:GPL-2.0-or-later')`
* Multiple values starting with `spdx:` are treated as if they are combined with
`OR`. Example: `('spdx:LGPL-2.1-only', 'spdx:MPL-1.1')` is the same as
Expand Down
10 changes: 5 additions & 5 deletions web/wiki/Devtopics.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,18 @@ Altough we are probably not so big among end-users yet, a lot of cross-platform

Links:

- https://vcpkg.readthedocs.io/en/latest/maintainers/vcpkg_acquire_msys/
- https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_acquire_msys
- https://chocolatey.org/packages/msys2/
- https://github.com/msys2/setup-msys2
- https://github.com/actions/virtual-environments/blob/master/images/win/Windows2019-Readme.md (https://github.com/actions/virtual-environments/pull/632 + https://github.com/actions/virtual-environments/pull/630)
- https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md (https://github.com/actions/virtual-environments/pull/632 + https://github.com/actions/virtual-environments/pull/630)
- https://www.appveyor.com/docs/windows-images-software/#mingw-msys-cygwin
- https://docs.travis-ci.com/user/reference/windows/#how-do-i-use-msys2
- https://circleci.com/docs/2.0/hello-world-windows/
- https://github.com/git-for-windows/git/issues/284
- https://github.com/Alexpux/Cygwin/pull/8
- https://gitlab.haskell.org/ghc/ghc/wikis/building/preparation/windows
- https://wiki.qt.io/MSYS2
- https://www.gtk.org/download/windows.php#MSYS2
- https://www.gtk.org/docs/installations/windows
- https://cran.r-project.org/bin/windows/Rtools/
- https://wiki.inkscape.org/wiki/index.php?title=Compiling_Inkscape_on_Windows_with_MSYS2
- https://wiki.gnome.org/Initiatives/Windows
Expand All @@ -105,7 +105,7 @@ What to do to get them:

Links:

- https://www.msys2.org/wiki/Contributing-to-MSYS2/
- https://www.msys2.org/get-involved/


Fix pacman errors wrt. conflicts in `bin/foo` vs `bin/foo.exe`
Expand Down Expand Up @@ -144,7 +144,7 @@ Links:
- [GnuWin](http://gnuwin32.sourceforge.net)
- [UnxUtils](http://unxutils.sourceforge.net/)
- [GNU on Windows](https://github.com/bmatzelle/gow/wiki)
- [mksh/Win32](https://www.mirbsd.org/permalinks/wlog-10_e20130718-tg.htm)
- [mksh/Win32](https://web.archive.org/web/20231203014653/https://www.mirbsd.org/permalinks/wlog-10_e20130718-tg.htm)
- [busybox-w32](https://frippery.org/busybox/) and [MinGit](https://github.com/git-for-windows/git/wiki/MinGit#experimental-busybox-based-mingit) and [mingw-w64-busybox](https://github.com/git-for-windows/MINGW-packages/tree/main/mingw-w64-busybox)


Expand Down
2 changes: 1 addition & 1 deletion web/wiki/Distributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ Possibly useful sources of information
- a [Makefile rule](https://github.com/matlo/GIMX/blob/e461c6ed3650b3707c17252a367413b36d1d1d0e/Makefile#L26) from @matlo
- a newer [Makefile rule](https://github.com/matlo/GIMX/blob/master/Makefile#L27-L56) from @matlo
- the [`pactree`](https://man.archlinux.org/man/pactree.8) command
- a [`copy_dependencies.py` script](https://bitbucket.org/librepilot/librepilot/src/4c9c3c202caad2250a35ce6aed796f5f46b5224c/make/copy_dependencies.py) for librepilot from @filnet, [discussion](https://github.com/Alexpux/MINGW-packages/issues/2634)
- a [`copy_dependencies.py` script](https://bitbucket.org/librepilot/librepilot/src/4c9c3c202caad2250a35ce6aed796f5f46b5224c/make/copy_dependencies.py) for librepilot from @filnet, [discussion](https://github.com/MSYS2/MINGW-packages/issues/2634)
- the [rtools-installer](https://github.com/r-windows/rtools-installer) project
- the [build script for quodlibet](https://github.com/quodlibet/quodlibet/blob/master/dev-utils/win_installer/_base.sh)
2 changes: 1 addition & 1 deletion web/wiki/How-does-MSYS2-differ-from-Cygwin.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Runtime

Cygwin provides a runtime library called `cygwin1.dll` that provides the POSIX compatibility layer where necessary. The MSYS2 variant of this library is called `msys-2.0.dll` and includes the following changes to support using native Windows programs:

1. Automatic path mangling of command line arguments and environment variables to Windows form on the fly. (This can be [selectively turned off](Porting.md#user-content-filesystem-namespaces).)
1. Automatic path mangling of command line arguments and environment variables to Windows form on the fly. (This can be [selectively turned off](Porting.md#filesystem-namespaces).)
2. Ability to change the reported OS using an environment variable (`MSYSTEM`, with values of `MSYS2`, `MINGW32`, and `MINGW64`). This allows mingw-w64 software to be built in native build mode (as opposed to cross-compilation mode).
3. Conversion of output of native Windown applications from Windows line endings to POSIX line endings by removing trailing `'\r'` characters, so that e.g. `bb=$(gcc --print-search-dirs)` works as expected.
4. Replacement of symlinks with copying, so that Windows programs don't trip up on these files. MSYS2 also supports creating native NTFS symlinks, but these are limited in other ways.
Expand Down
2 changes: 1 addition & 1 deletion web/wiki/Launchers.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Configuration for [an MSYS2 shell in Visual Studio Code](https://stackoverflow.c

**msystem.bat** and cmd/clink integration in the `filesystem-cmd` package from @userzimmermann. [PR](https://github.com/Alexpux/MSYS2-packages/pull/350), [commits](https://github.com/userzimmermann/MSYS2-packages/commits/ed54eccce9716b9471c63bc1738ebbab637ed552)

**git-bash.exe** and **start-ssh-agent.cmd** as part of the Git for Windows project from @dscho. [GitHub](https://github.com/git-for-windows/git/blob/master/compat/win32/git-wrapper.c), [GitHub](https://github.com/git-for-windows/MINGW-packages/tree/master/mingw-w64-git)
**git-bash.exe** and **start-ssh-agent.cmd** as part of the Git for Windows project from @dscho. [GitHub](https://github.com/git-for-windows/MINGW-packages/blob/main/mingw-w64-git/git-wrapper.c), [GitHub](https://github.com/git-for-windows/MINGW-packages/tree/master/mingw-w64-git)

**Open MSYS2 here** from @magthe, with contributions from @sushovan-dw and @ryanpfeeley. [Gist+discussion](https://gist.github.com/magthe/a60293fe395af7245a9e)

Expand Down
2 changes: 1 addition & 1 deletion web/wiki/Porting.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ Cygwin/MSYS2 programs have to deal with a mix of both approaches, but they can a

["How Command Line Parameters Are Parsed" by David Deley](http://www.daviddeley.com/autohotkey/parameters/parameters.htm)

["Everyone quotes command line arguments the wrong way" by Daniel Colascione](http://blogs.msdn.com/b/twistylittlepassagesallalike/archive/2011/04/23/everyone-quotes-arguments-the-wrong-way.aspx)
["Everyone quotes command line arguments the wrong way" by Daniel Colascione](https://learn.microsoft.com/en-gb/archive/blogs/twistylittlepassagesallalike/everyone-quotes-command-line-arguments-the-wrong-way)

Other resources
---------------
Expand Down
2 changes: 1 addition & 1 deletion web/wiki/Signing-packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ To import and sign your key with `pacman-key`:
2. `pacman-key --lsign-key <keyid>`
[more...](https://wiki.archlinux.org/index.php/pacman-key#Adding_unofficial_keys)

To make your key a trusted developer key for signing official packages, you have to get your key included in the respective keyring and get it signed by at least 3 master keys. The package and repository is `msys2-keyring` for MSYS2, see [Alexpux/msys2-keyring](https://github.com/Alexpux/MSYS2-keyring/). The package and repository for Arch Linux is `archlinux-keyring`, see https://projects.archlinux.org/archlinux-keyring.git/. These packages install keyring files into `/usr/share/pacman/keyrings` which then can be imported and locally signed in one batch using `pacman-key --populate <keyringname>`.
To make your key a trusted developer key for signing official packages, you have to get your key included in the respective keyring and get it signed by at least 3 master keys. The package and repository is `msys2-keyring` for MSYS2, see [Alexpux/msys2-keyring](https://github.com/Alexpux/MSYS2-keyring/). The package and repository for Arch Linux is `archlinux-keyring`, see https://gitlab.archlinux.org/archlinux/archlinux-keyring. These packages install keyring files into `/usr/share/pacman/keyrings` which then can be imported and locally signed in one batch using `pacman-key --populate <keyringname>`.


Actually sign stuff
Expand Down

0 comments on commit 4677601

Please sign in to comment.