Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add patch_user #3332

Merged
merged 1 commit into from
Aug 28, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions reference/tools/files/patches.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ With different patches for different versions:
ret = g_test_run ();
- patch_file: "patches/0003-fix-content-length-calculation.patch"


For each patch, a ``patch_file``, a ``patch_string`` or a ``patch_user`` field must be provided. The first two are automatically applied by ``apply_conandata_patches()``, while ``patch_user`` are ignored, and must be handled by the user directly in the ``conanfile.py`` recipe.
Copy link
Contributor

@franramirez688 franramirez688 Aug 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd have rephrased it a little bit:

Fields like ``patch_file``, ``patch_string`` or ``patch_user`` must be provided for each patch. The first two
are automatically applied by ``apply_conandata_patches()``, while ``patch_user``is ignored and must be
handled by the user directly in the ``conanfile.py`` recipe.



conan.tools.files.export_conandata_patches()
--------------------------------------------

Expand Down