Merge pull request #482 from teeminus/update

Author: teeminus

build.py

@@ -277,6 +277,8 @@ def main():
             windows_flags = windows_flags.replace('x64', 'x86')
         elif args.arm:
             windows_flags = windows_flags.replace('x64', 'arm64')
+        if args.tarball:
+            windows_flags += '\nchrome_pgo_phase=0\n'
         gn_flags += windows_flags
         (source_tree / 'out/Default/args.gn').write_text(gn_flags, encoding=ENCODING)
 

domain_substitution.list

@@ -1,6 +1,6 @@
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1683,8 +1683,7 @@ config("compiler_deterministic") {
+@@ -1704,8 +1704,7 @@ config("compiler_deterministic") {
  }
 
  config("clang_revision") {

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

@@ -11,7 +11,7 @@
    ]
    sources = [
      "all_messages.h",
-@@ -374,7 +373,6 @@ static_library("common_lib") {
+@@ -375,7 +374,6 @@ static_library("common_lib") {
        "conflicts/remote_module_watcher_win.cc",
        "conflicts/remote_module_watcher_win.h",
      ]
@@ -77,7 +77,7 @@
  base::expected<base::HeapArray<FactoryAndClsid>, HRESULT>
 --- a/chrome/windows_services/elevated_tracing_service/BUILD.gn
 +++ b/chrome/windows_services/elevated_tracing_service/BUILD.gn
-@@ -94,7 +94,6 @@ source_set("service_lib") {
+@@ -95,7 +95,6 @@ source_set("service_lib") {
    ]
    deps = [
      ":lib",

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

@@ -2,7 +2,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -81,32 +81,6 @@ if (is_win && enable_resource_allowlist_
+@@ -80,32 +80,6 @@ if (is_win && enable_resource_allowlist_
    _chrome_resource_allowlist = "$target_gen_dir/chrome_resource_allowlist.txt"
  }
 
@@ -35,7 +35,7 @@
  # This does not currently work. See crbug.com/1311822.
  # This target exists above chrome and it's main components in the dependency
  # tree as a central place to put assert_no_deps annotations. Since this depends
-@@ -144,17 +118,9 @@ if (!is_android && !is_mac) {
+@@ -143,17 +117,9 @@ if (!is_android && !is_mac) {
      # Windows-only deps are OK because chrome_initial uses initialexe/chrome as
      # the output name for that platform.
      # See crbug.com/1146571.

patches/ungoogled-chromium/windows/windows-disable-reorder-fix-linking.patch

@@ -37,7 +37,7 @@
 
 --- a/tools/gn/build/gen.py
 +++ b/tools/gn/build/gen.py
-@@ -587,6 +587,7 @@ def WriteGNNinja(path, platform, host, o
+@@ -588,6 +588,7 @@ def WriteGNNinja(path, platform, host, o
          '/D_SCL_SECURE_NO_DEPRECATE',
          '/D_UNICODE',
          '/D_WIN32_WINNT=0x0A00',

patches/ungoogled-chromium/windows/windows-fix-building-gn.patch

@@ -1,6 +1,6 @@
 --- a/build/config/clang/BUILD.gn
 +++ b/build/config/clang/BUILD.gn
-@@ -287,8 +287,6 @@ clang_lib("compiler_builtins") {
+@@ -289,8 +289,6 @@ clang_lib("compiler_builtins") {
      } else {
        assert(false, "unsupported target_platform=$target_platform")
      }

patches/ungoogled-chromium/windows/windows-fix-building-with-rust.patch

@@ -17,15 +17,15 @@
        "//build:branding_buildflags",
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -5009,7 +5009,6 @@ std::wstring ChromeContentBrowserClient:
+@@ -5131,7 +5131,6 @@ std::wstring ChromeContentBrowserClient:
  #endif
      case sandbox::mojom::Sandbox::kPrintCompositor:
      case sandbox::mojom::Sandbox::kAudio:
 -    case sandbox::mojom::Sandbox::kScreenAI:
      case sandbox::mojom::Sandbox::kSpeechRecognition:
      case sandbox::mojom::Sandbox::kPdfConversion:
      case sandbox::mojom::Sandbox::kService:
-@@ -5106,7 +5105,6 @@ bool ChromeContentBrowserClient::PreSpaw
+@@ -5228,7 +5227,6 @@ bool ChromeContentBrowserClient::PreSpaw
      case sandbox::mojom::Sandbox::kPrintBackend:
  #endif
      case sandbox::mojom::Sandbox::kPrintCompositor:

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

@@ -28,7 +28,7 @@
  // Move window to other user commands
  #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34080
  #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34081
-@@ -497,7 +497,7 @@
+@@ -498,7 +498,7 @@
  #define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208
 
  // Context menu items for media toolbar button
@@ -37,7 +37,7 @@
  #define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
  #endif
  #define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
-@@ -534,7 +534,7 @@
+@@ -535,7 +535,7 @@
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
 

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

@@ -1,6 +1,6 @@
 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
 +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -1813,9 +1813,6 @@ const PolicyToPreferenceMapEntry kSimple
+@@ -1822,9 +1822,6 @@ const PolicyToPreferenceMapEntry kSimple
    { key::kRendererAppContainerEnabled,
      prefs::kRendererAppContainerEnabled,
      base::Value::Type::BOOLEAN },