mirror of
https://github.com/electron/electron.git
synced 2026-01-07 22:54:25 -05:00
c3036d4557
* chore: bump chromium in DEPS to 117.0.5929.0 * chore: bump chromium in DEPS to 117.0.5931.0 * chore: bump chromium in DEPS to 117.0.5932.0 * chore: update patches * 4728317: Prevent PrintRenderFrameHelper from printing when already printing | https://chromium-review.googlesource.com/c/chromium/src/+/4728317 * 4739501: Use base::SequenceBound to manage SerialPortManagerImpl | https://chromium-review.googlesource.com/c/chromium/src/+/4739501 * 4702051: Allow overriding source in install-sysroot.py | https://chromium-review.googlesource.com/c/chromium/src/+/4702051 * chore: update filenames.libcxx.gni * 4727002: Rename "enable_arc2" to "enable_arc" | https://chromium-review.googlesource.com/c/chromium/src/+/4727002 * chore: bump chromium in DEPS to 117.0.5934.0 * 4736873: Rename ColorSpaces methods on display::Display | https://chromium-review.googlesource.com/c/chromium/src/+/4736873 * 4727203: Replace bool with an enum in as suggested in DevtoolsManagerDelegate. | https://chromium-review.googlesource.com/c/chromium/src/+/4727203 * 4744479: [DevTools] Add 'generateTaggedPDF' option to DevTools Page.printToPDF | https://chromium-review.googlesource.com/c/chromium/src/+/4744479 * 4735893: Don't share WebUSB permissions with webviews | https://chromium-review.googlesource.com/c/chromium/src/+/4735893 * revert: update filenames.libcxx.gni * chore: bump chromium in DEPS to 117.0.5936.0 * chore: update patches * 4746465: SAA: Query for embargoed StorageAccess permissions | https://chromium-review.googlesource.com/c/chromium/src/+/4746465 * 4666325: Move buildtools/third_party/lib*/trunk source paths to third_party/lib*/src. | https://chromium-review.googlesource.com/c/chromium/src/+/4666325 * chore: bump chromium in DEPS to 117.0.5938.0 * chore: bump chromium in DEPS to 118.0.5939.0 * chore: update patches * Send line bounds through CursorAnchorInfo on requestCursorUpdate https://chromium-review.googlesource.com/c/chromium/src/+/4394588 * Fixup lint for Move buildtools/third_party/lib*/trunk source paths to third_party/lib*/src * 4700305: [mac] Fix override of CHILD_PROCESS_EXE https://chromium-review.googlesource.com/c/chromium/src/+/4700305 Needed because of 4729689: Reland "Remove redundant existence check in PathService" | https://chromium-review.googlesource.com/c/chromium/src/+/4729689 * 4753759: More consistent icon handling for menus. https://chromium-review.googlesource.com/c/chromium/src/+/4753759 * chore: bump chromium in DEPS to 118.0.5941.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5938.0 * test: update nan-spec-runner cflags * build: fix isystem include path in nan-spec-runner * fixup! 4666325: Move buildtools/third_party/lib*/trunk source paths to third_party/lib*/src. | https://chromium-review.googlesource.com/c/chromium/src/+/4666325 fix a few more instances of the old path libc++.a and libc++abi.a are still in buildtools/ --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Charles Kerr <charles@charleskerr.com>
|
|
Date: Tue, 9 Aug 2022 12:35:36 -0500
|
|
Subject: add electron deps to license credits file
|
|
|
|
Ensure that licenses for the dependencies introduced by Electron
|
|
are included in `LICENSES.chromium.html`
|
|
|
|
diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py
|
|
index 15b461326e2ce4bd255cbe779b449261a7f63f09..ae6c83557dc3f299b33a5e42afb3d587c5c72100 100755
|
|
--- a/tools/licenses/licenses.py
|
|
+++ b/tools/licenses/licenses.py
|
|
@@ -424,6 +424,31 @@ SPECIAL_CASES = {
|
|
"License": "Apache 2.0",
|
|
"License File": ["//third_party/selenium-atoms/LICENSE.closure"],
|
|
},
|
|
+ os.path.join('third_party', 'electron_node'): {
|
|
+ "Name": "Node.js",
|
|
+ "URL": "https://github.com/nodejs/node",
|
|
+ "License": "MIT",
|
|
+ "License File": ["/third_party/electron_node/LICENSE"],
|
|
+ },
|
|
+ os.path.join('third_party', 'squirrel.mac'): {
|
|
+ "Name": "Squirrel",
|
|
+ "URL": "https://github.com/Squirrel/Squirrel.Mac",
|
|
+ "License": "MIT",
|
|
+ "License File": ["/third_party/squirrel.mac/LICENSE"],
|
|
+ },
|
|
+ os.path.join('third_party', 'squirrel.mac', 'vendor', 'mantle'): {
|
|
+ "Name": "Mantle",
|
|
+ "URL": "https://github.com/Mantle/Mantle",
|
|
+ "License": "MIT",
|
|
+ "License File": "/third_party/squirrel.mac/vendor/mantle/LICENSE.md",
|
|
+ },
|
|
+ os.path.join('third_party', 'squirrel.mac', 'vendor', 'ReactiveObjC'): {
|
|
+ "Name": "ReactiveObjC",
|
|
+ "URL": "https://github.com/ReactiveCocoa/ReactiveObjC",
|
|
+ "License": "MIT",
|
|
+ "License File":
|
|
+ ["/third_party/squirrel.mac/vendor/ReactiveObjC/LICENSE.md"],
|
|
+ },
|
|
}
|
|
|
|
# These buildtools/third_party directories only contain
|