Merge pull request #167 from teeminus/update/104.0.5112.65

README.md

@@ -98,7 +98,7 @@ ln -s /usr/bin/vim /usr/bin/vi
 7. Remove all patches introduced by ungoogled-chromium: `./devutils/update_patches.sh unmerge`
     * Ensure patches/series is formatted correctly, e.g. blank lines
 8. Sanity checking for consistency in series file: `./devutils/check_patch_files.sh`
-9. Check for ezbuild dependency changes in file `build/src/DEPS` and adapt `downloads.ini` accordingly
+9. Check for esbuild dependency changes in file `build/src/DEPS` and adapt `downloads.ini` accordingly
 10. Use git to add changes and commit
 
 ## License

patches/series

@@ -18,5 +18,5 @@ ungoogled-chromium/windows/windows-fix-command-ids.patch
 ungoogled-chromium/windows/windows-disable-download-warning-prompt.patch
 ungoogled-chromium/windows/windows-fix-rc-terminating-error.patch
 ungoogled-chromium/windows/windows-fix-building-without-safebrowsing.patch
-ungoogled-chromium/windows/windows-fix-unknown-no-opaque-pointers-clang-parameter.patch
+ungoogled-chromium/windows/windows-fix-unknown-clang-parameters.patch
 ungoogled-chromium/windows/windows-fix-generate-resource-allowed-list.patch

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

@@ -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
-@@ -169,8 +169,14 @@ def GenerateDiffPatch(options, orig_file
+@@ -172,8 +172,14 @@ def GenerateDiffPatch(options, orig_file
 
  def GetLZMAExec(build_dir):
    if sys.platform == 'win32':

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

@@ -3,7 +3,7 @@
 
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -408,7 +408,6 @@ static_library("common_lib") {
+@@ -415,7 +415,6 @@ static_library("common_lib") {
      ]
      deps += [
        "//chrome/chrome_elf:chrome_elf_main_include",
@@ -21,7 +21,7 @@
  #include "chrome/install_static/install_details.h"
  #endif
 
-@@ -375,11 +374,6 @@ void InitChromeLogging(const base::Comma
+@@ -460,11 +459,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-rlz.patch

@@ -42,7 +42,7 @@
  // Removes all files from the installer directory. Returns false in case of an
  // error.
  bool RemoveInstallerFiles(const base::FilePath& installer_directory) {
-@@ -828,11 +810,6 @@ InstallStatus UninstallProduct(const Mod
+@@ -826,11 +808,6 @@ InstallStatus UninstallProduct(const Mod
      }
    }
 

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

@@ -17,7 +17,7 @@
        "//build:branding_buildflags",
 --- a/chrome/browser/chrome_browser_main_win.cc
 +++ b/chrome/browser/chrome_browser_main_win.cc
-@@ -459,15 +459,6 @@ void ShowCloseBrowserFirstMessageBox() {
+@@ -394,15 +394,6 @@ void ShowCloseBrowserFirstMessageBox() {
        l10n_util::GetStringUTF16(IDS_UNINSTALL_CLOSE_APP));
  }
 
@@ -33,7 +33,7 @@
  // Updates all Progressive Web App launchers in |profile_dir| to the latest
  // version.
  void UpdatePwaLaunchersForProfile(const base::FilePath& profile_dir) {
-@@ -695,23 +686,6 @@ void ChromeBrowserMainPartsWin::PostBrow
+@@ -642,23 +633,6 @@ void ChromeBrowserMainPartsWin::PostBrow
 
    InitializeChromeElf();
 
@@ -59,7 +59,7 @@
    content::GetUIThreadTaskRunner({})->PostDelayedTask(
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1164,8 +1164,6 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -1208,8 +1208,6 @@ void RegisterLocalState(PrefRegistrySimp
                                  true);
    registry->RegisterBooleanPref(
        policy::policy_prefs::kNativeWindowOcclusionEnabled, true);
@@ -68,7 +68,7 @@
    MediaFoundationServiceMonitor::RegisterPrefs(registry);
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    IncompatibleApplicationsUpdater::RegisterLocalStatePrefs(registry);
-@@ -1476,12 +1474,8 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -1527,12 +1525,8 @@ void RegisterProfilePrefs(user_prefs::Pr
 
  #if BUILDFLAG(IS_WIN)
    CdmPrefServiceHelper::RegisterProfilePrefs(registry);
@@ -151,19 +151,9 @@
 
 --- a/components/safe_browsing/buildflags.gni
 +++ b/components/safe_browsing/buildflags.gni
-@@ -8,15 +8,5 @@ if (is_android) {
- }
-
- declare_args() {
--  # Variable safe_browsing is used to control the build time configuration for
--  # safe browsing feature. Safe browsing can be compiled in 3 different levels:
--  # 0 disables it, 1 enables it fully, and 2 enables mobile protection via an
--  # external API.
--  if (is_ios || is_chromecast) {
-     safe_browsing_mode = 0
--  } else if (is_android) {
--    safe_browsing_mode = 2
--  } else {
--    safe_browsing_mode = 1
--  }
+@@ -19,4 +19,5 @@ declare_args() {
+   } else {
+     safe_browsing_mode = 1
+   }
++  safe_browsing_mode = 0
  }

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

@@ -30,7 +30,7 @@
  // Page-related commands
  #define IDC_BOOKMARK_THIS_TAB           35000
  #define IDC_BOOKMARK_ALL_TABS           35001
-@@ -223,10 +207,6 @@
+@@ -224,10 +208,6 @@
  #define IDC_CHROME_TIPS                40263
  #define IDC_CHROME_WHATS_NEW           40264
 
@@ -41,7 +41,7 @@
  // Spell-check
  // Insert any additional suggestions before _LAST; these have to be consecutive.
  #define IDC_SPELLCHECK_SUGGESTION_0     41000
-@@ -441,12 +421,6 @@
+@@ -442,12 +422,6 @@
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
 

patches/ungoogled-chromium/windows/windows-fix-rc-terminating-error.patch

@@ -13,7 +13,7 @@
  #include "build/buildflag.h"
 --- a/chrome/app/chrome_command_ids.h
 +++ b/chrome/app/chrome_command_ids.h
-@@ -378,7 +378,7 @@
+@@ -379,7 +379,7 @@
  #define IDC_MEDIA_ROUTER_ABOUT 51200
  #define IDC_MEDIA_ROUTER_HELP 51201
  #define IDC_MEDIA_ROUTER_LEARN_MORE 51202
@@ -22,7 +22,7 @@
  #define IDC_MEDIA_ROUTER_REPORT_ISSUE 51203
  #endif
  #define IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION 51204
-@@ -387,7 +387,7 @@
+@@ -388,7 +388,7 @@
  #define IDC_MEDIA_ROUTER_TOGGLE_MEDIA_REMOTING 51208
 
  // Context menu items for media toolbar button
@@ -31,7 +31,7 @@
  #define IDC_MEDIA_TOOLBAR_CONTEXT_REPORT_CAST_ISSUE 51209
  #endif
  #define IDC_MEDIA_TOOLBAR_CONTEXT_SHOW_OTHER_SESSIONS 51210
-@@ -421,7 +421,7 @@
+@@ -422,7 +422,7 @@
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
 

patches/ungoogled-chromium/windows/windows-fix-unknown-clang-parameters.patch

@@ -0,0 +1,46 @@
+# The "-no-opaque-pointers" and "-ffile-reproducible" commandline parameters has been added by clang-15. Once clang-15 is available for windows, this patch can be removed.
+
+--- a/base/location.cc
++++ b/base/location.cc
+@@ -73,7 +73,7 @@ constexpr bool StrEndsWith(const char* n
+   return true;
+ }
+
+-#if defined(__clang__) && defined(_MSC_VER)
++#if 0
+ static_assert(StrEndsWith(__FILE__, kStrippedPrefixLength, "base\\location.cc"),
+               "The file name does not match the expected prefix format.");
+ #else
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1420,10 +1420,6 @@ config("default_warnings") {
+     if (treat_warnings_as_errors) {
+       cflags += [ "/WX" ]
+     }
+-    if (fatal_linker_warnings) {
+-      arflags = [ "/WX" ]
+-      ldflags = [ "/WX" ]
+-    }
+     defines = [
+       # Without this, Windows headers warn that functions like wcsnicmp
+       # should be spelled _wcsnicmp. But all other platforms keep spelling
+@@ -1544,8 +1540,6 @@ config("default_warnings") {
+                         default_toolchain == "//build/toolchain/cros:target")) {
+         # TODO(https://crbug.com/1322823): Remove flags once potential miscompile is investigated.
+         cflags += [
+-          "-Xclang",
+-          "-no-opaque-pointers",
+         ]
+       }
+
+--- a/build/config/win/BUILD.gn
++++ b/build/config/win/BUILD.gn
+@@ -78,7 +78,7 @@ config("compiler") {
+       # Consistently use backslash as the path separator when expanding the
+       # __FILE__ macro when targeting Windows regardless of the build
+       # environment.
+-      "-ffile-reproducible",
++      #"-ffile-reproducible",
+     ]
+   }
+

patches/ungoogled-chromium/windows/windows-no-unknown-warnings.patch

@@ -3,13 +3,11 @@
 
 --- a/build/config/win/BUILD.gn
 +++ b/build/config/win/BUILD.gn
-@@ -71,7 +71,8 @@ config("compiler") {
-   ]
-
+@@ -73,6 +73,7 @@ config("compiler") {
    if (is_clang) {
--    cflags += [ "/Zc:twoPhase" ]
-+    cflags += [ "/Zc:twoPhase",
-+                "-Wno-unknown-warning-option", ]
-   }
+     cflags += [
+       "/Zc:twoPhase",
++      "-Wno-unknown-warning-option",
 
-   # Force C/C++ mode for the given GN detected file type. This is necessary
+       # Consistently use backslash as the path separator when expanding the
+       # __FILE__ macro when targeting Windows regardless of the build

revision.txt

@@ -1 +1 @@
-2
+1