diff --git a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch index 1d8fa5234930e9fa3d2c3eca488857608c0656cd..8abbc5970197f3ef04cb70064fc7e7609243b54f 100644 --- a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch +++ b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch @@ -376,14 +376,6 @@ diff -Nru a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browse { id: "PB_NEWTAB_INFO_SECTION", template: "pb_newtab", -@@ -1000,7 +699,6 @@ const BASE_MESSAGES = () => [ - icon: "chrome://browser/skin/controlcenter/3rdpartycookies.svg", - icon_class: "cfr-doorhanger-small-icon", - persistent_doorhanger: true, -- show_in_private_browsing: true, - heading_text: { - string_id: "cfr-cbh-header", - }, diff --git a/browser/components/newtab/lib/PanelTestProvider.sys.mjs b/browser/components/newtab/lib/PanelTestProvider.sys.mjs index b5ff592..22cdf39 100644 --- a/browser/components/newtab/lib/PanelTestProvider.sys.mjs 2022-10-16 05:35:50.835203327 -0500 diff --git a/helpers/DATA/firefox/process-json-files.py b/helpers/DATA/firefox/process-json-files.py index 9b436c0d0b99e931ecba431234977664da22d522..897bcfb93d76c13852ede4363d2202f54691d501 100644 --- a/helpers/DATA/firefox/process-json-files.py +++ b/helpers/DATA/firefox/process-json-files.py @@ -132,7 +132,7 @@ class Changes(RemoteSettings): changes = [] for collection in unwrapped_jsons: - if collection.path != RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json': + if collection.path not in (RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json', RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/search-config-v2.json'): latest_change = {} latest_change[cls._LAST_MODIFIED_KEY_NAME] = cls.get_collection_timestamp( collection) diff --git a/helpers/make-firefox b/helpers/make-firefox index a9762ea2be01f51a7bf7ecf300a82cfbacffb65d..bfc56249c690e46cf6bbcb1eee27e3a56c0224c6 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=106 +VERSION=107 EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main' REPOKEY=9BDB3D89CE49EC21 @@ -113,10 +113,12 @@ grep -rl services.sync.telemetry.maxPayloadCount modules/ | xargs -r sed -i '/se grep -rl services.sync.telemetry.submissionInterval modules/ | xargs -r sed -i '/services.sync.telemetry.submissionInterval/s|43200|-1|' echo 'pref("dom.security.unexpected_system_load_telemetry_enabled", false);' | tee -a browser/app/profile/firefox.js echo 'pref("toolkit.telemetry.hybridContent.enabled", false);' | tee -a browser/app/profile/firefox.js -sed_csum 136caf71560969cd404b51471cceca748bc9093bf8631d130670e163cdf1a1d1 2fac7950f86be998f5d10a1244c5b1760dcd37072d20cc0097dda497d8781f3d +sed_csum 186b9d92e48f2f34f1ea51023ad83c9d7abec97bcb0b862641bcb79a93c97d9e \ + d4f87d174da21573a610f6cd206a910ad5204b65459405159269293f99f2cff5 -# Remove Google API key +# Remove Google API key and calls sed '/Google API/,/google-api-keyfile/ d' debian/config/mozconfig.in -i +sed '/"geo.provider.network.url"/s|https.*"|"|' -i modules/libpref/init/all.js # Org branding sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in