Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to ungoogled-chromium 120.0.6099.71 #134

Merged
merged 7 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions downloads.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,25 @@ output_path = third_party/google_toolbox_for_mac/src

# Pre-built LLVM toolchain for convenience
[llvm]
version = 17.0.2
url = https://github.com/hlgsdx/llvm-macos-buildbot/releases/download/%(version)s/clang+llvm-%(version)s-x86-64-apple-darwin22.0.tar.xz
version = 17.0.6
url = https://github.com/iXORTech/llvm-macos-buildbot/releases/download/%(version)s/clang+llvm-%(version)s-x86-64-apple-darwin22.0.tar.xz
download_filename = clang+llvm-%(version)s-x86-64-apple-darwin22.0.tar.xz
strip_leading_dirs = clang+llvm-%(version)s-x86-64-apple-darwin22.0
sha512 = b0482b7fd2004ac7c09bf18026b786e0f366984fa70efa84a88568a16b414dd6cc7329ce10d96b3df6d6da7edd75ca5a2b310d2878ca1b30054707a61010f6f2
sha512 = d9e3b5847a7352020670bec4d12e645e09b9418888eb5f1c720953e500f4e1a71a7a91b7867ea6fbc00d71e1d29374b18a42422866f0750b99d2ba1bdce1a8bd
output_path = third_party/llvm-build/Release+Asserts

[nodejs-x64]
version = 16.13.0
url = https://nodejs.org/dist/v%(version)s/node-v%(version)s-darwin-x64.tar.xz
download_filename = node-v%(version)s-darwin-x64.tar.xz
strip_leading_dirs = node-v%(version)s-darwin-x64
sha512=0e2ad3e108a6a2e938180ac958094476d5217e77176ecd18f6eb7f295ac2890781577c6dd243a9ce8633f319fed8e628738094cdd0ff036f4f5cfdf93d46fdc0
output_path = third_party/node/mac/node-darwin-x64

[nodejs-arm64]
version = 16.13.0
url = https://nodejs.org/dist/v%(version)s/node-v%(version)s-darwin-arm64.tar.xz
download_filename = node-v%(version)s-darwin-arm64.tar.xz
strip_leading_dirs = node-v%(version)s-darwin-arm64
sha512=8678a2baf8d0c1c0e74ccf64c0dfdbb634e4c99d5770f20cf670f0a725885c668d7950e31cb1cbb08df78c6ef030a2dff8b9574e8817c74acbcb58a109b5ad9e
output_path = third_party/node/mac/node-darwin-arm64
2 changes: 2 additions & 0 deletions patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ ungoogled-chromium/macos/fix-dsymutil.patch
ungoogled-chromium/macos/fix-clang-format-path.patch
ungoogled-chromium/macos/fix-runTsc-log-info.patch
ungoogled-chromium/fix-node-path.patch
ungoogled-chromium/macos/disable-missing-clang-flags.patch
ungoogled-chromium/macos/no-unknown-warnings.patch
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
@@ -1535,7 +1535,7 @@ config("compiler_deterministic") {
@@ -1575,7 +1575,7 @@ config("compiler_deterministic") {
}

config("clang_revision") {
Expand All @@ -9,3 +9,14 @@
update_args = [
"--print-revision",
"--verify-version=$clang_version",
--- a/build/toolchain/toolchain.gni
+++ b/build/toolchain/toolchain.gni
@@ -47,7 +47,7 @@ declare_args() {
if (llvm_android_mainline) { # https://crbug.com/1481060
clang_version = "17"
} else {
- clang_version = "18"
+ clang_version = "17"
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

--- a/third_party/crashpad/crashpad/client/crashpad_client_mac.cc
+++ b/third_party/crashpad/crashpad/client/crashpad_client_mac.cc
@@ -130,61 +130,7 @@ class HandlerStarter final : public Noti
@@ -131,61 +131,7 @@ class HandlerStarter final : public Noti
const std::map<std::string, std::string>& annotations,
const std::vector<std::string>& arguments,
bool restartable) {
Expand Down Expand Up @@ -65,7 +65,7 @@
}

// NotifyServer::DefaultInterface:
@@ -455,24 +401,7 @@ bool CrashpadClient::StartHandler(
@@ -456,24 +402,7 @@ bool CrashpadClient::StartHandler(
// Attachments are not implemented on MacOS yet.
DCHECK(attachments.empty());

Expand Down
27 changes: 27 additions & 0 deletions patches/ungoogled-chromium/macos/disable-missing-clang-flags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -616,24 +616,6 @@ config("compiler") {
}
}

- # TODO(crbug.com/1488374): This causes binary size growth and potentially
- # other problems.
- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version.
- if (default_toolchain != "//build/toolchain/cros:target" &&
- !llvm_android_mainline) {
- cflags += [
- "-mllvm",
- "-split-threshold-for-reg-with-hint=0",
- ]
- if (use_thin_lto && is_a_target_toolchain) {
- if (is_win) {
- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
- } else {
- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
- }
- }
- }
-
# TODO(crbug.com/1235145): Investigate why/if this should be needed.
if (is_win) {
cflags += [ "/clang:-ffp-contract=off" ]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

# TOOD(crbug/1163903#c8) - thakis@ look into why profile and coverage
# instrumentation adds these symbols in different orders
Expand Down
34 changes: 17 additions & 17 deletions patches/ungoogled-chromium/macos/fix-disabling-safebrowsing.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1968,10 +1968,6 @@ static_library("browser") {
@@ -1999,10 +1999,6 @@ static_library("browser") {
"//chrome/browser/ui",
"//chrome/browser/storage_access_api",
"//chrome/browser/top_level_storage_access_api:permissions",
Expand All @@ -13,7 +13,7 @@

# TODO(crbug.com/1030821): Eliminate usages of browser.h from Media Router.
"//chrome/browser/media/router",
@@ -2084,7 +2080,6 @@ static_library("browser") {
@@ -2117,7 +2113,6 @@ static_library("browser") {
"//chrome/browser/resource_coordinator:mojo_bindings",
"//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
@@ -760,9 +760,6 @@ static_library("extensions") {
@@ -753,9 +753,6 @@ static_library("extensions") {

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

# Since browser and browser_extensions actually depend on each other,
@@ -775,8 +772,6 @@ static_library("extensions") {
@@ -768,8 +765,6 @@ static_library("extensions") {
"//chrome/common",
"//chrome/common/extensions/api",
"//components/omnibox/browser",
Expand All @@ -42,15 +42,15 @@
"//components/safe_browsing/core/common/proto:realtimeapi_proto",
"//components/signin/core/browser",
"//components/translate/content/browser",
@@ -817,7 +812,6 @@ static_library("extensions") {
@@ -809,7 +804,6 @@ static_library("extensions") {
"//chrome/browser/profiles",
"//chrome/browser/profiles:profile",
"//chrome/browser/resource_coordinator:intervention_policy_database_proto",
"//chrome/browser/resource_coordinator:mojo_bindings",
- "//chrome/browser/safe_browsing",
"//chrome/browser/safe_browsing:metrics_collector",
"//chrome/browser/ui/tabs:tab_enums",
"//chrome/browser/web_applications",
@@ -901,12 +895,6 @@ static_library("extensions") {
@@ -893,12 +887,6 @@ static_library("extensions") {
"//components/proxy_config",
"//components/reading_list/core",
"//components/resources",
Expand All @@ -65,23 +65,23 @@
"//components/services/patch/content",
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -384,7 +384,6 @@ static_library("ui") {
@@ -388,7 +388,6 @@ static_library("ui") {
"//components/cross_device/logging",
"//components/dom_distiller/core",
"//components/paint_preview/buildflags",
- "//components/safe_browsing:buildflags",
"//components/sync",
"//components/sync_user_events",
"//components/translate/content/browser",
@@ -428,7 +427,6 @@ static_library("ui") {
@@ -432,7 +431,6 @@ static_library("ui") {
"//chrome/browser/profiling_host",
"//chrome/browser/resources:dev_ui_resources",
"//chrome/browser/resources:resources",
- "//chrome/browser/safe_browsing",
"//chrome/browser/share",
"//chrome/browser/storage_access_api",
"//chrome/browser/ui/side_panel:side_panel_enums",
@@ -567,17 +565,8 @@ static_library("ui") {
@@ -574,17 +572,8 @@ static_library("ui") {
"//components/reading_list/features:flags",
"//components/renderer_context_menu",
"//components/resources",
Expand All @@ -99,15 +99,15 @@
"//components/schema_org/common:improved_mojom",
"//components/search",
"//components/search_engines",
@@ -686,7 +675,6 @@ static_library("ui") {
@@ -693,7 +682,6 @@ static_library("ui") {
# TODO(crbug.com/1158905): Remove this circular dependency.
"//chrome/browser/devtools",
"//chrome/browser/favicon",
- "//chrome/browser/safe_browsing",
"//chrome/browser/profiling_host",
"//chrome/browser/ui/webui:configs",
]
@@ -1930,8 +1918,6 @@ static_library("ui") {

@@ -1970,8 +1958,6 @@ static_library("ui") {
"//chrome/browser/new_tab_page/modules/recipes:mojo_bindings",
"//chrome/browser/new_tab_page/modules/v2/history_clusters:mojo_bindings",
"//chrome/browser/profile_resetter:profile_reset_report_proto",
Expand All @@ -116,7 +116,7 @@
"//chrome/browser/support_tool:support_tool_proto",
"//chrome/browser/ui/color:color_headers",
"//chrome/browser/ui/color:mixers",
@@ -6442,26 +6428,6 @@ static_library("ui") {
@@ -6545,26 +6531,6 @@ static_library("ui") {
}
}

Expand Down Expand Up @@ -145,7 +145,7 @@
}
--- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
@@ -435,8 +435,12 @@ void DownloadProtectionService::ShowDeta
@@ -439,8 +439,12 @@ void DownloadProtectionService::ShowDeta
Profile* profile = Profile::FromBrowserContext(
content::DownloadItemUtils::GetBrowserContext(item));
if (profile &&
Expand All @@ -160,7 +160,7 @@
learn_more_url = GURL(chrome::kAdvancedProtectionDownloadLearnMoreURL);
--- a/chrome/browser/download/notification/download_item_notification.cc
+++ b/chrome/browser/download/notification/download_item_notification.cc
@@ -997,9 +997,13 @@ std::u16string DownloadItemNotification:
@@ -1001,9 +1001,13 @@ std::u16string DownloadItemNotification:
}
case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: {
bool requests_ap_verdicts =
Expand Down Expand Up @@ -240,7 +240,7 @@
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -7002,13 +7002,9 @@ test("unit_tests") {
@@ -7135,13 +7135,9 @@ test("unit_tests") {
"//chrome/browser/renderer_host:history_swiper",
"//chrome/browser/updater:browser_updater_client",
"//chrome/common/notifications",
Expand Down
11 changes: 11 additions & 0 deletions patches/ungoogled-chromium/macos/no-unknown-warnings.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/build/config/mac/BUILD.gn
+++ b/build/config/mac/BUILD.gn
@@ -52,6 +52,8 @@ config("compiler") {
if (export_libcxxabi_from_executables) {
ldflags += [ "-Wl,-undefined,dynamic_lookup" ]
}
+
+ cflags += [ "-Wno-unknown-warning-option" ]
}

# This is included by reference in the //build/config/compiler:runtime_library
2 changes: 1 addition & 1 deletion ungoogled-chromium
Submodule ungoogled-chromium updated 65 files
+1 −1 chromium_version.txt
+329 −145 domain_substitution.list
+1 −1 patches/core/bromite/disable-fetching-field-trials.patch
+27 −27 patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
+1 −1 patches/core/inox-patchset/0003-disable-autofill-download-manager.patch
+1 −1 patches/core/inox-patchset/0009-disable-google-ipv6-probes.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
+2 −2 patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
+1 −1 patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
+2 −2 patches/core/ungoogled-chromium/disable-crash-reporter.patch
+1 −1 patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
+1 −1 patches/core/ungoogled-chromium/disable-google-host-detection.patch
+3 −3 patches/core/ungoogled-chromium/disable-mei-preload.patch
+1 −1 patches/core/ungoogled-chromium/disable-network-time-tracker.patch
+6 −6 patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
+12 −12 patches/core/ungoogled-chromium/disable-web-environment-integrity.patch
+5 −4 patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
+1 −1 patches/core/ungoogled-chromium/disable-webstore-urls.patch
+2 −2 patches/core/ungoogled-chromium/doh-changes.patch
+81 −12 patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch
+182 −79 patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
+490 −241 patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
+1 −1 patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch
+3 −3 patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
+26 −26 patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
+8 −8 patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
+7 −7 patches/extra/bromite/flag-max-connections-per-host.patch
+1 −1 patches/extra/debian/disable/google-api-warning.patch
+7 −7 patches/extra/inox-patchset/0006-modify-default-prefs.patch
+1 −1 patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch
+1 −1 patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
+2 −2 patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch
+7 −7 patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
+1 −1 patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch
+3 −3 patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch
+3 −3 patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
+2 −2 patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch
+2 −2 patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch
+0 −11 patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch
+1 −1 patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch
+4 −4 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
+1 −1 patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
+2 −2 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
+8 −8 patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch
+2 −2 patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch
+3 −3 patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
+1 −1 patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch
+10 −10 patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch
+1 −1 patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
+11 −11 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/disable-capture-all-screens.patch
+1 −1 patches/extra/ungoogled-chromium/disable-download-quarantine.patch
+2 −2 patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch
+1 −1 patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch
+4 −3 patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
+2 −2 patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
+3 −3 patches/extra/ungoogled-chromium/first-run-page.patch
+0 −15 patches/extra/ungoogled-chromium/prepopulated-search-engines.patch
+28 −24 patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
+24 −5 pruning.list
+16 −11 utils/clone.py