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 e43c482..e9cd63a 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 @@ -59,10 +59,10 @@ diff -Nru source_orig/browser/base/content/test/static/browser_all_files_referen { file: "resource://gre/greprefs.js" }, // layout/mathml/nsMathMLChar.cpp -diff -Nru source_orig/browser/components/newtab/lib/OnboardingMessageProvider.jsm source/browser/components/newtab/lib/OnboardingMessageProvider.jsm ---- source_orig/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-06-08 17:44:48.000000000 -0500 -+++ source/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-06-13 23:03:00.516557944 -0500 -@@ -96,220 +96,6 @@ +diff -Nru source/browser/components/newtab/lib/OnboardingMessageProvider.jsm source/browser/components/newtab/lib/OnboardingMessageProvider.jsm_fix +--- source/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-10-16 05:35:50.783203285 -0500 ++++ source/browser/components/newtab/lib/OnboardingMessageProvider.jsm_fix 2022-10-16 06:20:07.235345215 -0500 +@@ -649,321 +649,6 @@ }, }, { @@ -146,10 +146,6 @@ diff -Nru source_orig/browser/components/newtab/lib/OnboardingMessageProvider.js - alt_text: { - string_id: "spotlight-focus-promo-qr-code", - }, -- image_overrides: { -- de: -- "chrome://browser/content/assets/klar-qr-code.svg", -- }, - }, - marketplace_buttons: ["ios", "android"], - }, @@ -172,7 +168,9 @@ diff -Nru source_orig/browser/components/newtab/lib/OnboardingMessageProvider.js - ], - lifetime: 12, - }, -- targeting: "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en')", +- // Exclude the next 2 messages: 1) Klar for en 2) Klar for de +- targeting: +- "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en') && localeLanguageCode != 'de'", - }, - { - id: "PB_NEWTAB_KLAR_PROMO", @@ -252,9 +250,7 @@ diff -Nru source_orig/browser/components/newtab/lib/OnboardingMessageProvider.js - QR_code: { - image_url: - "chrome://browser/content/assets/klar-qr-code.svg", -- alt_text: { -- string_id: "spotlight-focus-promo-qr-code", -- }, +- alt_text: "Scan the QR code to get Firefox Klar", - }, - marketplace_buttons: ["ios", "android"], - }, @@ -279,14 +275,119 @@ diff -Nru source_orig/browser/components/newtab/lib/OnboardingMessageProvider.js - }, - targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'", - }, +- { +- id: "PB_NEWTAB_KLAR_PROMO_DE", +- type: "default", +- template: "pb_newtab", +- groups: ["pbNewtab"], +- content: { +- infoBody: "fluent:about-private-browsing-info-description-simplified", +- infoEnabled: true, +- infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg", +- infoLinkText: "fluent:about-private-browsing-learn-more-link", +- infoTitle: "", +- infoTitleEnabled: false, +- promoEnabled: true, +- promoType: "FOCUS", +- promoHeader: "fluent:about-private-browsing-focus-promo-header-c", +- promoImageLarge: "chrome://browser/content/assets/focus-promo.png", +- promoLinkText: "fluent:about-private-browsing-focus-promo-cta", +- promoLinkType: "button", +- promoSectionStyle: "below-search", +- promoTitle: "fluent:about-private-browsing-focus-promo-text-c", +- promoTitleEnabled: true, +- promoButton: { +- action: { +- type: "SHOW_SPOTLIGHT", +- data: { +- content: { +- id: "FOCUS_PROMO", +- template: "multistage", +- modal: "tab", +- backdrop: "transparent", +- screens: [ +- { +- id: "DEFAULT_MODAL_UI", +- content: { +- logo: { +- imageURL: +- "chrome://browser/content/assets/focus-logo.svg", +- height: "48px", +- }, +- title: { +- string_id: "spotlight-focus-promo-title", +- }, +- subtitle: { +- string_id: "spotlight-focus-promo-subtitle", +- }, +- dismiss_button: { +- action: { +- navigate: true, +- }, +- }, +- ios: { +- action: { +- data: { +- args: +- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- android: { +- action: { +- data: { +- args: +- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- tiles: { +- type: "mobile_downloads", +- data: { +- QR_code: { +- image_url: +- "chrome://browser/content/assets/klar-qr-code.svg", +- alt_text: { +- string_id: "spotlight-focus-promo-qr-code", +- }, +- }, +- marketplace_buttons: ["ios", "android"], +- }, +- }, +- }, +- }, +- ], +- }, +- }, +- }, +- }, +- }, +- priority: 2, +- frequency: { +- custom: [ +- { +- cap: 3, +- period: 604800000, // Max 3 per week +- }, +- ], +- lifetime: 12, +- }, +- targeting: "localeLanguageCode == 'de'", +- }, - { id: "PB_NEWTAB_INFO_SECTION", template: "pb_newtab", content: { -diff -Nru source_orig/browser/components/newtab/lib/PanelTestProvider.jsm source/browser/components/newtab/lib/PanelTestProvider.jsm ---- source_orig/browser/components/newtab/lib/PanelTestProvider.jsm 2022-05-22 09:35:55.444674441 +0000 -+++ source/browser/components/newtab/lib/PanelTestProvider.jsm 2022-05-22 21:35:39.005867556 +0000 -@@ -559,90 +559,6 @@ +diff -Nru source/browser/components/newtab/lib/PanelTestProvider.jsm source/browser/components/newtab/lib/PanelTestProvider.jsm_fix +--- source/browser/components/newtab/lib/PanelTestProvider.jsm 2022-10-16 05:35:50.835203327 -0500 ++++ source/browser/components/newtab/lib/PanelTestProvider.jsm_fix 2022-10-16 06:24:48.095827505 -0500 +@@ -557,87 +557,6 @@ trigger: { id: "defaultBrowserCheck" }, }, { @@ -357,9 +458,6 @@ diff -Nru source_orig/browser/components/newtab/lib/PanelTestProvider.jsm source - alt_text: { - string_id: "spotlight-focus-promo-qr-code", - }, -- image_overrides: { -- de: "chrome://browser/content/assets/klar-qr-code.svg", -- }, - }, - email: { - link_text: "Email yourself a link", diff --git a/helpers/make-firefox b/helpers/make-firefox index 7e49dc4..b383609 100644 --- a/helpers/make-firefox +++ b/helpers/make-firefox @@ -20,7 +20,7 @@ # VERSION=92 -EXTERNAL='deb-src https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main' +EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main' REPOKEY=9BDB3D89CE49EC21 . ./config @@ -328,20 +328,20 @@ echo ".discopane-notice, .privacy-policy-link, #main header, #plugindeprecation- echo ".warning{display: none!important; } .addon[notification=warning]{background-image: none!important;}" >> toolkit/mozapps/extensions/content/extensions.css # Hide extra links in about box +# about: page mods, like rights. +## Hide extra links in about box find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing do find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = /" done -#Remove invalid policy for trisquel. +##Remove invalid policy for trisquel. find -name aboutRights.ftl | xargs sed -i '/rights-intro-point-5/,$d' -delete_point() { -sed -i "/$1/d" "$(find -name $2)" -} -delete_point rights-intro-point-5 aboutRights.xhtml -delete_point rights-intro-point-6 aboutRights.xhtml -delete_point rights-intro-point-5 aboutRights-unbranded.xhtml +find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-5/d" +find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/d" +find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/d" +#EO about: mods. sed -i 's/Mozilla\ Project<\/a>/Trisquel\ Project<\/a>/g' browser/base/content/overrides/app-license.html