mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
08a51f3339
* chore: bump chromium in DEPS to 121.0.6154.0
* chore: bump chromium in DEPS to 121.0.6155.0
* fix patches
* chore: update patches
* patch out reference to GetOcclusionTracker
* un-flag PIPOcclusionTracker
* chore: bump chromium in DEPS to 121.0.6157.0
* fix conflicts
https://chromium-review.googlesource.com/c/chromium/src/+/5038807
* add PIP occlusion tracker sources to chromium_src
* 5037591: Replace feature_list's Initialize* methods with Init*.
https://chromium-review.googlesource.com/c/chromium/src/+/5037591
* 4811903: Move //content/browser/renderer_host/input/synthetic_gesture_controller to //content/common/input
https://chromium-review.googlesource.com/c/chromium/src/+/4811903
* 4917953: usb: Add usb-unrestricted to permission policy
https://chromium-review.googlesource.com/c/chromium/src/+/4917953
* 5072395: Remove unused `creation_context` parameter from blink/public APIs
https://chromium-review.googlesource.com/c/chromium/src/+/5072395
* 5052035: [X11] Change AtomCache from a singleton to owned by Connection
https://chromium-review.googlesource.com/c/chromium/src/+/5052035
* fix v8/.patches
* node script/gen-libc++-filenames.js
* 5035771: Remove the SetImage method of ImageButton
https://chromium-review.googlesource.com/c/chromium/src/+/5035771
* fixup! 5052035: [X11] Change AtomCache from a singleton to owned by Connection
* fixup! 5035771: Remove the SetImage method of ImageButton
* chore: bump chromium in DEPS to 121.0.6159.0
* 4505903: [Extensions] Add lastAccessed property to chrome.tabs.Tab
https://chromium-review.googlesource.com/c/chromium/src/+/4505903
* update patches
* don't duplicate tabs API types
this causes weird memory bugs if the two get out of sync
* fix UAF in TrayIconCocoa
not sure why this is popping up just now ... this has been broken for ages afaict
* Revert "don't duplicate tabs API types"
This reverts commit 80dff2efaa.
This is failing tests with extensions API schema check failures, so
revert for now. we'll fix it later.
* revert v8 change causing node crashes
* chore: reduce diffs in revert_api_dcheck-fail_when_we_reenter_v8_while_terminating.patch
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@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 03015b85bdf0ef82991e2359f537ae92d5612073..be801e0a1b7797fca4c057326fae05ae5cc4c377 100755
|
|
--- a/tools/licenses/licenses.py
|
|
+++ b/tools/licenses/licenses.py
|
|
@@ -419,6 +419,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
|