Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4804e89d authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

add eyeo ad-filter from cromite

parent 84107083

build/bromite_patches/00AdblockPlus-add-blocking-in-service-workers.patch

0 → 100644
+732 −0

File added.

Preview size limit exceeded, changes collapsed.

build/bromite_patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch

0 → 100644
+8192 −0

File added.

Preview size limit exceeded, changes collapsed.

build/bromite_patches/00Fix-eyeo-Browser-Ad-filtering-patches.patch

0 → 100644
+146 −0
Original line number Original line Diff line number Diff line 
From: uazo <uazo@users.noreply.github.com>

Date: Wed, 6 Sep 2023 15:25:18 +0000

Subject: Fix eyeo Browser Ad filtering patches



---

 chrome/browser/BUILD.gn                                 | 4 ----

 chrome/browser/client_hints/client_hints_browsertest.cc | 7 +------

 chrome/browser/extensions/BUILD.gn                      | 4 ----

 chrome/browser/preferences/BUILD.gn                     | 4 ----

 chrome/browser/ui/BUILD.gn                              | 6 ------

 chrome/browser/ui/tab_helpers.cc                        | 4 ----

 extensions/common/mojom/api_permission_id.mojom         | 3 ---

 7 files changed, 1 insertion(+), 31 deletions(-)



diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn

--- a/chrome/browser/BUILD.gn

+++ b/chrome/browser/BUILD.gn

@@ -2085,12 +2085,8 @@ static_library("browser") {

     "//chrome/common/notifications",

     "//chrome/installer/util:with_no_strings",

     "//chrome/services/speech/buildflags",

-<<<<<<< HEAD

-=======

-    "//chromeos/components/kiosk",

     "//components/adblock/content:browser",

     "//components/adblock/core/converter",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//components/assist_ranker",

     "//components/autofill/content/browser",

     "//components/autofill/core/browser",

diff --git a/chrome/browser/client_hints/client_hints_browsertest.cc b/chrome/browser/client_hints/client_hints_browsertest.cc

--- a/chrome/browser/client_hints/client_hints_browsertest.cc

+++ b/chrome/browser/client_hints/client_hints_browsertest.cc

@@ -652,17 +652,12 @@ class ClientHintsBrowserTest : public policy::PolicyTest {

     // Force-enable the ClientHintsFormFactor feature, so that the header is

     // represented in the various header counts.

     feature_list->InitializeFromCommandLine(

-<<<<<<< HEAD

-        "UserAgentClientHint,CriticalClientHint,AcceptCHFrame,"

-        "ClientHintsFormFactor",

-        "");

-=======

         "UserAgentClientHint,CriticalClientHint,AcceptCHFrame",

+        "ClientHintsFormFactor",

 	// Disabling AdblockPlus because the async implementation of

         // AdblockURLLoaderThrottle::WillStartRequest confuses

         // ThirdPartyURLLoaderInterceptor.

         "AdblockPlus");

->>>>>>> 9402d5c48c0e8... Squashed commits

     return feature_list;

   }

 

diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn

--- a/chrome/browser/extensions/BUILD.gn

+++ b/chrome/browser/extensions/BUILD.gn

@@ -821,11 +821,7 @@ static_library("extensions") {

     "//chrome/browser/safe_browsing:metrics_collector",

     "//chrome/browser/ui/tabs:tab_enums",

     "//chrome/browser/web_applications",

-<<<<<<< HEAD

-=======

-    "//chromeos/components/kiosk",

     "//components/adblock/content:browser",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//components/cbor:cbor",

     "//components/commerce/core:pref_names",

     "//components/device_reauth",

diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn

--- a/chrome/browser/preferences/BUILD.gn

+++ b/chrome/browser/preferences/BUILD.gn

@@ -38,12 +38,8 @@ android_library("java") {

 # TODO(chouinard,estade): Consider breaking this target up into a different target for each pref file.

 java_cpp_strings("java_pref_names_srcjar") {

   sources = [

-<<<<<<< HEAD

     "//chrome/common/pref_names.h",

-=======

-    "//chrome/common/pref_names.cc",

     "//components/adblock/core/common/adblock_prefs.cc",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//components/autofill/core/common/autofill_prefs.cc",

     "//components/commerce/core/pref_names.cc",

     "//components/dom_distiller/core/pref_names.cc",

diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn

--- a/chrome/browser/ui/BUILD.gn

+++ b/chrome/browser/ui/BUILD.gn

@@ -447,11 +447,8 @@ static_library("ui") {

     "//chrome/browser/storage_access_api",

     "//chrome/browser/ui/side_panel:side_panel_enums",

     "//chrome/browser/ui/webui:configs",

-<<<<<<< HEAD

     "//chrome/browser/ui/webui/location_internals:mojo_bindings",

-=======

     "//chrome/browser/ui/webui/adblock_internals:mojo_bindings",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//chrome/browser/ui/webui/omnibox:mojo_bindings",

     "//chrome/browser/ui/webui/segmentation_internals:mojo_bindings",

     "//chrome/browser/ui/webui/suggest_internals:mojo_bindings",

@@ -467,11 +464,8 @@ static_library("ui") {

     "//components/about_ui",

     "//components/access_code_cast/common:metrics",

     "//components/account_id",

-<<<<<<< HEAD

     "//components/autofill/content/browser",

-=======

     "//components/adblock/content:browser",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//components/autofill/content/browser:risk_proto",

     "//components/autofill/core/browser",

     "//components/blocked_content",

diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc

--- a/chrome/browser/ui/tab_helpers.cc

+++ b/chrome/browser/ui/tab_helpers.cc

@@ -17,14 +17,10 @@

 #include "base/trace_event/trace_event.h"

 #include "build/build_config.h"

 #include "build/chromeos_buildflags.h"

-<<<<<<< HEAD

 #include "chrome/browser/3pcd/heuristics/opener_heuristic_tab_helper.h"

-=======

-#include "chrome/browser/3pcd_heuristics/opener_heuristic_tab_helper.h"

 #include "chrome/browser/adblock/element_hider_factory.h"

 #include "chrome/browser/adblock/sitekey_storage_factory.h"

 #include "chrome/browser/adblock/subscription_service_factory.h"

->>>>>>> 9402d5c48c0e8... Squashed commits

 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

 #include "chrome/browser/breadcrumbs/breadcrumb_manager_tab_helper.h"

 #include "chrome/browser/browser_process.h"

diff --git a/extensions/common/mojom/api_permission_id.mojom b/extensions/common/mojom/api_permission_id.mojom

--- a/extensions/common/mojom/api_permission_id.mojom

+++ b/extensions/common/mojom/api_permission_id.mojom

@@ -278,12 +278,9 @@ enum APIPermissionID {

   kSmartCardProviderPrivate = 247,

   kChromeOSEvents = 248,

   kChromeOSAttachedDeviceInfo = 249,

-<<<<<<< HEAD

   kReadingList = 250,

-=======

   kAdblockPrivate = 999,

   kEyeoFilteringPrivate = 1000,

->>>>>>> 9402d5c48c0e8... Squashed commits

 

   // Add new entries at the end of the enum and be sure to update the

   // "ExtensionPermission3" enum in tools/metrics/histograms/enums.xml

--

2.25.1

build/bromite_patches/Bromite-subresource-adblocker.patch

+9 −9
Original line number Original line Diff line number Diff line 
From 8d9da224cf38c33591926b916b43719df7801235 Mon Sep 17 00:00:00 2001

From 2daee8165ff498b1ae5cc4a43e46e6d206a6fa82 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Sat, 14 Sep 2019 10:20:08 +0200

Date: Sat, 14 Sep 2019 10:20:08 +0200

Subject: [PATCH 091/192] Bromite subresource adblocker

Subject: [PATCH] Bromite subresource adblocker





Add option to configure the ad blocker filters URL

Add option to configure the ad blocker filters URL

Disable look-alike, metrics, ablation and navigation throttles

Disable look-alike, metrics, ablation and navigation throttles
@@ -63,10 +63,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 create mode 100644 components/component_updater/download_filters_task.h

 create mode 100644 components/component_updater/download_filters_task.h





diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

index ff2fb13bb9395..04622b7bf6f1f 100644

index d33a3a3d25d8b..9e5ef08571855 100644

--- a/chrome/android/BUILD.gn

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -288,6 +288,7 @@ if (current_toolchain == default_toolchain) {

@@ -293,6 +293,7 @@ if (current_toolchain == default_toolchain) {

       "//chrome/android/modules/image_editor/provider:java",

       "//chrome/android/modules/image_editor/provider:java",

       "//chrome/android/modules/stack_unwinder/provider:java",

       "//chrome/android/modules/stack_unwinder/provider:java",

       "//chrome/android/webapk/libs/client:client_java",

       "//chrome/android/webapk/libs/client:client_java",
@@ -254,13 +254,13 @@ index 0000000000000..36ea147ed2693 
+

+

+</PreferenceScreen>

+</PreferenceScreen>

diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml

diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml

index c14807c7e3cac..5a4a3480838d4 100644

index 67d0527966bf4..4bd95c57c0839 100644

--- a/chrome/android/java/res/xml/main_preferences.xml

--- a/chrome/android/java/res/xml/main_preferences.xml

+++ b/chrome/android/java/res/xml/main_preferences.xml

+++ b/chrome/android/java/res/xml/main_preferences.xml

@@ -72,6 +72,11 @@ found in the LICENSE file.

@@ -71,6 +71,11 @@

         android:key="safety_check"

         android:key="eyeo_adblock"

         android:order="12"

         android:order="13"

         android:title="@string/prefs_safety_check"/>

         android:title="@string/adblock_settings_title" />

+    <Preference

+    <Preference

+        android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"

+        android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"

+        android:key="adblock"

+        android:key="adblock"

build/bromite_patches/Disable-safety-check.patch

+14 −10
Original line number Original line Diff line number Diff line 
From b97cd8880128a4e57c86a340c00258d3804689b3 Mon Sep 17 00:00:00 2001

From 326ea472ce9845f585f970e79418049d1b4b7003 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Sun, 6 Mar 2022 17:39:15 +0100

Date: Sun, 6 Mar 2022 17:39:15 +0100

Subject: [PATCH 156/192] Disable safety check

Subject: [PATCH] Disable safety check





License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

---

---
@@ -15,10 +15,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 7 files changed, 2 insertions(+), 29 deletions(-)

 7 files changed, 2 insertions(+), 29 deletions(-)





diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

index 8194a946c15c6..ceac4c4145d0a 100644

index 729f51aff1757..07fa3a239b824 100644

--- a/chrome/android/BUILD.gn

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -376,7 +376,6 @@ if (current_toolchain == default_toolchain) {

@@ -381,7 +381,6 @@ if (current_toolchain == default_toolchain) {

       "//chrome/browser/recent_tabs:helper_java",

       "//chrome/browser/recent_tabs:helper_java",

       "//chrome/browser/recent_tabs:java",

       "//chrome/browser/recent_tabs:java",

       "//chrome/browser/safe_browsing/android:java",

       "//chrome/browser/safe_browsing/android:java",
@@ -26,7 +26,7 @@ index 8194a946c15c6..ceac4c4145d0a 100644 
       "//chrome/browser/screenshot_monitor:java",

       "//chrome/browser/screenshot_monitor:java",

       "//chrome/browser/search_engines/android:java",

       "//chrome/browser/search_engines/android:java",

       "//chrome/browser/search_resumption:java",

       "//chrome/browser/search_resumption:java",

@@ -987,8 +986,6 @@ if (current_toolchain == default_toolchain) {

@@ -993,8 +992,6 @@ if (current_toolchain == default_toolchain) {

       "//chrome/browser/recent_tabs:java",

       "//chrome/browser/recent_tabs:java",

       "//chrome/browser/recent_tabs:junit",

       "//chrome/browser/recent_tabs:junit",

       "//chrome/browser/recent_tabs/internal:junit",

       "//chrome/browser/recent_tabs/internal:junit",
@@ -35,7 +35,7 @@ index 8194a946c15c6..ceac4c4145d0a 100644 
       "//chrome/browser/screenshot_monitor:java",

       "//chrome/browser/screenshot_monitor:java",

       "//chrome/browser/search_engines/android:java",

       "//chrome/browser/search_engines/android:java",

       "//chrome/browser/search_resumption:junit",

       "//chrome/browser/search_resumption:junit",

@@ -1578,8 +1575,6 @@ if (current_toolchain == default_toolchain) {

@@ -1584,8 +1581,6 @@ if (current_toolchain == default_toolchain) {

       "//chrome/browser/recent_tabs/internal:javatests",

       "//chrome/browser/recent_tabs/internal:javatests",

       "//chrome/browser/safe_browsing/android:java",

       "//chrome/browser/safe_browsing/android:java",

       "//chrome/browser/safe_browsing/android:javatests",

       "//chrome/browser/safe_browsing/android:javatests",
@@ -57,10 +57,10 @@ index 7c5779f77bf09..58dc23a53747b 100644 
   "java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java",

   "java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java",

   "java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java",

   "java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java",

diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml

diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml

index 683735e9a721d..49b562b49eebc 100644

index 35f44fe261ebd..d249c291a9e3f 100644

--- a/chrome/android/java/res/xml/main_preferences.xml

--- a/chrome/android/java/res/xml/main_preferences.xml

+++ b/chrome/android/java/res/xml/main_preferences.xml

+++ b/chrome/android/java/res/xml/main_preferences.xml

@@ -67,15 +67,10 @@ found in the LICENSE file.

@@ -61,11 +61,6 @@

         android:key="privacy"

         android:key="privacy"

         android:order="11"

         android:order="11"

         android:title="@string/prefs_privacy_security"/>

         android:title="@string/prefs_privacy_security"/>
@@ -69,6 +69,10 @@ index 683735e9a721d..49b562b49eebc 100644 
-        android:key="safety_check"

-        android:key="safety_check"

-        android:order="12"

-        android:order="12"

-        android:title="@string/prefs_safety_check"/>

-        android:title="@string/prefs_safety_check"/>

     <Preference

         android:fragment="org.chromium.components.adblock.settings.AdblockSettingsFragment"

         android:key="eyeo_adblock"

@@ -74,7 +69,7 @@

     <Preference

     <Preference

         android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"

         android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"

         android:key="adblock"

         android:key="adblock"
@@ -128,10 +132,10 @@ index 5b4b07a1985a9..7fb3e4b2bd3a8 100644 
             case SettingsFragment.SITE:

             case SettingsFragment.SITE:

                 fragment = SiteSettings.class;

                 fragment = SiteSettings.class;

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn

index de54aa91f1759..c8e2f5b9d070d 100644

index 29e94bc367732..a5c50710ebaba 100644

--- a/chrome/browser/BUILD.gn

--- a/chrome/browser/BUILD.gn

+++ b/chrome/browser/BUILD.gn

+++ b/chrome/browser/BUILD.gn

@@ -3360,7 +3360,6 @@ static_library("browser") {

@@ -3400,7 +3400,6 @@ static_library("browser") {

       "//chrome/browser/reading_list/android",

       "//chrome/browser/reading_list/android",

       "//chrome/browser/recent_tabs:jni_headers",

       "//chrome/browser/recent_tabs:jni_headers",

       "//chrome/browser/safe_browsing/android:safe_browsing_enums",

       "//chrome/browser/safe_browsing/android:safe_browsing_enums",