-
Notifications
You must be signed in to change notification settings - Fork 194
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Release notes:
https://chromereleases.googleblog.com/2023/05/stable-channel-update-for-desktop_30.html
https://chromereleases.googleblog.com/2023/06/stable-channel-update-for-desktop.html
https://chromereleases.googleblog.com/2023/06/stable-channel-update-for-desktop_13.html
Build and patch changes:
------------------------
Drop 0024-Backport-Fix-erroneous-SupportsOstreamOperator-int-i.patch and
0025-Backport-Do-not-use-std-monospace-for-absl-variant.patch as they
are included upstream now.
Add one more fixed defaulted `operator==` to
0018-Only-default-operator-on-declaration.patch.
Modify 0019-Backport-constexpr-std-string-fixes.patch and
0022-Backport-Avoid-capturing-structured-bindings.patch to work with 114
instead of 113.
Add some more needed `typename`s to 0021-Add-missing-typename-s.patch.
Add 0027-Don-t-pass-disable-auto-upgrade-debug-info-to-linker.patch to
fix a build error due to upstream using an lld CLI option that's not yet
available for us.
Add 0028-Avoid-capturing-structured-bindings.patch to fix build errors
due to a C++20-specific feature being used with clang < 16.
Add 0029-Backport-IWYU-for-translate-TranslateUiLanguagesMana.patch to
fix a build error due to a missing include.
Add 0030-Backport-Avoid-operator-which-is-C-20-specific.patch to fix
build errors due to C++-specific features.
Rebase remaining patches.
License changes:
----------------
Added licenses:
* third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava/LICENSE
- https://chromium-review.googlesource.com/c/chromium/src/+/4474588
Removed licenses:
* third_party/android_deps/libs/com_google_android_gms_play_services_fido/LICENSE
- https://chromium-review.googlesource.com/c/chromium/src/+/4367668
* third_party/web-animations-js/LICENSE
- https://chromium-review.googlesource.com/c/chromium/src/+/4382315
Updated licenses:
* third_party/d3/src/LICENSE
- https://chromium-review.googlesource.com/c/chromium/src/+/4408903
* third_party/eigen3/LICENSE
- https://chromium-review.googlesource.com/c/chromium/src/+/4522046
* third_party/harfbuzz-ng/src/COPYING
- https://chromium-review.googlesource.com/c/chromium/src/+/4464912
* third_party/openscreen/src/LICENSE
- https://chromium-review.googlesource.com/c/openscreen/+/4380180
Test-built:
-----------
* chromium-ozone-wayland:
- master, clang, MACHINE=qemux86-64
- mickledore, clang, MACHINE=qemux86-64, qemuarm64
- kirkstone, clang, MACHINE=raspberrypi4-64, qemux86-64
- dunfell, clang**, MACHINE=qemux86-64
* chromium-x11
- master, clang, MACHINE=raspberrypi4-64, qemux86-64, qemuarm64, qemuarm
- mickledore, clang, MACHINE=raspberrypi4-64, qemux86-64, qemuarm64, qemuarm
- kirkstone, clang, MACHINE=raspberrypi4-64, qemux86-64, qemuarm64, qemuarm
- dunfell, clang**, MACHINE=raspberrypi4-64***, qemux86-64, qemuarm64, qemuarm
** Please note that Chromium requires below set-up when on dunfell
branch.
- The clang version to be >= 12 and for that, use the latest
meta-clang/dunfell-clang12 branch.
- Require the latest meta-oe with Nodejs 14.x support.
- Add the PREFERRED_VERSION_nodejs-native = "14.%" in conf/local.conf
file.
*** Please note that there currently is a problem on RPi4/dunfell where
Chromium's network service crashes.
Signed-off-by: Max Ihlenfeldt <[email protected]>- Loading branch information
1 parent
b279a4d
commit 97c2690
Showing
23 changed files
with
375 additions
and
1,250 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,7 @@ Signed-off-by: Maksim Sisov <[email protected]> | |
| 2 files changed, 11 insertions(+), 6 deletions(-) | ||
|
|
||
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | ||
| index d3adf9735ca95..bbe807fdc7b04 100644 | ||
| index 28c2255ba8090..d740c7caf9427 100644 | ||
| --- a/build/config/compiler/BUILD.gn | ||
| +++ b/build/config/compiler/BUILD.gn | ||
| @@ -680,7 +680,7 @@ config("compiler") { | ||
|
|
@@ -29,7 +29,7 @@ index d3adf9735ca95..bbe807fdc7b04 100644 | |
| "-mllvm:-import-instr-limit=$import_instr_limit", | ||
| "/lldltocache:" + | ||
| rebase_path("$root_out_dir/thinlto-cache", root_build_dir), | ||
| @@ -693,11 +693,11 @@ config("compiler") { | ||
| @@ -694,11 +694,11 @@ config("compiler") { | ||
| # usage in crbug.com/1038040. Note this will increase build time in | ||
| # Chrome OS. | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod <[email protected]> | |
| 1 file changed, 38 deletions(-) | ||
|
|
||
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | ||
| index bbe807fdc7b04..ca70a35b4d269 100644 | ||
| index d740c7caf9427..8f13f37d347cc 100644 | ||
| --- a/build/config/compiler/BUILD.gn | ||
| +++ b/build/config/compiler/BUILD.gn | ||
| @@ -996,11 +996,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1005,11 +1005,6 @@ config("compiler_cpu_abi") { | ||
| ] | ||
| } | ||
| } else if (current_cpu == "arm") { | ||
|
|
@@ -36,7 +36,7 @@ index bbe807fdc7b04..ca70a35b4d269 100644 | |
| if (!is_nacl) { | ||
| cflags += [ | ||
| "-march=$arm_arch", | ||
| @@ -1010,12 +1005,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1019,12 +1014,6 @@ config("compiler_cpu_abi") { | ||
| if (arm_tune != "") { | ||
| cflags += [ "-mtune=$arm_tune" ] | ||
| } | ||
|
|
@@ -49,7 +49,7 @@ index bbe807fdc7b04..ca70a35b4d269 100644 | |
| } else if (current_cpu == "mipsel" && !is_nacl) { | ||
| ldflags += [ "-Wl,--hash-style=sysv" ] | ||
| if (custom_toolchain == "") { | ||
| @@ -1023,9 +1012,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1032,9 +1021,6 @@ config("compiler_cpu_abi") { | ||
| if (is_android) { | ||
| cflags += [ "--target=mipsel-linux-android" ] | ||
| ldflags += [ "--target=mipsel-linux-android" ] | ||
|
|
@@ -59,7 +59,7 @@ index bbe807fdc7b04..ca70a35b4d269 100644 | |
| } | ||
| } else { | ||
| cflags += [ "-EL" ] | ||
| @@ -1105,8 +1091,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1114,8 +1100,6 @@ config("compiler_cpu_abi") { | ||
| ldflags += [ "-Wl,--hash-style=sysv" ] | ||
| if (custom_toolchain == "") { | ||
| if (is_clang) { | ||
|
|
@@ -68,7 +68,7 @@ index bbe807fdc7b04..ca70a35b4d269 100644 | |
| } else { | ||
| cflags += [ "-EB" ] | ||
| ldflags += [ "-EB" ] | ||
| @@ -1154,9 +1138,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1163,9 +1147,6 @@ config("compiler_cpu_abi") { | ||
| if (is_android) { | ||
| cflags += [ "--target=mips64el-linux-android" ] | ||
| ldflags += [ "--target=mips64el-linux-android" ] | ||
|
|
@@ -78,7 +78,7 @@ index bbe807fdc7b04..ca70a35b4d269 100644 | |
| } | ||
| } else { | ||
| cflags += [ | ||
| @@ -1214,8 +1195,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1223,8 +1204,6 @@ config("compiler_cpu_abi") { | ||
| ldflags += [ "-Wl,--hash-style=sysv" ] | ||
| if (custom_toolchain == "") { | ||
| if (is_clang) { | ||
|
|
@@ -87,7 +87,7 @@ index bbe807fdc7b04..ca70a35b4d269 100644 | |
| } else { | ||
| cflags += [ | ||
| "-EB", | ||
| @@ -1378,23 +1357,6 @@ config("compiler_deterministic") { | ||
| @@ -1387,23 +1366,6 @@ config("compiler_deterministic") { | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <[email protected]> | |
| 1 file changed, 10 deletions(-) | ||
|
|
||
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | ||
| index ca70a35b4d269..a789a5aa0178c 100644 | ||
| index 8f13f37d347cc..e3f22ce0a471b 100644 | ||
| --- a/build/config/compiler/BUILD.gn | ||
| +++ b/build/config/compiler/BUILD.gn | ||
| @@ -995,16 +995,6 @@ config("compiler_cpu_abi") { | ||
| @@ -1004,16 +1004,6 @@ config("compiler_cpu_abi") { | ||
| "-msse3", | ||
| ] | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <[email protected]> | |
| 1 file changed, 5 insertions(+) | ||
|
|
||
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | ||
| index a789a5aa0178c..fe0f989625879 100644 | ||
| index e3f22ce0a471b..19badda7d644b 100644 | ||
| --- a/build/config/compiler/BUILD.gn | ||
| +++ b/build/config/compiler/BUILD.gn | ||
| @@ -1583,6 +1583,11 @@ config("default_warnings") { | ||
| @@ -1592,6 +1592,11 @@ config("default_warnings") { | ||
| cflags += [ | ||
| "-Wenum-compare-conditional", | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod <[email protected]> | |
| 2 files changed, 4 insertions(+) | ||
|
|
||
| diff --git a/base/BUILD.gn b/base/BUILD.gn | ||
| index 4d8087f0d747e..a3d75f04f6aff 100644 | ||
| index 8417fcda40d49..678c1b736d86f 100644 | ||
| --- a/base/BUILD.gn | ||
| +++ b/base/BUILD.gn | ||
| @@ -1105,7 +1105,9 @@ component("base") { | ||
| @@ -1100,7 +1100,9 @@ component("base") { | ||
| # Needed for <atomic> if using newer C++ library than sysroot, except if | ||
| # building inside the cros_sdk environment - use host_toolchain as a | ||
| # more robust check for this. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,18 +24,18 @@ Signed-off-by: Max Ihlenfeldt <[email protected]> | |
| 2 files changed, 11 insertions(+), 17 deletions(-) | ||
|
|
||
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | ||
| index fe0f989625879..1259819238f17 100644 | ||
| index 19badda7d644b..88e4bbfc4f8c5 100644 | ||
| --- a/build/config/compiler/BUILD.gn | ||
| +++ b/build/config/compiler/BUILD.gn | ||
| @@ -1286,7 +1286,6 @@ config("compiler_codegen") { | ||
| @@ -1295,7 +1295,6 @@ config("compiler_codegen") { | ||
| config("compiler_deterministic") { | ||
| cflags = [] | ||
| ldflags = [] | ||
| - swiftflags = [] | ||
|
|
||
| # Eliminate build metadata (__DATE__, __TIME__ and __TIMESTAMP__) for | ||
| # deterministic build. See https://crbug.com/314403 | ||
| @@ -1315,20 +1314,12 @@ config("compiler_deterministic") { | ||
| @@ -1324,20 +1323,12 @@ config("compiler_deterministic") { | ||
| # different build directory like "out/feature_a" and "out/feature_b" if | ||
| # we build same files with same compile flag. | ||
| # Other paths are already given in relative, no need to normalize them. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,10 +11,10 @@ Signed-off-by: Randy MacLeod <[email protected]> | |
| 1 file changed, 5 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | ||
| index 1259819238f17..4ae9a6e9e4df1 100644 | ||
| index 88e4bbfc4f8c5..bbfe6cb53ca2a 100644 | ||
| --- a/build/config/compiler/BUILD.gn | ||
| +++ b/build/config/compiler/BUILD.gn | ||
| @@ -816,9 +816,11 @@ config("compiler") { | ||
| @@ -825,9 +825,11 @@ config("compiler") { | ||
| # * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode | ||
| # lldb doesn't have the needed changes yet. | ||
| # TODO(crbug.com/1379070): Remove if the upstream default ever changes. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,11 +15,13 @@ Signed-off-by: Max Ihlenfeldt <[email protected]> | |
| .../core/browser/affiliation/affiliation_fetcher_base.cc | 3 --- | ||
| .../core/browser/affiliation/affiliation_fetcher_base.h | 3 --- | ||
| .../core/browser/affiliation/affiliation_fetcher_interface.h | 2 +- | ||
| .../password_manager/core/browser/passkey_credential.cc | 3 --- | ||
| .../password_manager/core/browser/passkey_credential.h | 5 +---- | ||
| printing/page_setup.cc | 4 ---- | ||
| printing/page_setup.h | 4 ++-- | ||
| printing/print_settings.cc | 5 ----- | ||
| printing/print_settings.h | 4 ++-- | ||
| 7 files changed, 5 insertions(+), 20 deletions(-) | ||
| 9 files changed, 6 insertions(+), 27 deletions(-) | ||
|
|
||
| diff --git a/components/password_manager/core/browser/affiliation/affiliation_fetcher_base.cc b/components/password_manager/core/browser/affiliation/affiliation_fetcher_base.cc | ||
| index 5d5b95e0d787a..3a499529885be 100644 | ||
|
|
@@ -60,6 +62,41 @@ index 5bf889f5d940d..946eabe8dce6e 100644 | |
| }; | ||
|
|
||
| AffiliationFetcherInterface() = default; | ||
| diff --git a/components/password_manager/core/browser/passkey_credential.cc b/components/password_manager/core/browser/passkey_credential.cc | ||
| index a775f1150d07c..6890826570f41 100644 | ||
| --- a/components/password_manager/core/browser/passkey_credential.cc | ||
| +++ b/components/password_manager/core/browser/passkey_credential.cc | ||
| @@ -46,7 +46,4 @@ int PasskeyCredential::GetAuthenticatorLabel() const { | ||
| } | ||
| } | ||
|
|
||
| -bool operator==(const PasskeyCredential& lhs, | ||
| - const PasskeyCredential& rhs) = default; | ||
| - | ||
| } // namespace password_manager | ||
| diff --git a/components/password_manager/core/browser/passkey_credential.h b/components/password_manager/core/browser/passkey_credential.h | ||
| index 7bf384bd7ff40..2573132d0ee3c 100644 | ||
| --- a/components/password_manager/core/browser/passkey_credential.h | ||
| +++ b/components/password_manager/core/browser/passkey_credential.h | ||
| @@ -48,8 +48,7 @@ class PasskeyCredential { | ||
| const std::string& display_name() const { return display_name_; } | ||
|
|
||
| private: | ||
| - friend bool operator==(const PasskeyCredential& lhs, | ||
| - const PasskeyCredential& rhs); | ||
| + bool operator==(const PasskeyCredential& other) const = default; | ||
|
|
||
| // Authenticator type this passkey belongs to. | ||
| Source source_; | ||
| @@ -75,8 +74,6 @@ class PasskeyCredential { | ||
| std::string display_name_; | ||
| }; | ||
|
|
||
| -bool operator==(const PasskeyCredential& lhs, const PasskeyCredential& rhs); | ||
| - | ||
| } // namespace password_manager | ||
|
|
||
| #endif // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSKEY_CREDENTIAL_H_ | ||
| diff --git a/printing/page_setup.cc b/printing/page_setup.cc | ||
| index c104f44cdc6b0..93d3d60078aa0 100644 | ||
| --- a/printing/page_setup.cc | ||
|
|
||
Oops, something went wrong.