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

Commit d651ff4c authored by Aayush Gupta's avatar Aayush Gupta
Browse files

patches: e: Regenerate patches as required 



- Most of the current patches gives error and are unable to be applied
  using 3way merge. A lot of them are also missing required content-header.
  Thus regenerate all of them.

Signed-off-by: Aayush Gupta's avatarAayush Gupta <theimpulson@e.email>
parent 79beb989

build/patches/e/e-Launcher-icon-updated.patch

+15 −14
Original line number Diff line number Diff line 
From 5f3a3043a5c9a91be887aff047362bbf7702ca81 Mon Sep 17 00:00:00 2001

From: mmali <futuretechnoworld.mohit@gmail.com>

Date: Fri, 10 Jan 2020 08:39:43 +0530

Subject: [PATCH 1/1] Launcher icon updated

From 6e5768dc6572ffad2d42ec46e4295fd1bd990776 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Fri, 19 Mar 2021 06:33:13 +0100

Subject: [PATCH] [PATCH] res_chromium_base: Change launcher icon to Browser



Signed-off-by: Aayush Gupta <theimpulson@e.email>

---

 .../res_chromium/mipmap-hdpi/app_icon.png     | Bin 4212 -> 6844 bytes

 .../res_chromium/mipmap-mdpi/app_icon.png     | Bin 2522 -> 4011 bytes

 .../res_chromium/mipmap-xhdpi/app_icon.png    | Bin 6161 -> 10032 bytes

 .../res_chromium/mipmap-xxhdpi/app_icon.png   | Bin 10214 -> 17202 bytes

 .../res_chromium/mipmap-xxxhdpi/app_icon.png  | Bin 14761 -> 22337 bytes

 .../mipmap-hdpi/app_icon.png                  | Bin 4212 -> 6844 bytes

 .../mipmap-mdpi/app_icon.png                  | Bin 2522 -> 4011 bytes

 .../mipmap-xhdpi/app_icon.png                 | Bin 6161 -> 10032 bytes

 .../mipmap-xxhdpi/app_icon.png                | Bin 10214 -> 17202 bytes

 .../mipmap-xxxhdpi/app_icon.png               | Bin 14761 -> 22337 bytes

 5 files changed, 0 insertions(+), 0 deletions(-)



diff --git a/chrome/android/java/res_chromium/mipmap-hdpi/app_icon.png b/chrome/android/java/res_chromium/mipmap-hdpi/app_icon.png

diff --git a/chrome/android/java/res_chromium_base/mipmap-hdpi/app_icon.png b/chrome/android/java/res_chromium_base/mipmap-hdpi/app_icon.png

index 7c125813be77f0933635aaf680660996ddef1271..c057b0771cef8c1074cc9a1d5bba2dfd2a49b652 100644

GIT binary patch

literal 6844
@@ -232,7 +233,7 @@ zYO8fxS~I!i8q~FBQP<Xdk;E`X$;z5SC2KbFDz#x;guIQsi@c9~fV@ZjZ4ok`y6<c% 
zDN|&mApfl2U#3Bo#bhc8TF5jS$=@bZ_t9YCd(2*FY4RDxpZ^AuRCl43S}7d>0000<

KMNUMnLSTYuDcsEf



diff --git a/chrome/android/java/res_chromium/mipmap-mdpi/app_icon.png b/chrome/android/java/res_chromium/mipmap-mdpi/app_icon.png

diff --git a/chrome/android/java/res_chromium_base/mipmap-mdpi/app_icon.png b/chrome/android/java/res_chromium_base/mipmap-mdpi/app_icon.png

index 005468fa2ece06bd3685f4792fc7d3270088f15f..263371c5cdb015bcbf244846007b25de8b652058 100644

GIT binary patch

literal 4011
@@ -366,7 +367,7 @@ z%k?o^978T<uGn67bLFlIMfj1Xr{eSN{c*>e<dI)g-}rlcj?DFw_$_nZTegB;gZ!F# 
zk4g!KSAFy=Vv0;crXn+u-yrWWf))((khke~%yXtPuQB=2{o@A(Vk$b3BpD_$kD0#e

bfAIJ(juMf+TvtWM00000NkvXXu0mjflf=FH



diff --git a/chrome/android/java/res_chromium/mipmap-xhdpi/app_icon.png b/chrome/android/java/res_chromium/mipmap-xhdpi/app_icon.png

diff --git a/chrome/android/java/res_chromium_base/mipmap-xhdpi/app_icon.png b/chrome/android/java/res_chromium_base/mipmap-xhdpi/app_icon.png

index a0c26efbdd736932916768933b0d461885082d9e..b52410ee11e1a536eb25af0ba49f92140e3a263e 100644

GIT binary patch

literal 10032
@@ -686,7 +687,7 @@ zgkprN2s^BXdXJF40dq9gIsijOOca+o*X%OTV!vaHY4^ZXh<3tqkZr249E~gWJ`sHn 
zW``|^9njkOnX7OJU=!{*igpMmJNga`M;DlVR0P|NIClhVZye$X;aEtbM4A4r0EzF9

jIRtWo5=?*+j#B&|%zWMku!{zj00000NkvXXu0mjfXQ*|T



diff --git a/chrome/android/java/res_chromium/mipmap-xxhdpi/app_icon.png b/chrome/android/java/res_chromium/mipmap-xxhdpi/app_icon.png

diff --git a/chrome/android/java/res_chromium_base/mipmap-xxhdpi/app_icon.png b/chrome/android/java/res_chromium_base/mipmap-xxhdpi/app_icon.png

index bb216c1a0a5262530fad2dd95bd6e06d24e35a17..fc99ea6825826cef16732ae16c1e260497b62e7e 100644

GIT binary patch

literal 17202
@@ -1222,7 +1223,7 @@ z$qhewj7yXlk~k-J)WooEv@K7uW82aYJJK&uX~>k6%EaYqXCzZd0g}QLA8|>Nva~Nv 
zzd)rY6A3Aj=WUfRY3IY>w!}!D(-CR<1uFgbC%X_#l8-yGgQ&=3lE=O+O}{|Jkan)M

gD^NRPDE~qHe;PAH+jCH182|tP07*qoM6N<$f*geH#sB~S



diff --git a/chrome/android/java/res_chromium/mipmap-xxxhdpi/app_icon.png b/chrome/android/java/res_chromium/mipmap-xxxhdpi/app_icon.png

diff --git a/chrome/android/java/res_chromium_base/mipmap-xxxhdpi/app_icon.png b/chrome/android/java/res_chromium_base/mipmap-xxxhdpi/app_icon.png

index 13497911dc1373aebc6f88d8a42667cfbc22ad73..3ffe26f2cb1abaffb0edc62eca95d7ed8326cfe1 100644

GIT binary patch

literal 22337

build/patches/e/e-async-dns-disable.patch

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

From: Romain HUNAULT <romain.hunault@e.email>

Date: Mon, 20 Jan 2020 13:34:26 +0530

Subject: [PATCH] Use default DNS settings

From f5f030cd86abc25ad8f53a7ce4ef308deda5ba78 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Thu, 18 Mar 2021 13:20:54 +0100

Subject: [PATCH] [PATCH] chrome_features: Use default DNS settings



Signed-off-by: Aayush Gupta <theimpulson@e.email>

---

 chrome/common/chrome_features.cc | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc

index 168d02d94de9..143178d6bea6 100644

index 9f76e03a491b..d8dc824ff652 100644

--- a/chrome/common/chrome_features.cc

+++ b/chrome/common/chrome_features.cc

@@ -74,7 +74,7 @@ const base::Feature kAppServiceShelf{"AppServiceShelf",

@@ -85,7 +85,7 @@ const base::Feature kAppShimNewCloseBehavior{"AppShimNewCloseBehavior",

 // Enables the built-in DNS resolver.

 const base::Feature kAsyncDns {

   "AsyncDns",

-#if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_ANDROID)

+#if defined(OS_CHROMEOS) || defined(OS_MACOSX)

-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_ANDROID)

+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC)

       base::FEATURE_ENABLED_BY_DEFAULT

 #else

       base::FEATURE_DISABLED_BY_DEFAULT

-- 

2.23.0

2.17.1

build/patches/e/e-disable-autofill.patch

+11 −10
Original line number Diff line number Diff line 
From 25d7dd831c2a8ee7bfbdbb97e48db53921bc0521 Mon Sep 17 00:00:00 2001

From: root <root@e-builder.ralfhein.de>

Date: Mon, 20 Jan 2020 17:41:21 +0530

Subject: [PATCH] [PATCH 3/7] Disable Google Assistant in Chrome

From f5dba56c6e15594921a37096756eecfdc29d76ac Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Thu, 18 Mar 2021 13:53:59 +0100

Subject: [PATCH] [PATCH] content_features: Disable autofill



Signed-off-by: Aayush Gupta <theimpulson@e.email>

---

 content/public/common/content_features.cc | 2 +-

 1 file changed, 1 insertions(+), 1 deletions(-)

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc

index 7012b3fc0e9f..0555335b9823 100644

index e6863517f624..283ce17de17b 100644

--- a/content/public/common/content_features.cc

+++ b/content/public/common/content_features.cc

@@ -847,7 +847,7 @@ const base::Feature kWebXrPermissionsApi{"WebXrPermissionsApi",

@@ -883,7 +883,7 @@ const base::Feature kWebXrIncubations{"WebXRIncubations",

 // Autofill Accessibility in Android.

 // crbug.com/627860

 const base::Feature kAndroidAutofillAccessibility{
@@ -21,5 +22,5 @@ index 7012b3fc0e9f..0555335b9823 100644 
 // Sets moderate binding to background renderers playing media, when enabled.

 // Else the renderer will have strong binding.

-- 

2.23.0

2.17.1

build/patches/e/e-enable-custom-tabs-by-default.patch

+19 −18
Original line number Diff line number Diff line 
From 07538c0bb4e229c9f7655dab2366a88e7327c0f1 Mon Sep 17 00:00:00 2001

From: Sumit Pundir <pundirsumit11@gmail.com>

Date: Tue, 21 Jan 2020 00:03:37 +0530

Subject: [PATCH] [PATCH 6/7] Enable custom tabs by default

From e0ac40f0dcb6d332c3be96263bd594c256462b0c Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Fri, 19 Mar 2021 06:28:45 +0100

Subject: [PATCH] [PATCH] privacy_preferences: Enable custom tabs by default



Signed-off-by: Aayush Gupta <theimpulson@e.email>

---

 chrome/android/java/res/xml/privacy_preferences.xml | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

 chrome/android/java/res/xml/privacy_preferences.xml | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)



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

index 5e1e76c2a821..420fb10ffdf2 100644

index da91f663d1ed..5bf9759058ab 100644

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

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

@@ -42,7 +42,7 @@

@@ -46,7 +46,7 @@

         android:key="allow_custom_tab_intents"

         android:title="@string/allow_custom_tab_intents_title"

         android:summary="@string/allow_custom_tab_intents_summary"

-        android:defaultValue="false" />

+        android:defaultValue="true" />

     <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference

         android:key="close_tabs_on_exit"

         android:title="@string/close_tabs_on_exit_title"

@@ -52,5 +52,6 @@

         android:key="clear_browsing_data"

     <org.chromium.components.browser_ui.settings.ChromeBasePreference

         android:key="secure_dns"

         android:title="@string/settings_secure_dns_title"

@@ -57,6 +57,7 @@

         android:title="@string/clear_browsing_data_title"

         android:summary="@string/clear_browsing_data_summary"

-        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment" />

+        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment"

+        app:allowDividerBelow="false"/>

 </PreferenceScreen>

         android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment"

+        app:allowDividerBelow="false"

         android:order="5"/>

     <Preference

         android:key="privacy_sandbox"

-- 

2.23.0

2.17.1

build/patches/e/e-enable-donottrack.patch

+10 −7
Original line number Diff line number Diff line 
From: Romain HUNAULT <romain.hunault@e.email>

Date: Thu, 7 Feb 2019 10:31:37 +0100

Subject: [PATCH] Enable DoNotTrack by default

From b36210a77be1f5a8cb14fdbb96f11bc4679116df Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Thu, 18 Mar 2021 12:56:59 +0100

Subject: [PATCH] [PATCH] browser_ui_prefs: Enable DoNotTrack by default



Signed-off-by: Aayush Gupta <theimpulson@e.email>

---

 chrome/browser/ui/browser_ui_prefs.cc | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



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

index 6d58b5e1cc8b..fcfa015e2c59 100644

index 67ea0bf4a5c4..0aaf2ba9a356 100644

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

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

@@ -75,7 +75,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {

@@ -80,7 +80,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {

   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);

   registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);

   registry->RegisterBooleanPref(

-      prefs::kEnableDoNotTrack, false,

+      prefs::kEnableDoNotTrack, true,

       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);

 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)

 #if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_ANDROID)

   registry->RegisterBooleanPref(prefs::kPrintPreviewUseSystemDefaultPrinter,

-- 

2.17.1