From f1a653b812e2a3d1b02ea287035431c2884126ba Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 10 Feb 2023 19:37:46 +0800 Subject: [PATCH 1/2] Migrate Microsoft/vcpkg#27386 --- vcpkg/contributing/maintainer-guide.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/vcpkg/contributing/maintainer-guide.md b/vcpkg/contributing/maintainer-guide.md index d78f99c6..963bd081 100644 --- a/vcpkg/contributing/maintainer-guide.md +++ b/vcpkg/contributing/maintainer-guide.md @@ -332,6 +332,27 @@ For more information, see the [Versioning reference](../users/versioning.md) and ## Patching +vcpkg is a packaging solution, not the ultimate owners of the components that we deploy. We do need to apply patches in some cases to improve compatibility of components with platforms, or compatibility of components with each other. + +* We want to avoid patches that: + * upstream would disagree with + * cause vulnerabilities or crashes + * we are incapable of maintaining across upstream version updates + * are large enough to cause license entanglement with the vcpkg repository itself + +### Notify upstream owners for upstream relevant patches + +If a patch could possibly be useful by upstream, upstream must be notified of the patch's content. (Patches that apply vcpkg-specific behavior unrelated to upstream, such as devendoring a dependency, don't require notification.) + +To avoid situations where upstream disagrees with the patch, we will wait at least 30 days to apply such patches. + +We will skip this waiting period if we have high confidence that the change is correct. Examples of high confidence patches include, but are not limited to: + +* Upstream's acceptance as a patch (for example, backporting a specific change from a pull request upstream has merged). +* Adding missing `#include`s. +* Small and obvious product code fixes (for example, initializing an uninitialized variable). +* Disabling irrelevant-in-vcpkg components of the build such as tests or examples. + ### Prefer options over patching It is preferable to set options in a call to `vcpkg_configure_xyz()` over patching the settings directly. From a3c0bcc1bff8ad2df4e60dea3bfc6594d03402e9 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 10 Feb 2023 19:50:08 +0800 Subject: [PATCH 2/2] change date --- vcpkg/contributing/maintainer-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg/contributing/maintainer-guide.md b/vcpkg/contributing/maintainer-guide.md index 963bd081..cd0750d4 100644 --- a/vcpkg/contributing/maintainer-guide.md +++ b/vcpkg/contributing/maintainer-guide.md @@ -1,7 +1,7 @@ --- title: vcpkg Maintainer Guide description: The Guide for maintainers contributing to vcpkg. -ms.date: 11/30/2022 +ms.date: 2/10/2023 --- # Maintainer Guide