From 38ebd3c85a344f36261d21fe0185bd5dbe35bdf2 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Sun, 16 Jul 2023 09:59:35 +0200 Subject: [PATCH] v115 fix windows build --- .../00Eyeo-Adblock-Remove-Privacy-Issues.patch | 11 ++++------- ...Disable-support-for-RAR-files-inspection.patch | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch b/build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch index f102b40f..e89854b6 100644 --- a/build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch +++ b/build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch @@ -20,7 +20,7 @@ suit Bromite logic ...hrome_browser_main_extra_parts_profiles.cc | 2 - chrome/browser/resources/settings/BUILD.gn | 2 + .../settings/adblock_page/adblock_page.html | 207 + - .../settings/adblock_page/adblock_page.ts | 289 ++ + .../settings/adblock_page/adblock_page.ts | 286 ++ .../settings/basic_page/basic_page.html | 7 + .../settings/basic_page/basic_page.ts | 1 + .../resources/settings/page_visibility.ts | 1 + @@ -108,7 +108,7 @@ suit Bromite logic .../blink/renderer/core/css/style_engine.h | 1 + .../renderer/core/exported/web_document.cc | 13 +- .../definitions/adblock_private.d.ts | 14 + - 103 files changed, 5041 insertions(+), 1296 deletions(-) + 103 files changed, 5038 insertions(+), 1296 deletions(-) delete mode 100644 chrome/browser/adblock/adblock_telemetry_service_factory.cc delete mode 100644 chrome/browser/adblock/adblock_telemetry_service_factory.h create mode 100644 chrome/browser/resources/settings/adblock_page/adblock_page.html @@ -1058,7 +1058,7 @@ diff --git a/chrome/browser/resources/settings/adblock_page/adblock_page.ts b/ch new file mode 100644 --- /dev/null +++ b/chrome/browser/resources/settings/adblock_page/adblock_page.ts -@@ -0,0 +1,289 @@ +@@ -0,0 +1,286 @@ +/* + This file is part of Bromite. + @@ -1080,15 +1080,12 @@ new file mode 100644 +import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js'; +import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js'; +import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js'; -+import '../controls/controlled_button.js'; -+import '../controls/settings_toggle_button.js'; +import '../settings_shared.css.js'; + -+ +import { I18nMixin } from 'chrome://resources/cr_elements/i18n_mixin.js'; +import { BaseMixin } from '../base_mixin.js'; +import { PolymerElement } from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; -+import { SettingsToggleButtonElement } from '../controls/settings_toggle_button.js'; ++import { SettingsToggleButtonElement } from '/shared/settings/controls/settings_toggle_button.js'; +import { PrefsMixin } from 'chrome://resources/cr_components/settings_prefs/prefs_mixin.js'; +import { CrCheckboxElement } from 'chrome://resources/cr_elements/cr_checkbox/cr_checkbox.js'; +import { getTemplate } from './adblock_page.html.js'; diff --git a/build/patches/Disable-support-for-RAR-files-inspection.patch b/build/patches/Disable-support-for-RAR-files-inspection.patch index 6e1c3741..5e20f601 100644 --- a/build/patches/Disable-support-for-RAR-files-inspection.patch +++ b/build/patches/Disable-support-for-RAR-files-inspection.patch @@ -8,7 +8,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../services/file_util/safe_archive_analyzer.cc | 17 +++-------------- .../services/file_util/safe_archive_analyzer.h | 2 -- chrome/utility/safe_browsing/BUILD.gn | 2 -- - 4 files changed, 4 insertions(+), 19 deletions(-) + .../utility/safe_browsing/archive_analyzer.cc | 2 +- + 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc --- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc @@ -80,5 +81,17 @@ diff --git a/chrome/utility/safe_browsing/BUILD.gn b/chrome/utility/safe_browsin "seven_zip_analyzer.cc", "seven_zip_analyzer.h", "zip_analyzer.cc", +diff --git a/chrome/utility/safe_browsing/archive_analyzer.cc b/chrome/utility/safe_browsing/archive_analyzer.cc +--- a/chrome/utility/safe_browsing/archive_analyzer.cc ++++ b/chrome/utility/safe_browsing/archive_analyzer.cc +@@ -24,7 +24,7 @@ namespace safe_browsing { + std::unique_ptr ArchiveAnalyzer::CreateForArchiveType( + DownloadFileType_InspectionType file_type) { + if (file_type == DownloadFileType::RAR) { +- return std::make_unique(); ++ return nullptr; + } else if (file_type == DownloadFileType::ZIP) { + return std::make_unique(); + } else if (file_type == DownloadFileType::SEVEN_ZIP) { -- 2.25.1