dsanders11

#53978: build: allow empty .patches files

Merged
Created: Sep 15, 2026, 7:30:36 PM
Merged: Sep 16, 2026, 11:40:01 AM
7 comments
Target: main

Description of Change

We've been doing more cherry picking of upstream security fixes lately, and dropping the patches once we land the corresponding upstream version. Currently this means patch directories (and their entry in patches/config.json) get removed when all patches are dropped in that directory, leading to increased merge conflict contention on patches/config.json and the patch directories.

Let's keep these empty .patches files around and their entry in patches/config.json to reduce these merge conflicts. I've had GPT grab any patch directories that have existed in the past year and restored them with an empty .patches to preempt any merge conflicts in the near future if we patch these again.

Checklist

Release Notes

Notes: none

Backports

43-x-y
Merged
PR Number
#54003
Merged At
Sep 16, 2026, 2:04:57 PM
Released In
Not yet
Release Date
Not yet
44-x-y
Merged
PR Number
#54004
Merged At
Sep 16, 2026, 1:55:11 PM
Released In
Not yet
Release Date
Not yet
45-x-y
Merged
PR Number
#54005
Merged At
Sep 16, 2026, 3:07:41 PM
Released In
Not yet
Release Date
Not yet

Semver Impact

Major
Breaking changes
Minor
New features
Patch
Bug fixes
None
Docs, tests, etc.

Semantic Versioning helps users understand the impact of updates:

  • Major (X.y.z): Breaking changes that may require code modifications
  • Minor (x.Y.z): New features that maintain backward compatibility
  • Patch (x.y.Z): Bug fixes that don't change the API
  • None: Changes that don't affect using facing parts of Electron