Merge pull request #281 from teeminus/update

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
-@@ -1514,7 +1514,7 @@ config("compiler_deterministic") {
+@@ -1535,7 +1535,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
-@@ -39,7 +39,7 @@ if (generate_linker_map) {
-
- declare_args() {
-   if (llvm_force_head_revision) {
+@@ -47,7 +47,7 @@ declare_args() {
+   if (llvm_android_mainline) {  # https://crbug.com/1481060
+     clang_version = "17"
+   } else {
 -    clang_version = "18"
 +    clang_version = "17"
-   } else {
-     # TODO(crbug.com/1467585): Remove in the next clang roll
-     clang_version = "17"
+   }
+ }
+

patches/ungoogled-chromium/windows/windows-disable-download-warning-prompt.patch

@@ -1,6 +1,6 @@
 --- a/components/download/internal/common/download_item_impl.cc
 +++ b/components/download/internal/common/download_item_impl.cc
-@@ -2412,7 +2412,7 @@ void DownloadItemImpl::SetDangerType(Dow
+@@ -2404,7 +2404,7 @@ void DownloadItemImpl::SetDangerType(Dow
                           TRACE_EVENT_SCOPE_THREAD, "danger_type",
                           GetDownloadDangerNames(danger_type).c_str());
    }

patches/ungoogled-chromium/windows/windows-disable-event-log.patch

@@ -3,7 +3,7 @@
 
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -422,7 +422,6 @@ static_library("common_lib") {
+@@ -424,7 +424,6 @@ static_library("common_lib") {
      ]
      deps += [
        "//chrome/chrome_elf:chrome_elf_main_include",
@@ -13,15 +13,15 @@
 
 --- a/chrome/common/logging_chrome.cc
 +++ b/chrome/common/logging_chrome.cc
-@@ -65,7 +65,6 @@
+@@ -70,7 +70,6 @@
  #include "base/logging_win.h"
  #include "base/process/process_info.h"
  #include "base/syslog_logging.h"
 -#include "chrome/common/win/eventlog_messages.h"
  #include "chrome/install_static/install_details.h"
  #endif
 
-@@ -463,11 +462,6 @@ void InitChromeLogging(const base::Comma
+@@ -468,11 +467,6 @@ void InitChromeLogging(const base::Comma
  #if BUILDFLAG(IS_WIN)
    // Enable trace control and transport through event tracing for Windows.
    LogEventProvider::Initialize(kChromeTraceProviderName);

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
-@@ -1104,7 +1104,7 @@ component("base") {
+@@ -1094,7 +1094,7 @@ component("base") {
      public_deps += [ "//build/rust:cxx_cppdeps" ]
    }
 

patches/ungoogled-chromium/windows/windows-disable-win-build-output.patch

@@ -83,3 +83,30 @@
    except subprocess.CalledProcessError as e:
      print(e.output)
      sys.exit(e.returncode)
+--- a/third_party/dawn/third_party/gn/dxc/build/message_compiler.py
++++ b/third_party/dawn/third_party/gn/dxc/build/message_compiler.py
+@@ -124,24 +124,6 @@ def main():
+                                           key=lambda s: s.split()[-1])
+             with open(header_file, 'w') as f:
+                 f.write(''.join(header_contents))
+-
+-        # mc.exe invocation and post-processing are complete, now compare the output
+-        # in tmp_dir to the checked-in outputs.
+-        diff = filecmp.dircmp(tmp_dir, source)
+-        if diff.diff_files or set(diff.left_list) != set(diff.right_list):
+-            print('mc.exe output different from files in %s, see %s' %
+-                  (source, tmp_dir))
+-            diff.report()
+-            for f in diff.diff_files:
+-                if f.endswith('.bin'): continue
+-                fromfile = os.path.join(source, f)
+-                tofile = os.path.join(tmp_dir, f)
+-                print(''.join(
+-                    difflib.unified_diff(
+-                        open(fromfile).readlines(),
+-                        open(tofile).readlines(), fromfile, tofile)))
+-            delete_tmp_dir = False
+-            sys.exit(1)
+     except subprocess.CalledProcessError as e:
+         print(e.output)
+         sys.exit(e.returncode)

patches/ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch

@@ -15,72 +15,6 @@
 
      deps += [
        "//build:branding_buildflags",
---- a/chrome/browser/chrome_browser_main_win.cc
-+++ b/chrome/browser/chrome_browser_main_win.cc
-@@ -325,15 +325,6 @@ void ShowCloseBrowserFirstMessageBox() {
-       l10n_util::GetStringUTF16(IDS_UNINSTALL_CLOSE_APP));
- }
-
--void MaybePostSettingsResetPrompt() {
--  if (base::FeatureList::IsEnabled(safe_browsing::kSettingsResetPrompt)) {
--    content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT})
--        ->PostTask(FROM_HERE,
--                   base::BindOnce(
--                       safe_browsing::MaybeShowSettingsResetPromptWithDelay));
--  }
--}
--
- // Updates all Progressive Web App launchers in |profile_dir| to the latest
- // version.
- void UpdatePwaLaunchersForProfile(const base::FilePath& profile_dir) {
-@@ -557,23 +548,6 @@ void ChromeBrowserMainPartsWin::PostBrow
-
-   InitializeChromeElf();
-
--  // Reset settings for the current profile if it's tagged to be reset after a
--  // complete run of the Chrome Cleanup tool. If post-cleanup settings reset is
--  // enabled, we delay checks for settings reset prompt until the scheduled
--  // reset is finished.
--  if (safe_browsing::PostCleanupSettingsResetter::IsEnabled() &&
--      !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
--    // Using last opened profiles, because we want to find reset the profile
--    // that was open in the last Chrome run, which may not be open yet in
--    // the current run.
--    safe_browsing::PostCleanupSettingsResetter().ResetTaggedProfiles(
--        g_browser_process->profile_manager()->GetLastOpenedProfiles(),
--        base::BindOnce(&MaybePostSettingsResetPrompt),
--        std::make_unique<
--            safe_browsing::PostCleanupSettingsResetter::Delegate>());
--  } else {
--    MaybePostSettingsResetPrompt();
--  }
-
-   // Query feature first, to include full population in field trial.
-   if (base::FeatureList::IsEnabled(features::kAppBoundEncryptionMetrics) &&
---- a/chrome/browser/prefs/browser_prefs.cc
-+++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1501,8 +1501,6 @@ void RegisterLocalState(PrefRegistrySimp
-                                 true);
-   registry->RegisterBooleanPref(
-       policy::policy_prefs::kNativeWindowOcclusionEnabled, true);
--  component_updater::RegisterPrefsForSwReporter(registry);
--  safe_browsing::RegisterChromeCleanerScanCompletionTimePref(registry);
-   MediaFoundationServiceMonitor::RegisterPrefs(registry);
-   os_crypt::RegisterLocalStatePrefs(registry);
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -1847,12 +1845,8 @@ void RegisterProfilePrefs(user_prefs::Pr
-
- #if BUILDFLAG(IS_WIN)
-   CdmPrefServiceHelper::RegisterProfilePrefs(registry);
--  component_updater::RegisterProfilePrefsForSwReporter(registry);
-   FontPrewarmerTabHelper::RegisterProfilePrefs(registry);
-   NetworkProfileBubble::RegisterProfilePrefs(registry);
--  safe_browsing::SettingsResetPromptPrefsManager::RegisterProfilePrefs(
--      registry);
--  safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
- #endif
-
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
 @@ -7,6 +7,7 @@ import("//components/safe_browsing/build
@@ -91,41 +25,6 @@
    if (false) {
    sources = [
      "chrome_controller_client.cc",
---- a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc
-+++ b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc
-@@ -192,7 +192,6 @@ PostCleanupSettingsResetter::Delegate::~
-
- void PostCleanupSettingsResetter::Delegate::FetchDefaultSettings(
-     DefaultSettingsFetcher::SettingsCallback callback) {
--  DefaultSettingsFetcher::FetchDefaultSettings(std::move(callback));
- }
-
- PostCleanupSettingsResetter::PostCleanupSettingsResetter() = default;
---- a/chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc
-+++ b/chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.cc
-@@ -34,20 +34,11 @@ int ChannelAsInt() {
- }
-
- bool SafeBrowsingExtendedReportingEnabled() {
--  // Check all profiles registered with the manager.
--  std::vector<Profile*> profiles =
--      g_browser_process->profile_manager()->GetLoadedProfiles();
--  return base::ranges::any_of(profiles, [](const Profile* profile) {
--    return IsExtendedReportingEnabled(*profile->GetPrefs());
--  });
-+  return false;
- }
-
- bool SafeBrowsingExtendedReportingScoutEnabled() {
--  std::vector<Profile*> profiles = ProfileManager::GetLastOpenedProfiles();
--  return base::ranges::any_of(profiles, [](const Profile* profile) {
--    return profile &&
--           GetExtendedReportingLevel(*profile->GetPrefs()) == SBER_LEVEL_SCOUT;
--  });
-+  return false;
- }
-
- }  // namespace safe_browsing
 --- /dev/null
 +++ b/chrome/browser/safe_browsing/safe_browsing_dummy.cc
 @@ -0,0 +1,3 @@

patches/ungoogled-chromium/windows/windows-fix-command-ids.patch

@@ -46,7 +46,7 @@
  #define IDC_LACROS_DATA_MIGRATION      40265
  #endif
 
-@@ -454,7 +444,7 @@
+@@ -455,7 +445,7 @@
  #define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208
 
  // Context menu items for media toolbar button
@@ -55,7 +55,7 @@
  #define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
  #endif
  #define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
-@@ -488,7 +478,7 @@
+@@ -489,7 +479,7 @@
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
 

patches/ungoogled-chromium/windows/windows-fix-licenses-gn-path.patch

@@ -1,6 +1,6 @@
 --- a/tools/licenses/licenses.py
 +++ b/tools/licenses/licenses.py
-@@ -754,7 +754,7 @@ def _GnBinary():
+@@ -873,7 +873,7 @@ def _GnBinary():
    elif sys.platform == 'darwin':
      subdir = 'mac'
    elif sys.platform == 'win32':