mirror of
https://github.com/electron/electron.git
synced 2026-01-09 23:48:01 -05:00
* chore: bump chromium in DEPS to 117.0.5921.0 * chore: update chromium patches * 4721409: Remove redundant ARC configuration in /components | https://chromium-review.googlesource.com/c/chromium/src/+/4721409 * 4643750: Add V8_LOW_PRIORITY_TQ for main thread | https://chromium-review.googlesource.com/c/chromium/src/+/4643750 * 4022621: Re-register status item when owner of status watcher is changed | https://chromium-review.googlesource.com/c/chromium/src/+/4022621 * chore: update V8/boringssl patches * fixup! 4643750: Add V8_LOW_PRIORITY_TQ for main thread | https://chromium-review.googlesource.com/c/chromium/src/+/4643750 * chore: bump chromium in DEPS to 117.0.5923.0 * build [debug]: remove assert 4722125: Update enterprise content analysis buildflags usage | https://chromium-review.googlesource.com/c/chromium/src/+/4722125 * chore: manually rollback to 117.0.5921.0 * build [arc]: ARC conversion in auto_updater * build [arc]: ARC conversion in browser/api * build [arc]: ARC conversion in notifications/mac * build [arc]: ARC conversion in in_app_purchase * build [arc]: ARC conversion in browser/ui * build [arc]: ARC conversion in ui/cocoa * build [arc]: ARC conversion in shell/common * build [arc]: ARC conversion in OSR * build [arc]: ARC conversion in login_helper * build [arc]: ARC conversion in app_mas * build [arc]: fix up ARC syntax (thanks @codebytere!) * 4726946: [Extensions] Work around dangling BrowserContext pointer. | https://chromium-review.googlesource.com/c/chromium/src/+/4726946 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: VerteDinde <keeleymhammond@gmail.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 81dd367a1a3f0b59832406e97e3eb0b869741a34..2fbe3091c32dd1b3771711b84c86eaab67fd7a0e 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"],
|
|
+ },
|
|
}
|
|
|
|
# The delimiter used to separate license files specified in the 'License File'
|