diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-10-17 20:07:04 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-06-30 19:42:43 +0300 |
| commit | 4a371c97f422d0dc68fece2fe56d544ccd6558e9 (patch) | |
| tree | a505a49b9f6ec5aae7daaef52487b2ea91fa57a7 /docs | |
| parent | eb3b35ae024651743bc1e2b8e50566b6f53d95ae (diff) | |
| download | meson-4a371c97f422d0dc68fece2fe56d544ccd6558e9.zip meson-4a371c97f422d0dc68fece2fe56d544ccd6558e9.tar.gz meson-4a371c97f422d0dc68fece2fe56d544ccd6558e9.tar.bz2 | |
wrap: Apply patch even in VCS cases
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/markdown/Wrap-dependency-system-manual.md | 12 | ||||
| -rw-r--r-- | docs/markdown/snippets/wrap_patch.md | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/docs/markdown/Wrap-dependency-system-manual.md b/docs/markdown/Wrap-dependency-system-manual.md index f6c658f..e59a6be 100644 --- a/docs/markdown/Wrap-dependency-system-manual.md +++ b/docs/markdown/Wrap-dependency-system-manual.md @@ -70,11 +70,7 @@ revision = head ## Accepted configuration properties for wraps - `directory` - name of the subproject root directory, defaults to the name of the wrap. -### Specific to wrap-file -- `source_url` - download url to retrieve the wrap-file source archive -- `source_fallback_url` - fallback URL to be used when download from `source_url` fails *Since: 0.55.0* -- `source_filename` - filename of the downloaded source archive -- `source_hash` - sha256 checksum of the downloaded source archive +Since *0.55.0* those can be used in all wrap types, they were previously reserved to `wrap-file`: - `patch_url` - download url to retrieve an optional overlay archive - `patch_fallback_url` - fallback URL to be used when download from `patch_url` fails *Since: 0.55.0* - `patch_filename` - filename of the downloaded overlay archive @@ -82,6 +78,12 @@ revision = head - `patch_directory` - *Since 0.55.0* Overlay directory, alternative to `patch_filename` in the case files are local instead of a downloaded archive. The directory must be placed in `subprojects/packagefiles`. + +### Specific to wrap-file +- `source_url` - download url to retrieve the wrap-file source archive +- `source_fallback_url` - fallback URL to be used when download from `source_url` fails *Since: 0.55.0* +- `source_filename` - filename of the downloaded source archive +- `source_hash` - sha256 checksum of the downloaded source archive - `lead_directory_missing` - for `wrap-file` create the leading directory name. Needed when the source file does not have a leading directory. diff --git a/docs/markdown/snippets/wrap_patch.md b/docs/markdown/snippets/wrap_patch.md index d5a1f5f..ae66bbd 100644 --- a/docs/markdown/snippets/wrap_patch.md +++ b/docs/markdown/snippets/wrap_patch.md @@ -12,3 +12,8 @@ case overlay files are local. Every files in that directory, and subdirectories, will be copied to the subproject directory. This can be used for example to add `meson.build` files to a project not using Meson build system upstream. The patch directory must be placed in `subprojects/packagefiles` directory. + +## Patch on all wrap types + +`patch_*` keys are not limited to `wrap-file` any more, they can be specified for +all wrap types. |