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

Commit 41612ad3 authored by Sooraj S's avatar Sooraj S 👽
Browse files

Fix Errors while applying patches

parent 6512b832

build/bromite_patches_list.txt

+7 −7
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ Add-flag-to-disable-IPv6-probes.patch 
Add-a-proxy-configuration-page.patch

Do-not-ignore-download-location-prompt-setting.patch

Disable-previews-by-default.patch

e-set-search-engines.patch

Use-4-tile-rows-never-show-logo.patch

Disable-metrics-collection-for-NTP-tiles.patch

e-set-package-name.patch
@@ -120,13 +119,8 @@ e-set-icon.patch 
e-set-app-name.patch

e-set-popular-sites.patch

e-enable-donottrack.patch

e-set-informations.patch

e-enable-search-suggestion.patch

e-disable-autofill.patch

e-rebrand-translations.patch

e-fix-settings-crash-issue.patch

e-share-search-engine.patch

e-enable-custom-tabs-by-default.patch

e_async_dns_disable.patch

Enable-site-per-process-isolation-for-devices-with-enough-memory.patch

Use-64-bit-WebView-processes.patch
@@ -143,7 +137,6 @@ disable-background-sync-by-default.patch 
disable-sensors-access-site-setting-by-default.patch

Disable-media-router-and-remoting-by-default.patch

Do-not-record-UMA-for-network-errors.patch

Fix-About-Chrome-regression.patch

Disable-unified-consent-on-Android.patch

Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch

Disable-search-ready-omnibox-by-default.patch
@@ -156,3 +149,10 @@ Disable-HEAD-requests-for-single-word-Omnibar-searches.patch 
Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch

Disable-some-signed-exchange-features.patch

Add-flag-to-disable-WebGL.patch

e-set-search-engines.patch

e-set-informations.patch

e-disable-autofill.patch

e-rebrand-translations.patch

e-fix-settings-crash-issue.patch

e-enable-custom-tabs-by-default.patch

Fix-About-Chrome-regression.patch
 
 No newline at end of file

build/patches/Fix-About-Chrome-regression.patch

+8 −7
Original line number Diff line number Diff line 
From 2353a80279b145f6c3aaa5f7f5e467cb51857f7b Mon Sep 17 00:00:00 2001

From 9e5d5c6c3479fb137787b16c29decf69aa06451f Mon Sep 17 00:00:00 2001

From: Sumit Pundir <pundirsumit11@gmail.com>

Date: Fri, 23 Aug 2019 01:26:27 +0530

Subject: [PATCH] Fix 'About Chrome' regression

Subject: [PATCH 7/7] Fix 'About Chrome' regression



---

 chrome/android/java/strings/android_chrome_strings.grd | 2 +-
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix 'About Chrome' regression 
 2 files changed, 2 insertions(+), 2 deletions(-)



diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd

index 7aa459c4c0a9..d0a4485c3c0f 100644

index 6d5af7283bf0..d0d0bc82f519 100644

--- a/chrome/android/java/strings/android_chrome_strings.grd

+++ b/chrome/android/java/strings/android_chrome_strings.grd

@@ -1450,7 +1450,7 @@ Your Google account may have other forms of browsing history like searches and a

@@ -1465,7 +1465,7 @@ Your Google account may have other forms of browsing history like searches and a

 

       <!-- About Chrome preferences -->

       <message name="IDS_PREFS_ABOUT_CHROME" desc="Title for the About Chrome page. [CHAR-LIMIT=32]">
@@ -22,7 +22,7 @@ index 7aa459c4c0a9..d0a4485c3c0f 100644 
       <message name="IDS_APPLICATION_VERSION_TITLE" desc="Title for application version">

         Application version

diff --git a/chrome/app/settings_google_chrome_strings.grdp b/chrome/app/settings_google_chrome_strings.grdp

index 413cf6f2f7fe..a3c6a8be4c52 100644

index c63c5b3382d4..8004ec2afb00 100644

--- a/chrome/app/settings_google_chrome_strings.grdp

+++ b/chrome/app/settings_google_chrome_strings.grdp

@@ -3,7 +3,7 @@
@@ -35,4 +35,5 @@ index 413cf6f2f7fe..a3c6a8be4c52 100644 
   <message name="IDS_SETTINGS_GET_HELP_USING_CHROME" desc="Text of the button which takes the user to the Chrome help page.">

     Get help with Chrome

-- 

2.17.1
 
2.23.0

build/patches/e-disable-autofill.patch

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

From ed623302a6b91263ea23f73b8e1d464cbb8eae74 Mon Sep 17 00:00:00 2001

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

Date: Mon, 11 Feb 2019 11:59:35 +0100

Subject: [PATCH] Disable Google Assistant in Chrome

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



---

 chrome/android/java/res/xml/main_preferences.xml             | 5 -----
@@ -10,23 +10,23 @@ Subject: [PATCH] Disable Google Assistant in Chrome 
 3 files changed, 2 insertions(+), 7 deletions(-)



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

index 3f61c2cdefa7..d1e9c2efeed0 100644

index 55806c223988..7b035bae9799 100644

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

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

@@ -30,11 +30,6 @@

         android:key="autofill_addresses"

         android:order="7"

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

-    <org.chromium.chrome.browser.preferences.ChromeBasePreferenceCompat

-    <org.chromium.chrome.browser.preferences.ChromeBasePreference

-        android:fragment="org.chromium.chrome.browser.preferences.autofill_assistant.AutofillAssistantPreferences"

-        android:key="autofill_assistant"

-        android:order="8"

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

     <android.support.v7.preference.Preference

     <Preference

         android:fragment="org.chromium.chrome.browser.preferences.NotificationsPreferences"

         android:key="notifications"

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java

index 7a667fcadfd3..30c5292072c8 100644

index 1aa27a6abe67..098691eb476f 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java

@@ -48,7 +48,7 @@ public class AutofillAssistantPreferences extends PreferenceFragmentCompat {
@@ -39,10 +39,10 @@ index 7a667fcadfd3..30c5292072c8 100644 
 

     private Context getStyledContext() {

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

index bcb4bcb38c94..a89bd5401296 100644

index 47256984df1e..4b39102ee208 100644

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

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

@@ -762,7 +762,7 @@ const base::Feature kBrowserUseDisplayThreadPriority{

@@ -763,7 +763,7 @@ const base::Feature kBrowserUseDisplayThreadPriority{

 // Autofill Accessibility in Android.

 // crbug.com/627860

 const base::Feature kAndroidAutofillAccessibility{
@@ -52,5 +52,5 @@ index bcb4bcb38c94..a89bd5401296 100644 
 // Sets moderate binding to background renderers playing media, when enabled.

 // Else the renderer will have strong binding.

-- 

2.17.1

2.23.0

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

+15 −7
Original line number Diff line number Diff line 
From 3ffee0d20b23a93c6cd3d68f74ac6fb60e685943 Mon Sep 17 00:00:00 2001

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

From: Sumit Pundir <pundirsumit11@gmail.com>

Date: Fri, 10 May 2019 00:12:37 +0530

Subject: [PATCH] Enable custom tabs by default

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



Signed-off-by: Sumit Pundir <pundirsumit11@gmail.com>

---

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

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

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

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



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

index 132aef01a051..ccb47c09459d 100644

index 7649427ff6b4..4ee4daad7b38 100644

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

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

@@ -36,7 +36,7 @@

@@ -37,7 +37,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" />

     <android.support.v7.preference.Preference

         android:key="contextual_search"

         android:title="@string/contextual_search_title"

@@ -51,6 +51,6 @@

         android:key="clear_browsing_data"

         android:title="@string/clear_browsing_data_title"

         android:summary="@string/clear_browsing_data_summary"

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

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

         app:allowDividerBelow="false" />

 </PreferenceScreen>

-- 

2.17.1

2.23.0

build/patches/e-fix-settings-crash-issue.patch

+11 −12
Original line number Diff line number Diff line 
From 577d0e90a8447319238c9e318099d32175a8ab3a Mon Sep 17 00:00:00 2001

From a242281dd6e239c6d623dd9d122f739d33968bc5 Mon Sep 17 00:00:00 2001

From: Sumit Pundir <pundirsumit11@gmail.com>

Date: Wed, 8 May 2019 20:03:02 +0530

Subject: [PATCH] Fix settings crash

Subject: [PATCH 5/7] Fix settings crash



Partial revert of build/patches/e-disable-autofill.patch



Signed-off-by: Sumit Pundir <pundirsumit11@gmail.com>

---

 chrome/android/java/res/xml/main_preferences.xml | 7 ++++++-

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

 chrome/android/java/res/xml/main_preferences.xml | 5 +++++

 1 file changed, 5 insertions(+)



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

index d1e9c2efeed0..6cd0ba9a0dff 100644

index 7b035bae9799..55806c223988 100644

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

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

@@ -29,7 +29,12 @@

         android:fragment="org.chromium.chrome.browser.preferences.autofill.AutofillProfilesFragment"

@@ -30,6 +30,11 @@

         android:key="autofill_addresses"

         android:order="7"

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

+       android:title="@string/autofill_addresses_settings_title"/>

+    <org.chromium.chrome.browser.preferences.ChromeBasePreferenceCompat

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

+    <org.chromium.chrome.browser.preferences.ChromeBasePreference

+        android:fragment="org.chromium.chrome.browser.preferences.autofill_assistant.AutofillAssistantPreferences"

+        android:key="autofill_assistant"

+        android:order="8"

+        android:title="@string/prefs_autofill_assistant_title"/>

     <android.support.v7.preference.Preference

     <Preference

         android:fragment="org.chromium.chrome.browser.preferences.NotificationsPreferences"

         android:key="notifications"

-- 

2.17.1
 
2.23.0