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

Commit 9c74d8f3 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Fix patches causing build failures

parent 13cf153c

build/e_patches/Browser-Modify-default-search-engines.patch

+24 −23
Original line number Diff line number Diff line 
From ca78b6a432fc1e972d4725abee08248677759177 Mon Sep 17 00:00:00 2001

From 00a7e636fd9e183e626a47e82bf39e87c0a9f25d Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Thu, 18 Mar 2021 13:42:44 +0100

Subject: Browser: Modify default search engines
@@ -13,15 +13,15 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com> 
 .../locale/locale_template_url_loader.h       |  1 -

 .../browser/locale/LocaleManagerDelegate.java |  1 -

 .../locale/LocaleTemplateUrlLoader.java       |  8 ----

 .../regional_capabilities_service.cc          |  4 ++

 .../regional_capabilities_service.cc          |  5 +++

 .../cromite/cromite_prepopulated_engines.json | 32 ++++++++++++++

 .../search_engines/search_engine_type.h       |  4 +-

 .../search_engines/search_engine_utils.cc     | 12 +-----

 .../template_url_prepopulate_data.cc          |  8 ++--

 9 files changed, 48 insertions(+), 64 deletions(-)

 9 files changed, 49 insertions(+), 64 deletions(-)



diff --git a/chrome/browser/android/locale/locale_template_url_loader.cc b/chrome/browser/android/locale/locale_template_url_loader.cc

index 9bc0f2fb1ec93..ba1e2e6e41913 100644

index 8e6c754e19271..d1f00983a4678 100644

--- a/chrome/browser/android/locale/locale_template_url_loader.cc

+++ b/chrome/browser/android/locale/locale_template_url_loader.cc

@@ -11,6 +11,7 @@
@@ -151,17 +151,18 @@ index 26c187bbcff33..60a32065acd26 100644 
     }

 }

diff --git a/components/regional_capabilities/regional_capabilities_service.cc b/components/regional_capabilities/regional_capabilities_service.cc

index 0fd9a6e94d133..37688dffa00f7 100644

index 445a16834fab5..1daaf2d79d5e2 100644

--- a/components/regional_capabilities/regional_capabilities_service.cc

+++ b/components/regional_capabilities/regional_capabilities_service.cc

@@ -322,6 +322,10 @@ RegionalCapabilitiesService::~RegionalCapabilitiesService() {

 

 std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>

@@ -375,6 +375,11 @@ std::vector<const PrepopulatedEngine*>

 RegionalCapabilitiesService::GetRegionalPrepopulatedEngines() {

   std::vector<const PrepopulatedEngine*> engines;

 

+  bool use_default = true;

+  if (use_default) {

+    return GetDefaultPrepopulatedEngines();

+  }

+

   if (HasSearchEngineCountryListOverride()) {

     auto country_override = std::get<SearchEngineCountryListOverride>(

         GetSearchEngineCountryOverride().value());
@@ -209,13 +210,13 @@ index 0d2ebbf08bfc7..9a7616e880b02 100644 
             "name": "Google in English",

             "keyword": "googleen",

diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h

index 599924b6e5528..3234d5872dc74 100644

index 0ed9a94dcbf4c..daf4f796ff4c5 100644

--- a/components/search_engines/search_engine_type.h

+++ b/components/search_engines/search_engine_type.h

@@ -100,12 +100,14 @@ enum SearchEngineType {

   SEARCH_ENGINE_STARTER_PACK_AI_MODE = 80,

   SEARCH_ENGINE_GOOGLE_EN = 81,

   SEARCH_ENGINE_DUCKDUCKGOLIGHT = 82,

@@ -101,12 +101,14 @@ enum SearchEngineType {

   SEARCH_ENGINE_YAHOO_JP = 81,

   SEARCH_ENGINE_GOOGLE_EN = 82,

   SEARCH_ENGINE_DUCKDUCKGOLIGHT = 83,

+  SEARCH_ENGINE_MURENASEARCH = 82,

+  SEARCH_ENGINE_SPOT = 83,
@@ -229,10 +230,10 @@ index 599924b6e5528..3234d5872dc74 100644 
 

 // Enum to record the type of search engine a user used in keyword mode. This

diff --git a/components/search_engines/search_engine_utils.cc b/components/search_engines/search_engine_utils.cc

index 4b32c2424922b..9808a5e92ff3a 100644

index 6a6070e916409..99c8461cab5c0 100644

--- a/components/search_engines/search_engine_utils.cc

+++ b/components/search_engines/search_engine_utils.cc

@@ -28,17 +28,7 @@ SearchEngineType GetEngineType(const GURL& url) {

@@ -45,17 +45,7 @@ SearchEngineType GetEngineType(const GURL& url) {

   DCHECK(url.is_valid());

   if ((true)) return SEARCH_ENGINE_OTHER;
@@ -248,14 +249,14 @@ index 4b32c2424922b..9808a5e92ff3a 100644 
-

-  // Now check the rest of the prepopulate data.

+  // Check the prepopulate data.

   for (const auto* engine : TemplateURLPrepopulateData::kAllEngines) {

     if (SameDomain(url, GURL(engine->search_url))) {

       return engine->type;

   const auto& all_engines = regional_capabilities::GetAllPrepopulatedEngines();

 

   auto it = std::ranges::find_if(all_engines, [&](const auto* engine) {

diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc

index ef70b5f994236..31847de29973a 100644

index 3846c3d8aec64..1687798b8aa62 100644

--- a/components/search_engines/template_url_prepopulate_data.cc

+++ b/components/search_engines/template_url_prepopulate_data.cc

@@ -177,7 +177,8 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(

@@ -176,7 +176,8 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(

         regional_prepopulated_engines) {

   std::vector<std::unique_ptr<TemplateURLData>> t_urls =

     GetPrepopulatedEnginesChromium(prefs, regional_prepopulated_engines);
@@ -265,7 +266,7 @@ index ef70b5f994236..31847de29973a 100644 
   t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(duckduckgo_light));

   return t_urls;

 }

@@ -207,7 +208,8 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(

@@ -206,7 +207,8 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(

                             country_id, prefs,

                             regional_capabilities::SearchEngineListType::kTopN),

                         &PrepopulatedEngineToTemplateURLData);
@@ -275,7 +276,7 @@ index ef70b5f994236..31847de29973a 100644 
   t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(duckduckgo_light));

   return t_urls;

 }

@@ -274,7 +276,7 @@ std::unique_ptr<TemplateURLData> GetPrepopulatedFallbackSearch(

@@ -273,7 +275,7 @@ std::unique_ptr<TemplateURLData> GetPrepopulatedFallbackSearch(

     const std::vector<const PrepopulatedEngine*>&

         regional_prepopulated_engines) {

   return FindPrepopulatedEngineInternal(prefs, regional_prepopulated_engines,
@@ -285,5 +286,5 @@ index ef70b5f994236..31847de29973a 100644 
 }

 

-- 

2.52.0

2.53.0

build/e_patches/Disable-adding-a-signed-out-avatar-on-new-tab-pages-by-default.patch

+32 −16
Original line number Diff line number Diff line 
From 6231725f2a639480f949d4d861854838003a94ae Mon Sep 17 00:00:00 2001

From 66b5ebde6e3b5767645a338e05775b27351d71ca Mon Sep 17 00:00:00 2001

From: fgei <fgei@gmail.com>

Date: Tue, 8 Aug 2023 09:10:36 +0000

Subject: Disable adding a signed out avatar on new tab pages by default



Signed-off-by: Saalim Quadri <danascape@gmail.com>

---

 .../identity_disc/IdentityDiscController.java        | 12 ++++++++++++

 1 file changed, 12 insertions(+)

 .../browser/identity_disc/IdentityDiscController.java     | 8 ++++++++

 .../chromium/chrome/browser/ui/signin/SigninUtils.java    | 8 ++++++++

 2 files changed, 16 insertions(+)



diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java

index 6f4ea1de82989..ce6feff235efd 100644

index 33193e5f7ade6..29627282901c8 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java

@@ -71,6 +71,9 @@ public class IdentityDiscController

                 IdentityManager.Observer,

@@ -85,6 +85,9 @@ public class IdentityDiscController

                 SyncService.SyncStateChangedListener,

                 ButtonDataProvider {

                 ButtonDataProvider,

                 BottomSheetSigninAndHistorySyncCoordinator.Delegate {

+

+    private static final boolean ALLOW_NTP_AVATAR = false;

+

     // Context is used for fetching resources and launching preferences page.

     private final Context mContext;

     private final ObservableSupplier<Profile> mProfileSupplier;

@@ -146,6 +149,11 @@ public class IdentityDiscController

     // Activity is used by sign-in launcher to anchor the bottomsheet.

@@ -196,6 +199,11 @@ public class IdentityDiscController

             return;

         }
@@ -34,17 +35,32 @@ index 6f4ea1de82989..ce6feff235efd 100644 
         String email = CoreAccountInfo.getEmailFrom(getSignedInAccountInfo());

         ensureProfileDataCache(mProfile);

 

@@ -380,6 +388,10 @@ public class IdentityDiscController

     }

diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SigninUtils.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SigninUtils.java

index a8a16328f057d..c44ba5dd415a1 100644

--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SigninUtils.java

+++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SigninUtils.java

@@ -21,6 +21,9 @@ import org.chromium.components.sync.UserActionableError;

 /** Helper functions for sign-in and accounts. */

 @NullMarked

 public final class SigninUtils {

+

+    private static final boolean ALLOW_NTP_AVATAR = false;

+

     private static final int DUAL_PANES_HORIZONTAL_LAYOUT_MIN_WIDTH = 600;

 

     private String getContentDescription(@Nullable String email) {

     private SigninUtils() {}

@@ -125,6 +128,11 @@ public final class SigninUtils {

             Context context,

             @Nullable DisplayableProfileData profileData,

             @UserActionableError int identityError) {

+

+        if (!ALLOW_NTP_AVATAR) {

+            return mContext.getString(R.string.accessibility_toolbar_btn_identity_disc);

+            return context.getString(R.string.accessibility_toolbar_btn_identity_disc);

+        }

+

         if (email == null) {

             return mContext.getString(R.string.accessibility_toolbar_btn_signed_out_identity_disc);

         if (profileData == null) {

             return context.getString(R.string.accessibility_toolbar_btn_signed_out_identity_disc);

         }

-- 

2.52.0

2.53.0

build/e_patches/Update-i18n-zhCN-support.patch

+15 −16
Original line number Diff line number Diff line 
From 614c7c9b7d1da41e6d2805e033ea9b049629465b Mon Sep 17 00:00:00 2001

From 910483fb16989f607cb19375d4cf9de70f59ad84 Mon Sep 17 00:00:00 2001

From: mars <gzhqyz@gmail.com>

Date: Sun, 2 Aug 2020 00:37:49 +0800

Subject: Update i18n zh_CN support
@@ -8,30 +8,30 @@ Signed-off-by: Saalim Quadri <danascape@gmail.com> 
---

 .../resources/generated_resources_zh-CN.xtb   |  4 +-

 .../resources/google_chrome_strings_zh-CN.xtb |  3 +-

 .../android_chrome_strings_zh-CN.xtb          | 71 ++++++++++++++++++-

 .../android_chrome_strings_zh-CN.xtb          | 70 ++++++++++++++++++-

 .../translations/browser_ui_strings_zh-CN.xtb | 26 ++++++-

 .../strings/components_strings_zh-CN.xtb      | 31 +++++++-

 .../translations/android_ui_strings_zh-CN.xtb |  3 +-

 6 files changed, 132 insertions(+), 6 deletions(-)

 6 files changed, 131 insertions(+), 6 deletions(-)



diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb

index 5045c9d4879ec..5f627daf14b90 100644

index 7bba850425d28..63ce2d86b5fa6 100644

--- a/chrome/app/resources/generated_resources_zh-CN.xtb

+++ b/chrome/app/resources/generated_resources_zh-CN.xtb

@@ -12186,4 +12186,6 @@

 <translation id="99731366405731005">您需要开启 <ph name="LINK1_BEGIN" />Chrome 同步<ph name="LINK1_END" />才能使用 Wi-Fi 同步功能。<ph name="LINK2_BEGIN" />了解详情<ph name="LINK2_END" /></translation>

@@ -12260,4 +12260,6 @@

 <translation id="998347228911661591">同步标签页分组</translation>

 <translation id="998747458861718449">检查(&amp;N)</translation>

 <translation id="998852291477823323">配置的政策不允许执行此操作。</translation>

-</translationbundle>

\ No newline at end of file

+<translation id="2243924551662516171">广告拦截</translation>

+<translation id="6262611605884902060">配置广告拦截和过滤规则地址</translation>

+</translationbundle>

diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/resources/google_chrome_strings_zh-CN.xtb

index c3b081f3e2278..89befb5317464 100644

index db34dbea19ad3..09510b80419f6 100644

--- a/chrome/app/resources/google_chrome_strings_zh-CN.xtb

+++ b/chrome/app/resources/google_chrome_strings_zh-CN.xtb

@@ -778,4 +778,5 @@

@@ -800,4 +800,5 @@

 <translation id="983803489796659991">更新服务器没有应用的任何哈希数据，因此安装失败。</translation>

 <translation id="989369509083708165">Google Chrome 是您的默认浏览器</translation>

 <translation id="989816563149873169"><ph name="SHORTCUT" /> 可用于切换 Chrome 个人资料</translation>
@@ -40,10 +40,10 @@ index c3b081f3e2278..89befb5317464 100644 
+<translation id="9090881409075599658">关于 Bromite</translation>

+</translationbundle>

diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb

index 832c9a50a514b..4267f70006cdc 100644

index 6a3b4500eb671..58b9b86bf6b8c 100644

--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb

+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb

@@ -1999,4 +1999,73 @@

@@ -2072,4 +2072,72 @@

 <translation id="992745192656291733"><ph name="TAB_COUNT" /> 个标签页</translation>

 <translation id="996149300115483134">动态卡片上的菜单已关闭</translation>

 <translation id="99907655649633293"><ph name="TAB_TITLE" />，无痕式标签页</translation>
@@ -66,7 +66,6 @@ index 832c9a50a514b..4267f70006cdc 100644 
+<translation id="3414581552405433519">移动版网站</translation>

+<translation id="560430187119032030">桌面版网站</translation>

+<translation id="5926902521522105785">启用 Viewport 元标签解析</translation>

+<translation id="5078638979202084724">为所有标签页添加书签</translation>

+<translation id="5710096944345053040">设置</translation>

+<translation id="7032549776816878218">一律使用无痕式标签页</translation>

+<translation id="2299991736030477757">点击新标签页或链接时，在无痕式标签页打开链接</translation>
@@ -120,10 +119,10 @@ index 832c9a50a514b..4267f70006cdc 100644 
+<translation id="6792382002445853728">移动工具栏到底部</translation>

+</translationbundle>

diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb

index 9f2d2ffc932cf..3bd981f51a3c4 100644

index 26bda16618e45..41757e2e0a5a5 100644

--- a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb

+++ b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb

@@ -762,4 +762,28 @@

@@ -804,4 +804,28 @@

 <translation id="961930410699694996">这次可以使用位置信息</translation>

 <translation id="967624055006145463">已存储的数据</translation>

 <translation id="969975166333045662">禁止网站使用 V8 优化工具。</translation>
@@ -155,10 +154,10 @@ index 9f2d2ffc932cf..3bd981f51a3c4 100644 
+<translation id="8431607486333903291">WebRTC</translation>

+</translationbundle>

diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb

index d5e3cd00aea62..7ff8a4287fab2 100644

index 8de23c5c6c0d9..ecfc301e55e7f 100644

--- a/components/strings/components_strings_zh-CN.xtb

+++ b/components/strings/components_strings_zh-CN.xtb

@@ -5194,4 +5194,33 @@

@@ -5263,4 +5263,33 @@

 <translation id="995755448277384931">添加 IBAN</translation>

 <translation id="995782501881226248">YouTube</translation>

 <translation id="997986563973421916">来自 Google Pay</translation>
@@ -207,5 +206,5 @@ index 5259e751b21cd..44cc7f0f184cd 100644 
+<translation id="8586588515010398065">无法保存到所选文件</translation>

+</translationbundle>

-- 

2.52.0

2.53.0