Skip to content

Commit

Permalink
Update to ungoogled-chromium 134.0.6998.35 (#230)
Browse files Browse the repository at this point in the history
  • Loading branch information
dumbmoron authored Mar 9, 2025
1 parent 9b3a126 commit f6125c3
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 41 deletions.
2 changes: 1 addition & 1 deletion downloads-arm64-rustlib.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[rustlib-arm64]
version = 2024-12-20
version = 2025-02-15
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-aarch64-apple-darwin.tar.xz
download_filename = rust-nightly-%(version)s-aarch64-apple-darwin.tar.xz
output_path = third_party/rust-toolchain/rustc/lib/rustlib
Expand Down
2 changes: 1 addition & 1 deletion downloads-arm64.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sha512 = 8678a2baf8d0c1c0e74ccf64c0dfdbb634e4c99d5770f20cf670f0a725885c668d7950e
output_path = third_party/node/mac_arm64/node-darwin-arm64

[rust]
version = 2024-12-20
version = 2025-02-15
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-aarch64-apple-darwin.tar.xz
download_filename = rust-nightly-%(version)s-aarch64-apple-darwin.tar.xz
output_path = third_party/rust-toolchain
Expand Down
2 changes: 1 addition & 1 deletion downloads-x86-64-rustlib.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[rustlib-x86-64]
version = 2024-12-20
version = 2025-02-15
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-apple-darwin.tar.xz
download_filename = rust-nightly-%(version)s-x86_64-apple-darwin.tar.xz
output_path = third_party/rust-toolchain/rustc/lib/rustlib
Expand Down
2 changes: 1 addition & 1 deletion downloads-x86-64.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sha512 = 0e2ad3e108a6a2e938180ac958094476d5217e77176ecd18f6eb7f295ac2890781577c6
output_path = third_party/node/mac/node-darwin-x64

[rust]
version = 2024-12-20
version = 2025-02-15
url = https://static.rust-lang.org/dist/%(version)s/rust-nightly-x86_64-apple-darwin.tar.xz
download_filename = rust-nightly-%(version)s-x86_64-apple-darwin.tar.xz
output_path = third_party/rust-toolchain
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1647,8 +1647,7 @@ config("compiler_deterministic") {
@@ -1641,8 +1641,7 @@ config("compiler_deterministic") {
}

config("clang_revision") {
Expand All @@ -12,10 +12,10 @@
"--verify-version=$clang_version",
--- a/build/toolchain/toolchain.gni
+++ b/build/toolchain/toolchain.gni
@@ -51,7 +51,7 @@ declare_args() {
if (llvm_android_mainline) { # https://crbug.com/1481060
clang_version = "17"
@@ -54,7 +54,7 @@ declare_args() {
clang_version = "21"
} else {
# TODO(crbug.com/392929930): Remove in the next Clang roll.
- clang_version = "20"
+ clang_version = "19"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

# TOOD(crbug/1163903#c8) - thakis@ look into why profile and coverage
# instrumentation adds these symbols in different orders
Expand Down
2 changes: 1 addition & 1 deletion patches/ungoogled-chromium/macos/fix-build-with-rust.patch
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# Rust targets to be rebuilt, which allows you to update your toolchain and
# not break incremental builds.
- rustc_version = ""
+ rustc_version = "rustc 1.85.0-nightly (9e136a30a 2024-12-19)"
+ rustc_version = "rustc 1.86.0-nightly (69fd5e405 2025-02-15)"

# If you're using a Rust toolchain as specified by rust_sysroot_absolute,
# you can specify whether it supports nacl here.
60 changes: 33 additions & 27 deletions patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1724,10 +1724,6 @@ static_library("browser") {
"//chrome/browser/ui/javascript_dialogs:impl",
"//chrome/browser/storage_access_api",
"//chrome/browser/top_level_storage_access_api:permissions",
@@ -1742,10 +1742,6 @@ static_library("browser") {
"//chrome/browser/prefs:util_impl",
"//chrome/browser/profiles:profiles_extra_parts_impl",
"//chrome/browser/profiles:profile_util_impl",
- "//chrome/browser/safe_browsing",
- "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
- "//chrome/browser/safe_browsing:advanced_protection",
- "//chrome/browser/safe_browsing:metrics_collector",
"//chrome/browser/ip_protection",

# TODO(crbug.com/40110173): Eliminate usages of browser.h from Media Router.
@@ -1887,7 +1883,6 @@ static_library("browser") {
- "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
"//chrome/browser/search",
"//chrome/browser/search_engine_choice:impl",
"//chrome/browser/signin:impl",
@@ -1921,7 +1917,6 @@ static_library("browser") {
"//chrome/browser/reading_list",
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/resources/accessibility:resources",
Expand All @@ -23,7 +23,7 @@
"//chrome/browser/safe_browsing:verdict_cache_manager_factory",
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -670,9 +670,6 @@ source_set("extensions") {
@@ -666,9 +666,6 @@ source_set("extensions") {
# TODO(crbug.com/346472679): Remove this circular dependency.
"//chrome/browser/web_applications/extensions",

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

@@ -710,8 +707,6 @@ source_set("extensions") {
@@ -706,8 +703,6 @@ source_set("extensions") {
"//chrome/common",
"//chrome/common/extensions/api",
"//components/omnibox/browser",
Expand All @@ -42,7 +42,7 @@
"//components/safe_browsing/core/common/proto:realtimeapi_proto",
"//components/signin/core/browser",
"//components/translate/content/browser",
@@ -785,7 +780,6 @@ source_set("extensions") {
@@ -782,7 +777,6 @@ source_set("extensions") {
"//chrome/browser/profiles",
"//chrome/browser/profiles:profile",
"//chrome/browser/resource_coordinator:mojo_bindings",
Expand All @@ -52,7 +52,7 @@
"//chrome/browser/ui/tabs:tab_enums",
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -575,17 +575,8 @@ static_library("ui") {
@@ -570,17 +570,8 @@ static_library("ui") {
"//components/reading_list/features:flags",
"//components/renderer_context_menu",
"//components/resources",
Expand All @@ -70,7 +70,7 @@
"//components/schema_org/common:improved_mojom",
"//components/search",
"//components/search_engines",
@@ -5634,7 +5625,6 @@ static_library("ui_public_dependencies")
@@ -5674,7 +5665,6 @@ static_library("ui_public_dependencies")
"//components/dom_distiller/core",
"//components/enterprise/buildflags",
"//components/paint_preview/buildflags",
Expand Down Expand Up @@ -111,15 +111,15 @@
? IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT_IN_ADVANCED_PROTECTION
--- a/chrome/browser/ui/webui/downloads/downloads_ui.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc
@@ -40,6 +40,7 @@
@@ -39,6 +39,7 @@
#include "components/history/core/common/pref_names.h"
#include "components/prefs/pref_service.h"
#include "components/profile_metrics/browser_profile_type.h"
+#include "components/safe_browsing/buildflags.h"
#include "components/safe_browsing/core/common/features.h"
#include "components/strings/grit/components_strings.h"
#include "content/public/browser/download_manager.h"
@@ -69,10 +70,12 @@ content::WebUIDataSource* CreateAndAddDo
@@ -68,10 +69,12 @@ content::WebUIDataSource* CreateAndAddDo
webui::SetupWebUIDataSource(source, kDownloadsResources,
IDR_DOWNLOADS_DOWNLOADS_HTML);

Expand Down Expand Up @@ -155,7 +155,7 @@
return l10n_util::GetStringFUTF16(IDS_PROMPT_DOWNLOAD_CHANGES_SETTINGS,
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -1034,11 +1034,13 @@ ui::ImageModel DownloadItemView::GetIcon
@@ -1041,11 +1041,13 @@ ui::ImageModel DownloadItemView::GetIcon

switch (danger_type) {
case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
Expand All @@ -171,7 +171,7 @@
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -7012,13 +7012,9 @@ test("unit_tests") {
@@ -7099,13 +7099,9 @@ test("unit_tests") {
"//chrome/browser/renderer_host:history_swiper",
"//chrome/browser/updater:browser_updater_client",
"//chrome/common/notifications",
Expand Down Expand Up @@ -200,27 +200,31 @@
"safe_archive_analyzer.cc",
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -2264,12 +2264,6 @@ const PolicyToPreferenceMapEntry kSimple
@@ -2286,15 +2286,6 @@ const PolicyToPreferenceMapEntry kSimple
base::Value::Type::BOOLEAN },
#endif

-#if BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES)
- { key::kProvisionManagedClientCertificateForUser,
- client_certificates::prefs::kProvisionManagedClientCertificateForUserPrefs,
- base::Value::Type::INTEGER },
- { key::kProvisionManagedClientCertificateForBrowser,
- client_certificates::prefs::kProvisionManagedClientCertificateForBrowserPrefs,
- base::Value::Type::INTEGER },
-#endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES)
-
#if !BUILDFLAG(IS_ANDROID)
{ key::kLensOverlaySettings,
lens::prefs::kLensOverlaySettings,
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -7871,30 +7871,6 @@ bool ChromeContentBrowserClient::SetupEm
@@ -7889,33 +7889,6 @@ bool ChromeContentBrowserClient::SetupEm
CHECK(!soda_language_pack_path.empty());
CHECK(compiler->SetParameter(sandbox::policy::kParamSodaLanguagePackPath,
soda_language_pack_path.value()));
CHECK(serializer->SetParameter(sandbox::policy::kParamSodaLanguagePackPath,
soda_language_pack_path.value()));
- return true;
- } else if (sandbox_type == sandbox::mojom::Sandbox::kScreenAI) {
- }
- if (sandbox_type == sandbox::mojom::Sandbox::kScreenAI) {
- // ScreenAI service needs read access to ScreenAI component binary path to
- // load it.
- base::FilePath screen_ai_binary_path =
Expand All @@ -230,17 +234,19 @@
- VLOG(1) << "Screen AI component not found.";
- return false;
- }
- return compiler->SetParameter(sandbox::policy::kParamScreenAiComponentPath,
- screen_ai_binary_path.value());
- } else if (sandbox_type == sandbox::mojom::Sandbox::kOnDeviceTranslation) {
- return serializer->SetParameter(
- sandbox::policy::kParamScreenAiComponentPath,
- screen_ai_binary_path.value());
- }
- if (sandbox_type == sandbox::mojom::Sandbox::kOnDeviceTranslation) {
- auto translatekit_binary_path =
- on_device_translation::ComponentManager::GetInstance()
- .GetTranslateKitComponentPath();
- if (translatekit_binary_path.empty()) {
- VLOG(1) << "TranslationKit component not found.";
- return false;
- }
- return compiler->SetParameter(
- return serializer->SetParameter(
- sandbox::policy::kParamTranslatekitComponentPath,
- translatekit_binary_path.value());
}
Expand Down
4 changes: 2 additions & 2 deletions patches/ungoogled-chromium/macos/mark-remap_alloc-used.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/build/rust/std/remap_alloc.cc
+++ b/build/rust/std/remap_alloc.cc
@@ -92,7 +92,11 @@ extern "C" {
@@ -97,7 +97,11 @@ extern "C" {
__attribute__((visibility("default"))) __attribute__((weak))
#endif
#else
Expand All @@ -12,7 +12,7 @@
#endif // COMPONENT_BUILD

#if !BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC) && BUILDFLAG(IS_WIN) && \
@@ -109,8 +113,13 @@ extern "C" {
@@ -114,8 +118,13 @@ extern "C" {
// Marked as weak as when Rust drives linking it includes this symbol itself,
// and we don't want a collision due to C++ being in the same link target, where
// C++ causes us to explicitly link in the stdlib and this symbol here.
Expand Down
2 changes: 1 addition & 1 deletion retrieve_and_unpack_resource.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ if $retrieve_arch_specific; then
_rustc_dir="$_rust_dir/rustc"
_rustc_lib_dir="$_rust_dir/rustc/lib/rustlib/$_rust_name/lib"

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

mkdir -p "$_rust_bin_dir"
mkdir -p "$_rust_dir/lib"
Expand Down
2 changes: 1 addition & 1 deletion ungoogled-chromium
Submodule ungoogled-chromium updated 81 files
+2 −2 .cirrus.yml
+1 −1 chromium_version.txt
+3 −1 devutils/update_lists.py
+1 −0 docs/flags.md
+1 −1 domain_regex.list
+255 −476 domain_substitution.list
+3 −3 downloads.ini
+1 −1 patches/core/bromite/disable-fetching-field-trials.patch
+22 −613 patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
+1 −1 patches/core/inox-patchset/0003-disable-autofill-download-manager.patch
+4 −4 patches/core/inox-patchset/0005-disable-default-extensions.patch
+1 −1 patches/core/inox-patchset/0015-disable-update-pings.patch
+1 −1 patches/core/inox-patchset/0021-disable-rlz.patch
+12 −12 patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
+1 −1 patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch
+2 −2 patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
+2 −2 patches/core/ungoogled-chromium/block-requests.patch
+2 −2 patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
+2 −2 patches/core/ungoogled-chromium/disable-crash-reporter.patch
+10 −6 patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
+4 −9 patches/core/ungoogled-chromium/disable-gcm.patch
+13 −14 patches/core/ungoogled-chromium/disable-google-host-detection.patch
+9 −9 patches/core/ungoogled-chromium/disable-mei-preload.patch
+265 −13 patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
+4 −4 patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
+3 −3 patches/core/ungoogled-chromium/disable-webstore-urls.patch
+10 −10 patches/core/ungoogled-chromium/extensions-manifestv2.patch
+138 −112 patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch
+302 −1,108 patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
+240 −290 patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
+3 −5 patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch
+3 −3 patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
+23 −23 patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
+5 −5 patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
+8 −7 patches/extra/bromite/flag-max-connections-per-host.patch
+6 −6 patches/extra/inox-patchset/0006-modify-default-prefs.patch
+2 −2 patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
+9 −9 patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
+3 −3 patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch
+1 −1 patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch
+4 −4 patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch
+8 −8 patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
+4 −4 patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch
+3 −3 patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch
+2 −2 patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch
+1 −1 patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch
+2 −2 patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch
+5 −13 patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
+1 −1 patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch
+3 −3 patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch
+1 −1 patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch
+2 −2 patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch
+2 −2 patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch
+1 −1 patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
+54 −0 patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch
+1 −1 patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch
+8 −8 patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch
+2 −2 patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
+8 −8 patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
+1 −1 patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch
+1 −1 patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch
+1 −1 patches/extra/ungoogled-chromium/disable-capture-all-screens.patch
+1 −1 patches/extra/ungoogled-chromium/disable-download-quarantine.patch
+1 −1 patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch
+1 −1 patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch
+3 −3 patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
+3 −3 patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
+1 −1 patches/extra/ungoogled-chromium/first-run-page.patch
+2 −2 patches/extra/ungoogled-chromium/keep-expired-flags.patch
+1 −1 patches/extra/ungoogled-chromium/prepopulated-search-engines.patch
+27 −24 patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
+0 −24 patches/extra/ungoogled-chromium/spoof-webgl-renderer-info.patch
+1 −1 patches/series
+1 −1 patches/upstream-fixes/glue_core_pools.patch
+2 −2 patches/upstream-fixes/missing-dependencies.patch
+133 −52 pruning.list
+11 −51 utils/_extraction.py
+0 −67 utils/clone.py
+1 −1 utils/domain_substitution.py
+7 −20 utils/downloads.py
+86 −10 utils/prune_binaries.py

0 comments on commit f6125c3

Please sign in to comment.