mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 114.0.5715.0 (main) (#37976)

Browse source 
* chore: bump chromium in DEPS to 114.0.5712.0

* chore: update patches

* 4401084: Remove extensions::InfoMap which is no longer needed. | 4401084

* 4415646: Add more details to print settings error log | 4415646

* chore: bump chromium in DEPS to 114.0.5714.0

* chore: update patches

* chore: update libcxx filenames

* chore: bump chromium in DEPS to 114.0.5715.0

* chore: update patches

* fix extensions test

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
electron-roller[bot] 2023-04-17 14:40:26 -07:00 • committed by GitHub
parent 1ffe7ee76b
commit 7a6af1a529
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 174 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/chromium/resource_file_conflict.patch
View file

@ -52,10 +52,10 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index aa1284baec17bb01828afd0c61735ed29ae8d851..50a1715278cb1bbc25bd2270860b41229e884000 100644
index ee9a00bb6bbbacd0e304f156dbb10a65f7091f44..98c9dca792522fd27774d9d22ead61ee546b1832 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1585,7 +1585,7 @@ if (is_chrome_branded && !is_android) {
@@ -1580,7 +1580,7 @@ if (is_chrome_branded && !is_android) {
}
}
@ -64,7 +64,7 @@ index aa1284baec17bb01828afd0c61735ed29ae8d851..50a1715278cb1bbc25bd2270860b4122
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1614,6 +1614,12 @@ if (!is_android) {
@@ -1609,6 +1609,12 @@ if (!is_android) {
}
}