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

chore: bump chromium to 129.0.6654.0 (main) (#43312)

Browse source 
* chore: bump chromium in DEPS to 129.0.6654.0

* chore: update patches

* 5766075: Chromium UI for integration with the MacOS SCContentSharingPicker

5766075

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2024-08-13 15:04:43 -04:00 • committed by GitHub
parent 275b6a13b7
commit d004329f6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 54 additions and 52 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 e5c6da3ff6a8cc47d2c934ccdd4635decc1405bc..13cef63b5315eb1d8b188a0f5365b9af4ff1bf77 100644
index 4eebaff7c4232927ae87c220c419c0e2deb3b023..a71fc6ca3a3c86d96dde7401aa8b5d071c0862f2 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1580,7 +1580,7 @@ if (is_chrome_branded && !is_android) {
@@ -1585,7 +1585,7 @@ if (is_chrome_branded && !is_android) {
}
}
@ -64,7 +64,7 @@ index e5c6da3ff6a8cc47d2c934ccdd4635decc1405bc..13cef63b5315eb1d8b188a0f5365b9af
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1619,6 +1619,12 @@ if (!is_android) {
@@ -1624,6 +1624,12 @@ if (!is_android) {
}
}