mirror of
https://github.com/electron/electron.git
synced 2026-01-08 15:13:52 -05:00
2e4e6f10de
* chore: bump chromium in DEPS to 122.0.6223.0 * 5129828: Removes special cases for selenium-atoms dependencies. https://chromium-review.googlesource.com/c/chromium/src/+/5129828 * chore: fixup patch indices * 5139789: Deduplicate BrowserContext's ResourceContext https://chromium-review.googlesource.com/c/chromium/src/+/5139789 * 5148579: Simplify SelectFileDialog::Listener https://chromium-review.googlesource.com/c/chromium/src/+/5148579 * 5134038: Code Health: Use string_view in base::i18n::BreakIterator::SetText https://chromium-review.googlesource.com/c/chromium/src/+/5134038 * 5137427: Code Health: Use string_view in SpellCheck::SpellCheckWord https://chromium-review.googlesource.com/c/chromium/src/+/5137427 * [libcxx] adds ranges::fold_left_with_iter and ranges::fold_left Notable things in this commit: * refactors `__indirect_binary_left_foldable`, making it slightly different (but equivalent) to _`indirect-binary-left-foldable`_, which improves readability (a [patch to the Working Paper][patch] was made) * omits `__cpo` namespace, since it is not required for implementing niebloids (a cleanup should happen in 2024) * puts tests ensuring invocable robustness and dangling correctness inside the correctness testing to ensure that the algorithms' results are still correct [patch]: https://github.com/cplusplus/draft/pull/6734 * chore: bump chromium in DEPS to 122.0.6224.0 * 5154766: [Refresh 2023] [GTK] Fix gap above toolbar with fractional scaling https://chromium-review.googlesource.com/c/chromium/src/+/5154766 * chore: fixup patch indices * 5094458: Remove extra CGColorSpace parameters from skia and ui helpers https://chromium-review.googlesource.com/c/chromium/src/+/5094458 * chore: bump chromium in DEPS to 122.0.6226.0 * chore: update patches * chore: bump chromium in DEPS to 122.0.6227.0 * chore: update patches * chore: bump chromium in DEPS to 122.0.6228.0 * chore: update patches * chore: bump chromium in DEPS to 122.0.6230.0 * chore: bump chromium in DEPS to 122.0.6232.0 * chore: bump chromium in DEPS to 122.0.6234.0 * chore: bump chromium in DEPS to 122.0.6236.2 * chore: update patches * fix: remove --disable-color-correct-renderering Per https://electronhq.slack.com/archives/CB6CG54DB/p1698444047862459 it is not used any more and was never documented. * chore: add WEB_PRINTING to content permission converter Unused in non-cros so no need to document Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5136178 * chore: Views is now vec<raw_ptr> instead of raw<T*> Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5140028 * spec: add Iterator to global intrinsics --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org>
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 cc7b17e13c4c8b9e483df9a097b23935ab2e56bc..b89810659dab27dd8150c0b7185ea2b679ab98a4 100755
|
|
--- a/tools/licenses/licenses.py
|
|
+++ b/tools/licenses/licenses.py
|
|
@@ -336,6 +336,31 @@ SPECIAL_CASES = {
|
|
"License": "Apache 2.0",
|
|
"License File": ["//third_party/dawn/third_party/khronos/LICENSE"],
|
|
},
|
|
+ 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
|