From 0dd44f3e769e03b1017d22d63ffd889db568f5ff Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 8 Feb 2022 11:50:16 +0200 Subject: libre/iceweasel: 97.0, add missing i686 patch Update according to changes from upstreams. The source of patch for i686 is https://bugzilla.mozilla.org/show_bug.cgi?id=1729459#c21 --- .../iceweasel/9002-FSDG-preference-defaults.patch | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'libre/iceweasel/9002-FSDG-preference-defaults.patch') diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch index 0adb0e06f..246b39331 100644 --- a/libre/iceweasel/9002-FSDG-preference-defaults.patch +++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch @@ -1,4 +1,4 @@ -From 0143513a7ec9760176d83bbab29369026e75d9b3 Mon Sep 17 00:00:00 2001 +From f3f1223d1a9bee16672c6b7ec07dc5816a5ea084 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:09:05 +0300 Subject: [PATCH 1/2] geolocation: Disable API and remove Google API URLs @@ -24,10 +24,10 @@ default for now. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index f9befc42b4..2d8f509a1a 100644 +index a9f8e6318f..81e40f6db4 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -4112,7 +4112,7 @@ +@@ -4884,7 +4884,7 @@ # Is support for Navigator.geolocation enabled? - name: geo.enabled type: bool @@ -37,10 +37,10 @@ index f9befc42b4..2d8f509a1a 100644 # Time, in milliseconds, to wait for the location provider to spin up. diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 6143558398..a393c4afcd 100644 +index fab5c7b41b..9805ea69c9 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3706,7 +3706,7 @@ pref("network.psl.onUpdate_notify", false); +@@ -3720,7 +3720,7 @@ pref("network.psl.onUpdate_notify", false); // All the Geolocation preferences are here. // #ifndef EARLY_BETA_OR_EARLIER @@ -50,10 +50,10 @@ index 6143558398..a393c4afcd 100644 // Use MLS on Nightly and early Beta. pref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); -- -2.31.1 +2.35.1 -From 3442b524f614edad5461ceaa44a5c8640815765a Mon Sep 17 00:00:00 2001 +From bff69763d7833a187d663a443cca20f5bdd83acf Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:49:05 +0300 Subject: [PATCH 2/2] Disable banners and remove URLs for mobile apps on @@ -64,16 +64,21 @@ Subject: [PATCH 2/2] Disable banners and remove URLs for mobile apps on 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index ef44a16daa..2feabdc67f 100644 +index 6bbc26eb86..8ea3186824 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1756,15 +1756,15 @@ pref("browser.contentblocking.report.monitor.enabled", true); +@@ -1877,7 +1877,7 @@ pref("browser.contentblocking.report.monitor.enabled", true); pref("browser.contentblocking.report.proxy.enabled", false); // Disable the mobile promotion by default. -pref("browser.contentblocking.report.show_mobile_app", true); +pref("browser.contentblocking.report.show_mobile_app", false); + // Avoid advertising in certain regions. Comma separated string of two letter ISO 3166-1 country codes. + // We're currently blocking all of Ukraine (ua), but would prefer to block just Crimea (ua-43). Currently, the Mozilla Location Service APIs used by Region.jsm only exposes the country, not the subdivision. +@@ -1887,12 +1887,12 @@ pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,t + pref("browser.vpn_promo.enabled", true); + // Enable the vpn card by default. -pref("browser.contentblocking.report.vpn.enabled", true); +pref("browser.contentblocking.report.vpn.enabled", false); @@ -86,7 +91,7 @@ index ef44a16daa..2feabdc67f 100644 pref("browser.contentblocking.report.vpn_sub_id", "sub_HrfCZF7VPHzZkA"); pref("browser.contentblocking.report.monitor.url", "https://monitor.firefox.com/?entrypoint=protection_report_monitor&utm_source=about-protections"); -@@ -1775,12 +1775,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi +@@ -1903,12 +1903,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi pref("browser.contentblocking.report.manage_devices.url", "https://accounts.firefox.com/settings/clients"); pref("browser.contentblocking.report.endpoint_url", "https://monitor.firefox.com/user/breach-stats?includeResolved=true"); pref("browser.contentblocking.report.proxy_extension.url", "https://fpn.firefox.com/browser?utm_source=firefox-desktop&utm_medium=referral&utm_campaign=about-protections&utm_content=about-protections"); @@ -106,5 +111,5 @@ index ef44a16daa..2feabdc67f 100644 // Protection Report's SUMO urls pref("browser.contentblocking.report.lockwise.how_it_works.url", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/password-manager-report"); -- -2.31.1 +2.35.1 -- cgit v1.2.3