Skip to content

Commit f6125c3

Browse files
authored
Update to ungoogled-chromium 134.0.6998.35 (#230)
1 parent 9b3a126 commit f6125c3

11 files changed

+47
-41
lines changed

downloads-arm64-rustlib.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[rustlib-arm64]
2-
version = 2024-12-20
2+
version = 2025-02-15
33
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-aarch64-apple-darwin.tar.xz
44
download_filename = rust-nightly-%(version)s-aarch64-apple-darwin.tar.xz
55
output_path = third_party/rust-toolchain/rustc/lib/rustlib

downloads-arm64.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ sha512 = 8678a2baf8d0c1c0e74ccf64c0dfdbb634e4c99d5770f20cf670f0a725885c668d7950e
1818
output_path = third_party/node/mac_arm64/node-darwin-arm64
1919

2020
[rust]
21-
version = 2024-12-20
21+
version = 2025-02-15
2222
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-aarch64-apple-darwin.tar.xz
2323
download_filename = rust-nightly-%(version)s-aarch64-apple-darwin.tar.xz
2424
output_path = third_party/rust-toolchain

downloads-x86-64-rustlib.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[rustlib-x86-64]
2-
version = 2024-12-20
2+
version = 2025-02-15
33
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-apple-darwin.tar.xz
44
download_filename = rust-nightly-%(version)s-x86_64-apple-darwin.tar.xz
55
output_path = third_party/rust-toolchain/rustc/lib/rustlib

downloads-x86-64.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ sha512 = 0e2ad3e108a6a2e938180ac958094476d5217e77176ecd18f6eb7f295ac2890781577c6
1818
output_path = third_party/node/mac/node-darwin-x64
1919

2020
[rust]
21-
version = 2024-12-20
21+
version = 2025-02-15
2222
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-apple-darwin.tar.xz
2323
download_filename = rust-nightly-%(version)s-x86_64-apple-darwin.tar.xz
2424
output_path = third_party/rust-toolchain

patches/ungoogled-chromium/macos/disable-clang-version-check.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/build/config/compiler/BUILD.gn
22
+++ b/build/config/compiler/BUILD.gn
3-
@@ -1647,8 +1647,7 @@ config("compiler_deterministic") {
3+
@@ -1641,8 +1641,7 @@ config("compiler_deterministic") {
44
}
55

66
config("clang_revision") {
@@ -12,10 +12,10 @@
1212
"--verify-version=$clang_version",
1313
--- a/build/toolchain/toolchain.gni
1414
+++ b/build/toolchain/toolchain.gni
15-
@@ -51,7 +51,7 @@ declare_args() {
16-
if (llvm_android_mainline) { # https://crbug.com/1481060
17-
clang_version = "17"
15+
@@ -54,7 +54,7 @@ declare_args() {
16+
clang_version = "21"
1817
} else {
18+
# TODO(crbug.com/392929930): Remove in the next Clang roll.
1919
- clang_version = "20"
2020
+ clang_version = "19"
2121
}

patches/ungoogled-chromium/macos/disable-symbol-order-verification.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
--- a/chrome/BUILD.gn
44
+++ b/chrome/BUILD.gn
5-
@@ -1255,7 +1255,7 @@ if (is_win) {
5+
@@ -1241,7 +1241,7 @@ if (is_win) {
66

77
# TOOD(crbug/1163903#c8) - thakis@ look into why profile and coverage
88
# instrumentation adds these symbols in different orders

patches/ungoogled-chromium/macos/fix-build-with-rust.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# Rust targets to be rebuilt, which allows you to update your toolchain and
2929
# not break incremental builds.
3030
- rustc_version = ""
31-
+ rustc_version = "rustc 1.85.0-nightly (9e136a30a 2024-12-19)"
31+
+ rustc_version = "rustc 1.86.0-nightly (69fd5e405 2025-02-15)"
3232

3333
# If you're using a Rust toolchain as specified by rust_sysroot_absolute,
3434
# you can specify whether it supports nacl here.

patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch

+33-27
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
--- a/chrome/browser/BUILD.gn
44
+++ b/chrome/browser/BUILD.gn
5-
@@ -1724,10 +1724,6 @@ static_library("browser") {
6-
"//chrome/browser/ui/javascript_dialogs:impl",
7-
"//chrome/browser/storage_access_api",
8-
"//chrome/browser/top_level_storage_access_api:permissions",
5+
@@ -1742,10 +1742,6 @@ static_library("browser") {
6+
"//chrome/browser/prefs:util_impl",
7+
"//chrome/browser/profiles:profiles_extra_parts_impl",
8+
"//chrome/browser/profiles:profile_util_impl",
99
- "//chrome/browser/safe_browsing",
10-
- "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
1110
- "//chrome/browser/safe_browsing:advanced_protection",
1211
- "//chrome/browser/safe_browsing:metrics_collector",
13-
"//chrome/browser/ip_protection",
14-
15-
# TODO(crbug.com/40110173): Eliminate usages of browser.h from Media Router.
16-
@@ -1887,7 +1883,6 @@ static_library("browser") {
12+
- "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
13+
"//chrome/browser/search",
14+
"//chrome/browser/search_engine_choice:impl",
15+
"//chrome/browser/signin:impl",
16+
@@ -1921,7 +1917,6 @@ static_library("browser") {
1717
"//chrome/browser/reading_list",
1818
"//chrome/browser/resource_coordinator:tab_manager_features",
1919
"//chrome/browser/resources/accessibility:resources",
@@ -23,7 +23,7 @@
2323
"//chrome/browser/safe_browsing:verdict_cache_manager_factory",
2424
--- a/chrome/browser/extensions/BUILD.gn
2525
+++ b/chrome/browser/extensions/BUILD.gn
26-
@@ -670,9 +670,6 @@ source_set("extensions") {
26+
@@ -666,9 +666,6 @@ source_set("extensions") {
2727
# TODO(crbug.com/346472679): Remove this circular dependency.
2828
"//chrome/browser/web_applications/extensions",
2929

@@ -33,7 +33,7 @@
3333
# TODO(crbug.com/343037853): Remove this circular dependency.
3434
"//chrome/browser/themes",
3535

36-
@@ -710,8 +707,6 @@ source_set("extensions") {
36+
@@ -706,8 +703,6 @@ source_set("extensions") {
3737
"//chrome/common",
3838
"//chrome/common/extensions/api",
3939
"//components/omnibox/browser",
@@ -42,7 +42,7 @@
4242
"//components/safe_browsing/core/common/proto:realtimeapi_proto",
4343
"//components/signin/core/browser",
4444
"//components/translate/content/browser",
45-
@@ -785,7 +780,6 @@ source_set("extensions") {
45+
@@ -782,7 +777,6 @@ source_set("extensions") {
4646
"//chrome/browser/profiles",
4747
"//chrome/browser/profiles:profile",
4848
"//chrome/browser/resource_coordinator:mojo_bindings",
@@ -52,7 +52,7 @@
5252
"//chrome/browser/ui/tabs:tab_enums",
5353
--- a/chrome/browser/ui/BUILD.gn
5454
+++ b/chrome/browser/ui/BUILD.gn
55-
@@ -575,17 +575,8 @@ static_library("ui") {
55+
@@ -570,17 +570,8 @@ static_library("ui") {
5656
"//components/reading_list/features:flags",
5757
"//components/renderer_context_menu",
5858
"//components/resources",
@@ -70,7 +70,7 @@
7070
"//components/schema_org/common:improved_mojom",
7171
"//components/search",
7272
"//components/search_engines",
73-
@@ -5634,7 +5625,6 @@ static_library("ui_public_dependencies")
73+
@@ -5674,7 +5665,6 @@ static_library("ui_public_dependencies")
7474
"//components/dom_distiller/core",
7575
"//components/enterprise/buildflags",
7676
"//components/paint_preview/buildflags",
@@ -111,15 +111,15 @@
111111
? IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT_IN_ADVANCED_PROTECTION
112112
--- a/chrome/browser/ui/webui/downloads/downloads_ui.cc
113113
+++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc
114-
@@ -40,6 +40,7 @@
114+
@@ -39,6 +39,7 @@
115115
#include "components/history/core/common/pref_names.h"
116116
#include "components/prefs/pref_service.h"
117117
#include "components/profile_metrics/browser_profile_type.h"
118118
+#include "components/safe_browsing/buildflags.h"
119119
#include "components/safe_browsing/core/common/features.h"
120120
#include "components/strings/grit/components_strings.h"
121121
#include "content/public/browser/download_manager.h"
122-
@@ -69,10 +70,12 @@ content::WebUIDataSource* CreateAndAddDo
122+
@@ -68,10 +69,12 @@ content::WebUIDataSource* CreateAndAddDo
123123
webui::SetupWebUIDataSource(source, kDownloadsResources,
124124
IDR_DOWNLOADS_DOWNLOADS_HTML);
125125

@@ -155,7 +155,7 @@
155155
return l10n_util::GetStringFUTF16(IDS_PROMPT_DOWNLOAD_CHANGES_SETTINGS,
156156
--- a/chrome/browser/ui/views/download/download_item_view.cc
157157
+++ b/chrome/browser/ui/views/download/download_item_view.cc
158-
@@ -1034,11 +1034,13 @@ ui::ImageModel DownloadItemView::GetIcon
158+
@@ -1041,11 +1041,13 @@ ui::ImageModel DownloadItemView::GetIcon
159159

160160
switch (danger_type) {
161161
case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
@@ -171,7 +171,7 @@
171171
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
172172
--- a/chrome/test/BUILD.gn
173173
+++ b/chrome/test/BUILD.gn
174-
@@ -7012,13 +7012,9 @@ test("unit_tests") {
174+
@@ -7099,13 +7099,9 @@ test("unit_tests") {
175175
"//chrome/browser/renderer_host:history_swiper",
176176
"//chrome/browser/updater:browser_updater_client",
177177
"//chrome/common/notifications",
@@ -200,27 +200,31 @@
200200
"safe_archive_analyzer.cc",
201201
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
202202
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
203-
@@ -2264,12 +2264,6 @@ const PolicyToPreferenceMapEntry kSimple
203+
@@ -2286,15 +2286,6 @@ const PolicyToPreferenceMapEntry kSimple
204204
base::Value::Type::BOOLEAN },
205205
#endif
206206

207207
-#if BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES)
208208
- { key::kProvisionManagedClientCertificateForUser,
209209
- client_certificates::prefs::kProvisionManagedClientCertificateForUserPrefs,
210210
- base::Value::Type::INTEGER },
211+
- { key::kProvisionManagedClientCertificateForBrowser,
212+
- client_certificates::prefs::kProvisionManagedClientCertificateForBrowserPrefs,
213+
- base::Value::Type::INTEGER },
211214
-#endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES)
212215
-
213216
#if !BUILDFLAG(IS_ANDROID)
214217
{ key::kLensOverlaySettings,
215218
lens::prefs::kLensOverlaySettings,
216219
--- a/chrome/browser/chrome_content_browser_client.cc
217220
+++ b/chrome/browser/chrome_content_browser_client.cc
218-
@@ -7871,30 +7871,6 @@ bool ChromeContentBrowserClient::SetupEm
221+
@@ -7889,33 +7889,6 @@ bool ChromeContentBrowserClient::SetupEm
219222
CHECK(!soda_language_pack_path.empty());
220-
CHECK(compiler->SetParameter(sandbox::policy::kParamSodaLanguagePackPath,
221-
soda_language_pack_path.value()));
223+
CHECK(serializer->SetParameter(sandbox::policy::kParamSodaLanguagePackPath,
224+
soda_language_pack_path.value()));
222225
- return true;
223-
- } else if (sandbox_type == sandbox::mojom::Sandbox::kScreenAI) {
226+
- }
227+
- if (sandbox_type == sandbox::mojom::Sandbox::kScreenAI) {
224228
- // ScreenAI service needs read access to ScreenAI component binary path to
225229
- // load it.
226230
- base::FilePath screen_ai_binary_path =
@@ -230,17 +234,19 @@
230234
- VLOG(1) << "Screen AI component not found.";
231235
- return false;
232236
- }
233-
- return compiler->SetParameter(sandbox::policy::kParamScreenAiComponentPath,
234-
- screen_ai_binary_path.value());
235-
- } else if (sandbox_type == sandbox::mojom::Sandbox::kOnDeviceTranslation) {
237+
- return serializer->SetParameter(
238+
- sandbox::policy::kParamScreenAiComponentPath,
239+
- screen_ai_binary_path.value());
240+
- }
241+
- if (sandbox_type == sandbox::mojom::Sandbox::kOnDeviceTranslation) {
236242
- auto translatekit_binary_path =
237243
- on_device_translation::ComponentManager::GetInstance()
238244
- .GetTranslateKitComponentPath();
239245
- if (translatekit_binary_path.empty()) {
240246
- VLOG(1) << "TranslationKit component not found.";
241247
- return false;
242248
- }
243-
- return compiler->SetParameter(
249+
- return serializer->SetParameter(
244250
- sandbox::policy::kParamTranslatekitComponentPath,
245251
- translatekit_binary_path.value());
246252
}

patches/ungoogled-chromium/macos/mark-remap_alloc-used.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/build/rust/std/remap_alloc.cc
22
+++ b/build/rust/std/remap_alloc.cc
3-
@@ -92,7 +92,11 @@ extern "C" {
3+
@@ -97,7 +97,11 @@ extern "C" {
44
__attribute__((visibility("default"))) __attribute__((weak))
55
#endif
66
#else
@@ -12,7 +12,7 @@
1212
#endif // COMPONENT_BUILD
1313

1414
#if !BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC) && BUILDFLAG(IS_WIN) && \
15-
@@ -109,8 +113,13 @@ extern "C" {
15+
@@ -114,8 +118,13 @@ extern "C" {
1616
// Marked as weak as when Rust drives linking it includes this symbol itself,
1717
// and we don't want a collision due to C++ being in the same link target, where
1818
// C++ causes us to explicitly link in the stdlib and this symbol here.

retrieve_and_unpack_resource.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ if $retrieve_arch_specific; then
9898
_rustc_dir="$_rust_dir/rustc"
9999
_rustc_lib_dir="$_rust_dir/rustc/lib/rustlib/$_rust_name/lib"
100100

101-
echo "rustc 1.85.0-nightly (9e136a30a 2024-12-19)" > "$_rust_flag_file"
101+
echo "rustc 1.85.0-nightly (69fd5e405 2025-02-15)" > "$_rust_flag_file"
102102

103103
mkdir -p "$_rust_bin_dir"
104104
mkdir -p "$_rust_dir/lib"

ungoogled-chromium

Submodule ungoogled-chromium updated 81 files

0 commit comments

Comments
 (0)