From 002fb3ef5c3f389c2b396b684106419a20ab710a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Thu, 11 Jul 2024 05:45:41 +0000 Subject: [PATCH] firefox: update strict patch for v128 --- helpers/DATA/firefox/default-strict.patch | 15 ++++++++------- ..._topsites_and_keep_weather_widget_static.patch | 8 ++------ helpers/make-firefox | 5 ++++- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/helpers/DATA/firefox/default-strict.patch b/helpers/DATA/firefox/default-strict.patch index 393ea60..488f472 100644 --- a/helpers/DATA/firefox/default-strict.patch +++ b/helpers/DATA/firefox/default-strict.patch @@ -1,7 +1,8 @@ -diff -ru firefox-110.0+build1/browser/components/BrowserGlue.sys.mjs firefox-110.0+build1/browser/components/BrowserGlue.sys.mjs_fix ---- firefox-110.0+build1/browser/components/BrowserGlue.sys.mjs 2023-02-07 01:52:32.000000000 -0600 -+++ firefox-110.0+build1/browser/components/BrowserGlue.sys.mjs_fix 2023-02-07 14:52:59.465762604 -0600 -@@ -1637,6 +1637,19 @@ +diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs +index 8fa6f7a..a34ab8b 100644 +--- a/browser/components/BrowserGlue.sys.mjs ++++ b/browser/components/BrowserGlue.sys.mjs +@@ -1860,6 +1860,19 @@ BrowserGlue.prototype = { } }); @@ -18,6 +19,6 @@ diff -ru firefox-110.0+build1/browser/components/BrowserGlue.sys.mjs firefox-110 + Services.prefs.setStringPref("browser.contentblocking.category", "strict"); this._updateCBCategory; + } + - // Offer to reset a user's profile if it hasn't been used for 60 days. - const OFFER_PROFILE_RESET_INTERVAL_MS = 60 * 24 * 60 * 60 * 1000; - let lastUse = Services.appinfo.replacedLockTime; + this._maybeOfferProfileReset(); + + this._checkForOldBuildUpdates(); diff --git a/helpers/DATA/firefox/patch_changes/disable_sponsored_topsites_and_keep_weather_widget_static.patch b/helpers/DATA/firefox/patch_changes/disable_sponsored_topsites_and_keep_weather_widget_static.patch index 423c398..e68b1a7 100644 --- a/helpers/DATA/firefox/patch_changes/disable_sponsored_topsites_and_keep_weather_widget_static.patch +++ b/helpers/DATA/firefox/patch_changes/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 a80f361..77dc480 100644 +index b8aa711..c923c87 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1679,25 +1679,25 @@ pref("prompts.defaultModalType", 3); +@@ -1698,22 +1698,22 @@ pref("browser.topsites.component.enabled", false); pref("browser.topsites.useRemoteSetting", true); // Fetch sponsored Top Sites from Mozilla Tiles Service (Contile) @@ -31,8 +31,4 @@ index a80f361..77dc480 100644 +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.temperatureUnits", "f"); -+pref("browser.newtabpage.activity-stream.weather.temperatureUnits", "c"); pref("browser.newtabpage.activity-stream.weather.display", "simple"); - // List of regions that get weather by default. - pref("browser.newtabpage.activity-stream.discoverystream.region-weather-config", ""); diff --git a/helpers/make-firefox b/helpers/make-firefox index 9576d94..c6297fe 100644 --- a/helpers/make-firefox +++ b/helpers/make-firefox @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=110 +VERSION=111 EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main' REPOKEY=9BDB3D89CE49EC21 @@ -75,6 +75,9 @@ sed -i '/kHandlerList = {/,/^ };/{/^ /d}' uriloader/exthandler/HandlerList.sys. # Replace ubufox recommendation sed 's/xul-ext-ubufox/xul-ext-youtube-html5-video-player/' -i debian/control.in +# Temporary ppc64el fix dependency for v128 +sed -i "/libffi-dev/a \\\tlibaom-dev [ppc64el]," debian/control.in + #Remove exceptions on warnings when installing addons. sed -i '/addons.mozilla.org/d' browser/app/permissions