Merge pull request #215 from teeminus/update

Update to ungoogled-chromium 112.0.5615.50-1
ungoogled-software · Apr 6, 2023 · 16893b9 · 16893b9
2 parents 9538daa + a096e1f
commit 16893b9
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 26 deletions.
diff --git 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
-@@ -1402,7 +1402,7 @@ config("compiler_deterministic") {
+@@ -1411,7 +1411,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
-@@ -42,7 +42,7 @@ declare_args() {
-     clang_version = "17"
-   } else {
-     # TODO(crbug.com/1410101): Remove in next Clang roll.
--    clang_version = "16"
-+    clang_version = "15"
-   }
+@@ -38,7 +38,7 @@ if (generate_linker_map) {
  }
 
+ declare_args() {
+-  clang_version = "17"
++  clang_version = "15"
+ }
+
+ # Extension for shared library files (including leading dot).
diff --git a/patches/ungoogled-chromium/windows/windows-disable-download-warning-prompt.patch b/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
-@@ -2415,7 +2415,7 @@ void DownloadItemImpl::SetDangerType(Dow
+@@ -2416,7 +2416,7 @@ void DownloadItemImpl::SetDangerType(Dow
                           TRACE_EVENT_SCOPE_THREAD, "danger_type",
                           GetDownloadDangerNames(danger_type).c_str());
    }

diff --git a/patches/ungoogled-chromium/windows/windows-disable-event-log.patch b/patches/ungoogled-chromium/windows/windows-disable-event-log.patch
@@ -3,7 +3,7 @@
 
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -418,7 +418,6 @@ static_library("common_lib") {
+@@ -420,7 +420,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
 
-@@ -464,11 +463,6 @@ void InitChromeLogging(const base::Comma
+@@ -463,11 +462,6 @@ void InitChromeLogging(const base::Comma
  #if BUILDFLAG(IS_WIN)
    // Enable trace control and transport through event tracing for Windows.
    LogEventProvider::Initialize(kChromeTraceProviderName);

diff --git a/patches/ungoogled-chromium/windows/windows-disable-machine-id.patch b/patches/ungoogled-chromium/windows/windows-disable-machine-id.patch
@@ -20,9 +20,9 @@
  #include "base/base_paths.h"
 +#include "base/command_line.h"
  #include "base/files/file_path.h"
+ #include "base/notreached.h"
  #include "base/path_service.h"
- #include "base/threading/scoped_blocking_call.h"
-@@ -18,6 +19,9 @@ namespace metrics {
+@@ -19,6 +20,9 @@ namespace metrics {
 
  // static
  bool MachineIdProvider::HasId() {
@@ -32,7 +32,7 @@
    return true;
  }
 
-@@ -25,6 +29,10 @@ bool MachineIdProvider::HasId() {
+@@ -26,6 +30,10 @@ bool MachineIdProvider::HasId() {
  // is running from.
  // static
  std::string MachineIdProvider::GetMachineId() {

diff --git 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
-@@ -1537,7 +1537,7 @@ component("base") {
+@@ -1086,7 +1086,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
@@ -59,7 +59,7 @@
    content::GetUIThreadTaskRunner({})->PostDelayedTask(
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1331,8 +1331,6 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -1275,8 +1275,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)
-@@ -1668,12 +1666,8 @@ void RegisterProfilePrefs(user_prefs::Pr
+@@ -1608,12 +1606,8 @@ void RegisterProfilePrefs(user_prefs::Pr
 
  #if BUILDFLAG(IS_WIN)
    CdmPrefServiceHelper::RegisterProfilePrefs(registry);
@@ -93,7 +93,7 @@
      "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
-@@ -193,7 +193,6 @@ PostCleanupSettingsResetter::Delegate::~
+@@ -192,7 +192,6 @@ PostCleanupSettingsResetter::Delegate::~
 
  void PostCleanupSettingsResetter::Delegate::FetchDefaultSettings(
      DefaultSettingsFetcher::SettingsCallback callback) {

diff --git a/patches/ungoogled-chromium/windows/windows-fix-command-ids.patch b/patches/ungoogled-chromium/windows/windows-fix-command-ids.patch
@@ -35,7 +35,7 @@
  // Page-related commands
  #define IDC_BOOKMARK_THIS_TAB           35000
  #define IDC_BOOKMARK_ALL_TABS           35001
-@@ -226,10 +210,6 @@
+@@ -227,10 +211,6 @@
  #define IDC_CHROME_TIPS                40263
  #define IDC_CHROME_WHATS_NEW           40264
 
@@ -46,7 +46,7 @@
  #define IDC_PERFORMANCE                40266
 
  // Spell-check
-@@ -416,7 +396,7 @@
+@@ -419,7 +399,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
-@@ -450,13 +430,13 @@
+@@ -453,13 +433,13 @@
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS 52411
  #define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
 

diff --git 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
-@@ -622,7 +622,7 @@ def _GnBinary():
+@@ -621,7 +621,7 @@ def _GnBinary():
    elif sys.platform == 'darwin':
      subdir = 'mac'
    elif sys.platform == 'win32':

diff --git a/patches/ungoogled-chromium/windows/windows-fix-showIncludes.patch b/patches/ungoogled-chromium/windows/windows-fix-showIncludes.patch
@@ -1,6 +1,6 @@
 --- a/build/toolchain/win/toolchain.gni
 +++ b/build/toolchain/win/toolchain.gni
-@@ -60,6 +60,9 @@ template("single_msvc_toolchain") {
+@@ -57,6 +57,9 @@ template("single_msvc_toolchain") {
        toolchain_is_clang = is_clang
      }
 
@@ -10,7 +10,7 @@
      # When the invoker has explicitly overridden use_goma or cc_wrapper in the
      # toolchain args, use those values, otherwise default to the global one.
      # This works because the only reasonable override that toolchains might
-@@ -194,15 +197,11 @@ template("single_msvc_toolchain") {
+@@ -191,15 +194,11 @@ template("single_msvc_toolchain") {
 
      # Disabled with cc_wrapper because of
      # https://github.com/mozilla/sccache/issues/1013

diff --git a/patches/ungoogled-chromium/windows/windows-no-unknown-warnings.patch b/patches/ungoogled-chromium/windows/windows-no-unknown-warnings.patch
@@ -3,7 +3,7 @@
 
 --- a/build/config/win/BUILD.gn
 +++ b/build/config/win/BUILD.gn
-@@ -73,6 +73,7 @@ config("compiler") {
+@@ -71,6 +71,7 @@ config("compiler") {
    if (is_clang) {
      cflags += [
        "/Zc:twoPhase",

diff --git a/ungoogled-chromium b/ungoogled-chromium