Merge pull request #520 from teeminus/update

Author: teeminus

.github/actions/stage/index.js

@@ -55,7 +55,7 @@ async function run() {
             }
             try {
                 await artifact.uploadArtifact(finalArtifactName, packageList,
-                    'C:\\ungoogled-chromium-windows\\build', {retentionDays: 1, compressionLevel: 0});
+                    'C:\\ungoogled-chromium-windows\\build', {retentionDays: 3, compressionLevel: 0});
                 break;
             } catch (e) {
                 console.error(`Upload artifact failed: ${e}`);

domain_substitution.list

@@ -21,13 +21,13 @@
 #   `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 = 21.1.4
+version = 21.1.6
 #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
 url = https://github.com/llvm/llvm-project/releases/download/llvmorg-%(version)s/LLVM-%(version)s-win64.exe
 download_filename = LLVM-%(version)s-win64.exe
-sha512 = c4240038cba73083f6b33deb6bbe0a581f72c6179ab878f27dbff927ee7334564890054ad5759be41e961f09fead296cfa944777f8fdfe3653ad919710091bee
+sha512 = 0e58fa8296abb716f4ca37cb9cd7ef044693a879f589d596685663b061ae17cafa8dd2baffed282a5ee740f56b79eb0ef8cfbe5e8fd49cf7d636657071f23b89
 extractor = 7z
 output_path = third_party/llvm-build/Release+Asserts
 

downloads.ini

@@ -3,7 +3,7 @@
 
 --- a/chrome/installer/mini_installer/BUILD.gn
 +++ b/chrome/installer/mini_installer/BUILD.gn
-@@ -192,7 +192,6 @@ action("mini_installer_archive") {
+@@ -191,7 +191,6 @@ action("mini_installer_archive") {
      "//chrome:chrome_dll",
      "//chrome/browser/extensions/default_extensions",
      "//chrome/chrome_elf",

patches/ungoogled-chromium/windows/windows-compile-mini-installer.patch

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

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

@@ -11,7 +11,7 @@
    ]
    sources = [
      "chrome_content_client.cc",
-@@ -372,7 +371,6 @@ static_library("common_lib") {
+@@ -370,7 +369,6 @@ static_library("common_lib") {
        "conflicts/remote_module_watcher_win.cc",
        "conflicts/remote_module_watcher_win.h",
      ]

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

@@ -2,7 +2,7 @@
 
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -80,32 +80,6 @@ if (is_win && enable_resource_allowlist_
+@@ -79,32 +79,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
-@@ -143,17 +117,9 @@ if (!is_android && !is_mac) {
+@@ -142,17 +116,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

@@ -17,15 +17,15 @@
        "//build:branding_buildflags",
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -5181,7 +5181,6 @@ std::wstring ChromeContentBrowserClient:
+@@ -5111,7 +5111,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:
-@@ -5277,7 +5276,6 @@ bool ChromeContentBrowserClient::PreSpaw
+@@ -5207,7 +5206,6 @@ bool ChromeContentBrowserClient::PreSpaw
      case sandbox::mojom::Sandbox::kPrintBackend:
  #endif
      case sandbox::mojom::Sandbox::kPrintCompositor:
@@ -64,6 +64,25 @@
    std::wstring cred_provider_gaia_id;
    std::wstring cred_provider_email;
 
+--- a/chrome/browser/ui/safety_hub/abusive_notification_permissions_manager.cc
++++ b/chrome/browser/ui/safety_hub/abusive_notification_permissions_manager.cc
+@@ -113,15 +113,7 @@ bool HasShowOriginalSuspiciousNotificati
+   base::Value stored_value(hcsm->GetWebsiteSetting(
+       url, url, ContentSettingsType::SUSPICIOUS_NOTIFICATION_SHOW_ORIGINAL));
+ 
+-  if (stored_value.is_none()) {
+-    return false;
+-  }
+-  DCHECK(stored_value.is_dict());
+-  DCHECK(stored_value.GetDict().contains(
+-      safe_browsing::kSuspiciousNotificationShowOriginalKey));
+-  return stored_value.GetDict()
+-      .FindBool(safe_browsing::kSuspiciousNotificationShowOriginalKey)
+-      .value_or(false);
++  return false;
+ }
+ 
+ // Return true if the url should be considered for suspicious content
 --- a/components/safe_browsing/buildflags.gni
 +++ b/components/safe_browsing/buildflags.gni
 @@ -20,6 +20,7 @@ declare_args() {

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
-@@ -506,7 +506,7 @@
+@@ -509,7 +509,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
-@@ -543,7 +543,7 @@
+@@ -546,7 +546,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/tools/licenses/licenses.py
 +++ b/tools/licenses/licenses.py
-@@ -824,7 +824,7 @@ def _GnBinary():
+@@ -855,7 +855,7 @@ def _GnBinary():
    elif sys.platform == 'darwin':
      subdir = 'mac'
    elif sys.platform == 'win32':