From 50b100328007248712bb64a2944b94cebf686556 Mon Sep 17 00:00:00 2001 From: teeminus <32164856+teeminus@users.noreply.github.com> Date: Fri, 13 Oct 2023 21:31:20 +0200 Subject: [PATCH] - Update to ungoogled-chromium 118.0.5993.70-1 --- downloads.ini | 2 +- .../windows-compile-mini-installer.patch | 4 +- .../windows-disable-clang-version-check.patch | 16 +++---- .../windows-disable-nodebug_assertion.patch | 2 +- ...ws-fix-building-without-safebrowsing.patch | 4 +- .../windows-fix-clang-format-exe.patch | 2 +- .../windows-fix-licenses-gn-path.patch | 2 +- .../windows-fix-missing-clang-features.patch | 48 +------------------ ungoogled-chromium | 2 +- 9 files changed, 19 insertions(+), 63 deletions(-) diff --git a/downloads.ini b/downloads.ini index 66b41a74..f30e877a 100644 --- a/downloads.ini +++ b/downloads.ini @@ -21,7 +21,7 @@ # `http://prereleases.llvm.org/win-snapshots/LLVM-9.8.7-r123456-win64.exe` # (link derived from [LLVM Snapshot Builds](http://llvm.org/builds/)) [llvm] -version = 16.0.2 +version = 17.0.2 #Uncomment when pre-release version is used. #url = https://prereleases.llvm.org/win-snapshots/LLVM-%(version)s-win64.exe #Uncomment the below instead when a new enough stable version of LLVM comes around diff --git a/patches/ungoogled-chromium/windows/windows-compile-mini-installer.patch b/patches/ungoogled-chromium/windows/windows-compile-mini-installer.patch index a20c08d3..0de0a75b 100644 --- a/patches/ungoogled-chromium/windows/windows-compile-mini-installer.patch +++ b/patches/ungoogled-chromium/windows/windows-compile-mini-installer.patch @@ -3,7 +3,7 @@ --- a/chrome/installer/mini_installer/BUILD.gn +++ b/chrome/installer/mini_installer/BUILD.gn -@@ -170,7 +170,6 @@ action("mini_installer_archive") { +@@ -168,7 +168,6 @@ action("mini_installer_archive") { "//chrome", "//chrome:chrome_dll", "//chrome/browser/extensions/default_extensions", @@ -13,7 +13,7 @@ "//third_party/icu:icudata", --- a/chrome/tools/build/win/create_installer_archive.py +++ b/chrome/tools/build/win/create_installer_archive.py -@@ -182,12 +182,14 @@ def GenerateDiffPatch(options, orig_file +@@ -186,12 +186,14 @@ def GenerateDiffPatch(options, orig_file RunSystemCommand(cmd, options.verbose) def GetLZMAExec(build_dir): diff --git a/patches/ungoogled-chromium/windows/windows-disable-clang-version-check.patch b/patches/ungoogled-chromium/windows/windows-disable-clang-version-check.patch index 3583e5bd..21b4e3f4 100644 --- a/patches/ungoogled-chromium/windows/windows-disable-clang-version-check.patch +++ b/patches/ungoogled-chromium/windows/windows-disable-clang-version-check.patch @@ -1,6 +1,6 @@ --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1510,7 +1510,7 @@ config("compiler_deterministic") { +@@ -1514,7 +1514,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -11,12 +11,12 @@ "--verify-version=$clang_version", --- a/build/toolchain/toolchain.gni +++ b/build/toolchain/toolchain.gni -@@ -38,7 +38,7 @@ if (generate_linker_map) { - } +@@ -39,7 +39,7 @@ if (generate_linker_map) { declare_args() { -- clang_version = "18" -+ clang_version = "16" - } - - # Extension for shared library files (including leading dot). + if (llvm_force_head_revision) { +- clang_version = "18" ++ clang_version = "17" + } else { + # TODO(crbug.com/1467585): Remove in the next clang roll + clang_version = "17" diff --git a/patches/ungoogled-chromium/windows/windows-disable-nodebug_assertion.patch b/patches/ungoogled-chromium/windows/windows-disable-nodebug_assertion.patch index e1d794bb..1d3ae964 100644 --- a/patches/ungoogled-chromium/windows/windows-disable-nodebug_assertion.patch +++ b/patches/ungoogled-chromium/windows/windows-disable-nodebug_assertion.patch @@ -1,7 +1,7 @@ # Windows does not support weak symbols --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1105,7 +1105,7 @@ component("base") { +@@ -1104,7 +1104,7 @@ component("base") { public_deps += [ "//build/rust:cxx_cppdeps" ] } diff --git a/patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch b/patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch index 032b49a1..0dfda1fe 100644 --- a/patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch +++ b/patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch @@ -59,7 +59,7 @@ if (base::FeatureList::IsEnabled(features::kAppBoundEncryptionMetrics) && --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1605,8 +1605,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1501,8 +1501,6 @@ void RegisterLocalState(PrefRegistrySimp true); registry->RegisterBooleanPref( policy::policy_prefs::kNativeWindowOcclusionEnabled, true); @@ -68,7 +68,7 @@ MediaFoundationServiceMonitor::RegisterPrefs(registry); os_crypt::RegisterLocalStatePrefs(registry); #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -1948,12 +1946,8 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1847,12 +1845,8 @@ void RegisterProfilePrefs(user_prefs::Pr #if BUILDFLAG(IS_WIN) CdmPrefServiceHelper::RegisterProfilePrefs(registry); diff --git a/patches/ungoogled-chromium/windows/windows-fix-clang-format-exe.patch b/patches/ungoogled-chromium/windows/windows-fix-clang-format-exe.patch index 9b0f26b8..1a2411f9 100644 --- a/patches/ungoogled-chromium/windows/windows-fix-clang-format-exe.patch +++ b/patches/ungoogled-chromium/windows/windows-fix-clang-format-exe.patch @@ -21,5 +21,5 @@ + shutil.copy('../../third_party/llvm-build/Release+Asserts/bin/clang-format.exe', '../../buildtools/win') + dispatch_table = { + 'async_iterator': bind_gen.generate_async_iterators, 'callback_function': bind_gen.generate_callback_functions, - 'callback_interface': bind_gen.generate_callback_interfaces, diff --git a/patches/ungoogled-chromium/windows/windows-fix-licenses-gn-path.patch b/patches/ungoogled-chromium/windows/windows-fix-licenses-gn-path.patch index 44419c65..37642fae 100644 --- a/patches/ungoogled-chromium/windows/windows-fix-licenses-gn-path.patch +++ b/patches/ungoogled-chromium/windows/windows-fix-licenses-gn-path.patch @@ -1,6 +1,6 @@ --- a/tools/licenses/licenses.py +++ b/tools/licenses/licenses.py -@@ -752,7 +752,7 @@ def _GnBinary(): +@@ -754,7 +754,7 @@ def _GnBinary(): elif sys.platform == 'darwin': subdir = 'mac' elif sys.platform == 'win32': diff --git a/patches/ungoogled-chromium/windows/windows-fix-missing-clang-features.patch b/patches/ungoogled-chromium/windows/windows-fix-missing-clang-features.patch index 1e22e81f..2f7289c4 100644 --- a/patches/ungoogled-chromium/windows/windows-fix-missing-clang-features.patch +++ b/patches/ungoogled-chromium/windows/windows-fix-missing-clang-features.patch @@ -1,6 +1,6 @@ --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -717,7 +717,6 @@ config("compiler") { +@@ -726,7 +726,6 @@ config("compiler") { "/lldltocache:" + rebase_path("$root_out_dir/thinlto-cache", root_build_dir), "/lldltocachepolicy:$cache_policy", @@ -8,7 +8,7 @@ ] } else { ldflags += [ "-flto=thin" ] -@@ -764,7 +763,7 @@ config("compiler") { +@@ -773,7 +772,7 @@ config("compiler") { # toolchain has this flag. # We only use one version of LLVM within a build so there's no need to # upgrade debug info, which can be expensive since it runs the verifier. @@ -17,47 +17,3 @@ } } ---- a/content/browser/renderer_host/render_frame_host_impl.cc -+++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -8509,7 +8509,7 @@ void RenderFrameHostImpl::SendFencedFram - for (const blink::FencedFrame::ReportingDestination& destination : - destinations) { - SendFencedFrameReportingBeaconInternal( -- DestinationEnumEvent(event_type, event_data), destination, -+ DestinationEnumEvent({event_type, event_data}), destination, - /*from_renderer=*/true, attribution_reporting_runtime_features, - GetFrameTreeNodeId()); - } -@@ -8545,7 +8545,7 @@ void RenderFrameHostImpl::SendFencedFram - } - - SendFencedFrameReportingBeaconInternal( -- DestinationURLEvent(destination_url), -+ DestinationURLEvent({destination_url}), - blink::FencedFrame::ReportingDestination::kBuyer, - /*from_renderer=*/true, attribution_reporting_runtime_features, - GetFrameTreeNodeId()); -@@ -8617,8 +8617,8 @@ void RenderFrameHostImpl::MaybeSendFence - for (blink::FencedFrame::ReportingDestination destination : - info->destinations) { - initiator_rfh->SendFencedFrameReportingBeaconInternal( -- DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType, -- info->data), -+ DestinationEnumEvent({blink::kFencedFrameTopNavigationBeaconType, -+ info->data}), - destination, - /*from_renderer=*/false, info->attribution_reporting_runtime_features, - GetFrameTreeNodeId(), navigation_request.GetNavigationId()); ---- a/net/dns/host_resolver_cache.cc -+++ b/net/dns/host_resolver_cache.cc -@@ -161,8 +161,8 @@ void HostResolverCache::Set( - - std::string domain_name = result->domain_name(); - entries_.emplace( -- Key(std::move(domain_name), network_anonymization_key), -- Entry(std::move(result), source, secure, staleness_generation_)); -+ Key({std::move(domain_name), network_anonymization_key}), -+ Entry({std::move(result), source, secure, staleness_generation_})); - - if (entries_.size() > max_entries_) { - EvictEntries(); diff --git a/ungoogled-chromium b/ungoogled-chromium index 322aef34..d1f177cd 160000 --- a/ungoogled-chromium +++ b/ungoogled-chromium @@ -1 +1 @@ -Subproject commit 322aef346732202e899de67b507ac76797dc13d3 +Subproject commit d1f177cd0006b5c4bf8ce66d9084498085f35843