From 20a25ce6d3f06ed6853c9950dc7a942136632d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Fri, 8 Nov 2024 04:08:49 +0000 Subject: [PATCH] firefox: update for 132 release. --- ...01_Remove_Android_and_iOS_promotion.patch} | 10 ++-- ...move_moreFromMozilla_Focus_and_Klar.patch} | 0 ...ites_and_keep_weather_widget_static.patch} | 12 +++-- ...{sqlite-ppc.patch => 004_sqlite-ppc.patch} | 0 .../patch_changes/005_apply_custom_urls.patch | 51 +++++++++++++++++++ helpers/DATA/firefox/settings.js | 9 ++-- helpers/make-firefox | 4 +- 7 files changed, 73 insertions(+), 13 deletions(-) rename helpers/DATA/firefox/patch_changes/{Remove_Android_and_iOS_promotion.patch => 001_Remove_Android_and_iOS_promotion.patch} (94%) rename helpers/DATA/firefox/patch_changes/{Remove_moreFromMozilla_Focus_and_Klar.patch => 002_Remove_moreFromMozilla_Focus_and_Klar.patch} (100%) rename helpers/DATA/firefox/patch_changes/{disable_sponsored_topsites_and_keep_weather_widget_static.patch => 003_disable_sponsored_topsites_and_keep_weather_widget_static.patch} (76%) rename helpers/DATA/firefox/patch_changes/{sqlite-ppc.patch => 004_sqlite-ppc.patch} (100%) create mode 100644 helpers/DATA/firefox/patch_changes/005_apply_custom_urls.patch diff --git a/helpers/DATA/firefox/patch_changes/Remove_Android_and_iOS_promotion.patch b/helpers/DATA/firefox/patch_changes/001_Remove_Android_and_iOS_promotion.patch similarity index 94% rename from helpers/DATA/firefox/patch_changes/Remove_Android_and_iOS_promotion.patch rename to helpers/DATA/firefox/patch_changes/001_Remove_Android_and_iOS_promotion.patch index 9d5a063..08bca09 100644 --- a/helpers/DATA/firefox/patch_changes/Remove_Android_and_iOS_promotion.patch +++ b/helpers/DATA/firefox/patch_changes/001_Remove_Android_and_iOS_promotion.patch @@ -51,12 +51,12 @@ index 1b29e8d..6f7566c 100644 sync-profile-picture = .tooltiptext = Change profile picture diff --git a/browser/components/protections/content/vpn-card.mjs b/browser/components/protections/content/vpn-card.mjs -index 2417f1a641..698c48ccc3 100644 +index d9fe35c0..1b166048 100644 --- a/browser/components/protections/content/vpn-card.mjs +++ b/browser/components/protections/content/vpn-card.mjs -@@ -23,22 +23,6 @@ export default class VPNCard { +@@ -24,22 +24,6 @@ export default class VPNCard { vpnLink.addEventListener("click", () => { - this.doc.sendTelemetryEvent("click", "vpn_card_link"); + this.doc.sendTelemetryEvent("clickVpnCardLink"); }); - let androidVPNAppLink = document.getElementById( - "vpn-google-playstore-link" @@ -65,14 +65,14 @@ index 2417f1a641..698c48ccc3 100644 - "browser.contentblocking.report.vpn-android.url" - ); - androidVPNAppLink.addEventListener("click", () => { -- document.sendTelemetryEvent("click", "vpn_app_link_android"); +- document.sendTelemetryEvent("clickVpnAppLinkAndroid"); - }); - let iosVPNAppLink = document.getElementById("vpn-app-store-link"); - iosVPNAppLink.href = RPMGetStringPref( - "browser.contentblocking.report.vpn-ios.url" - ); - iosVPNAppLink.addEventListener("click", () => { -- document.sendTelemetryEvent("click", "vpn_app_link_ios"); +- document.sendTelemetryEvent("clickVpnAppLinkIos"); - }); const vpnBanner = this.doc.querySelector(".vpn-banner"); diff --git a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch b/helpers/DATA/firefox/patch_changes/002_Remove_moreFromMozilla_Focus_and_Klar.patch similarity index 100% rename from helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch rename to helpers/DATA/firefox/patch_changes/002_Remove_moreFromMozilla_Focus_and_Klar.patch diff --git a/helpers/DATA/firefox/patch_changes/disable_sponsored_topsites_and_keep_weather_widget_static.patch b/helpers/DATA/firefox/patch_changes/003_disable_sponsored_topsites_and_keep_weather_widget_static.patch similarity index 76% rename from helpers/DATA/firefox/patch_changes/disable_sponsored_topsites_and_keep_weather_widget_static.patch rename to helpers/DATA/firefox/patch_changes/003_disable_sponsored_topsites_and_keep_weather_widget_static.patch index e68b1a7..85543eb 100644 --- a/helpers/DATA/firefox/patch_changes/disable_sponsored_topsites_and_keep_weather_widget_static.patch +++ b/helpers/DATA/firefox/patch_changes/003_disable_sponsored_topsites_and_keep_weather_widget_static.patch @@ -1,8 +1,8 @@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index b8aa711..c923c87 100644 +index 391bc93e..a7d93085 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1698,22 +1698,22 @@ pref("browser.topsites.component.enabled", false); +@@ -1718,27 +1718,27 @@ pref("browser.topsites.component.enabled", false); pref("browser.topsites.useRemoteSetting", true); // Fetch sponsored Top Sites from Mozilla Tiles Service (Contile) @@ -26,9 +26,15 @@ index b8aa711..c923c87 100644 -pref("browser.newtab.preload", true); +pref("browser.newtab.preload", false); + // Mozilla Ad Routing Service (MARS) unified ads service + pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", false); + pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false); +-pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "https://ads.mozilla.org/"); ++pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", ""); + // Weather widget for newtab -pref("browser.newtabpage.activity-stream.showWeather", true); +pref("browser.newtabpage.activity-stream.showWeather", false); pref("browser.newtabpage.activity-stream.weather.query", ""); - pref("browser.newtabpage.activity-stream.weather.locationSearchEnabled", false); pref("browser.newtabpage.activity-stream.weather.display", "simple"); + diff --git a/helpers/DATA/firefox/patch_changes/sqlite-ppc.patch b/helpers/DATA/firefox/patch_changes/004_sqlite-ppc.patch similarity index 100% rename from helpers/DATA/firefox/patch_changes/sqlite-ppc.patch rename to helpers/DATA/firefox/patch_changes/004_sqlite-ppc.patch diff --git a/helpers/DATA/firefox/patch_changes/005_apply_custom_urls.patch b/helpers/DATA/firefox/patch_changes/005_apply_custom_urls.patch new file mode 100644 index 0000000..32e1868 --- /dev/null +++ b/helpers/DATA/firefox/patch_changes/005_apply_custom_urls.patch @@ -0,0 +1,51 @@ +diff --git a/browser/components/preferences/privacy.inc.xhtml b/browser/components/preferences/privacy.inc.xhtml +index a9e8501a..02328371 100644 +--- a/browser/components/preferences/privacy.inc.xhtml ++++ b/browser/components/preferences/privacy.inc.xhtml +@@ -21,13 +21,13 @@ + + + +- +- ++ ++ + +