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 new file mode 100644 index 0000000..423c398 --- /dev/null +++ b/helpers/DATA/firefox/patch_changes/disable_sponsored_topsites_and_keep_weather_widget_static.patch @@ -0,0 +1,38 @@ +diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +index a80f361..77dc480 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -1679,25 +1679,25 @@ pref("prompts.defaultModalType", 3); + + pref("browser.topsites.useRemoteSetting", true); + // Fetch sponsored Top Sites from Mozilla Tiles Service (Contile) +-pref("browser.topsites.contile.enabled", true); +-pref("browser.topsites.contile.endpoint", "https://contile.services.mozilla.com/v1/tiles"); ++pref("browser.topsites.contile.enabled", false); ++pref("browser.topsites.contile.endpoint", ""); + + // Whether to enable the Share-of-Voice feature for Sponsored Topsites via Contile. +-pref("browser.topsites.contile.sov.enabled", true); ++pref("browser.topsites.contile.sov.enabled", false); + + // The base URL for the Quick Suggest anonymizing proxy. To make a request to + // the proxy, include a campaign ID in the path. +-pref("browser.partnerlink.attributionURL", "https://topsites.services.mozilla.com/cid/"); +-pref("browser.partnerlink.campaign.topsites", "amzn_2020_a1"); ++pref("browser.partnerlink.attributionURL", ""); ++pref("browser.partnerlink.campaign.topsites", ""); + + // Activates preloading of the new tab url. +-pref("browser.newtab.preload", true); ++pref("browser.newtab.preload", false); + + // 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.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 14f031b..9576d94 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=109 +VERSION=110 EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main' REPOKEY=9BDB3D89CE49EC21 @@ -60,7 +60,7 @@ sed 's/accounts-static.cdn.mozilla.net.*sync.services.mozilla.com//' -i modules/ sed -i '/browser.urlbar.quicksuggest.shouldShowOnboardingDialog/s|true|false|' browser/app/profile/firefox.js sed -i '/services.sync.prefs.sync.browser.firefox-view.feature-tour/s|true|false|' browser/app/profile/firefox.js ##disable firefox-view -sed -i '/"browser.tabs.firefox-view"/s|true|false|' browser/app/profile/firefox.js +##sed -i '/"browser.tabs.firefox-view"/s|true|false|' browser/app/profile/firefox.js #deprecated -v127 ##disable ui tour sed -i '/browser.uitour.enabled/s|true|false|' browser/app/profile/firefox.js ##disable colorways closet @@ -69,6 +69,8 @@ sed -i '/browser.theme.colorway-closet/s|true|false|' browser/app/profile/firefo #grep -rl browser.newtabpage.introShown |xargs -r sed -i '/browser.newtabpage.introShown/s|true|false|' ##Remove mailto handlers. 110 sed -i '/kHandlerList = {/,/^ };/{/^ /d}' uriloader/exthandler/HandlerList.sys.mjs +# keep contectRelevancy disabled (first appearence is false thus using /bin/sed) +/bin/sed -i '/"toolkit.contentRelevancy.ingestEnabled"/s|,.*)|, false)|' browser/app/profile/firefox.js # Replace ubufox recommendation sed 's/xul-ext-ubufox/xul-ext-youtube-html5-video-player/' -i debian/control.in @@ -272,7 +274,7 @@ cp browser/components/search/extensions/ddg browser/components/search/extensions sed 's|/duckduckgo.com/|/html.duckduckgo.com/html/|' -i browser/components/search/extensions/ddg-html/manifest.json sed 's|DuckDuckGo|DuckDuckGo (HTML)|' -i browser/components/search/extensions/ddg-html/manifest.json sed 's|ddg@|ddg-html@|' -i browser/components/search/extensions/ddg-html/manifest.json -patch --no-backup-if-mismatch -p1 < $DATA/rollback_ddg_firefox_partnership_codes.patch +patch_p1 $DATA/rollback_ddg_firefox_partnership_codes.patch # disable ads, disable redirect #sed '/search/s|q=|k1=-1\&kd=-1\&ko=1\&q=|' -i browser/components/search/extensions/ddg/manifest.json @@ -413,7 +415,7 @@ sed '/Provides/s/abrowser-locale/firefox-locale/' -i debian/control.langpacks cat $DATA/settings.js >> debian/vendor-firefox.js # set contentblocking to strict by default -patch --no-backup-if-mismatch -p1 < $DATA/default-strict.patch +patch_p1 $DATA/default-strict.patch #sed '/this._trackSlowStartup/s/$/\n\n if (! Services.prefs.prefHasUserValue("browser.contentblocking.category")) { Services.prefs.setStringPref("browser.contentblocking.category", "strict"); this._updateCBCategory; }/' -i ./browser/components/BrowserGlue.jsm ################# @@ -464,8 +466,7 @@ find l10n/ -name aboutAddons.ftl | xargs -r sed -i '/.placeholder/s|addons.mozil #Fixes by patch on source, see DATA/firefox/patches for more info. for patch in $(ls -v ${DATA}/patch_changes/*.patch) do - echo "Applying $patch" - patch --no-backup-if-mismatch -Np1 < $patch + patch_p1 $patch done # Postinst script to manage profile migration and system links