diff --git a/helpers/DATA/firefox/branding/content/about-wordmark.svg b/helpers/DATA/firefox/branding/content/about-wordmark.svg
index 831bc2e..64f0cdb 100644
--- a/helpers/DATA/firefox/branding/content/about-wordmark.svg
+++ b/helpers/DATA/firefox/branding/content/about-wordmark.svg
@@ -1,12 +1,5 @@
\ No newline at end of file
+ inkscape:version="1.2 (1:1.2+202205241504+da316b6974)"
+ sodipodi:docname="about-wordmark.svg"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/">image/svg+xml
+
diff --git a/helpers/DATA/firefox/branding/content/firefox-wordmark.svg b/helpers/DATA/firefox/branding/content/firefox-wordmark.svg
index 21eb0ed..3de7bbd 100644
--- a/helpers/DATA/firefox/branding/content/firefox-wordmark.svg
+++ b/helpers/DATA/firefox/branding/content/firefox-wordmark.svg
@@ -1,12 +1,5 @@
diff --git a/helpers/DATA/firefox/newtab/hnode.ico b/helpers/DATA/firefox/newtab/hnode.ico
new file mode 100644
index 0000000..1adece3
Binary files /dev/null and b/helpers/DATA/firefox/newtab/hnode.ico differ
diff --git a/helpers/DATA/firefox/newtab/hnode.png b/helpers/DATA/firefox/newtab/hnode.png
new file mode 100644
index 0000000..181f921
Binary files /dev/null and b/helpers/DATA/firefox/newtab/hnode.png differ
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
new file mode 100644
index 0000000..7a9eb21
--- /dev/null
+++ b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
@@ -0,0 +1,699 @@
+
+Based on https://git.parabola.nu/abslibre.git/diff/libre/iceweasel/9004-FSDG-misc.patch?id=0947239827274ca70e91a8da93219846bdad401a
+- Remove 'More from Mozilla' section in Preferences
+- Remove promos of Firefox Focus and Klar from Private Browsing
+
+diff -Nru source_orig/browser/app/profile/firefox.js source/browser/app/profile/firefox.js
+--- source_orig/browser/app/profile/firefox.js 2022-05-22 09:35:55.500675021 +0000
++++ source/browser/app/profile/firefox.js 2022-05-22 21:54:34.961904349 +0000
+@@ -1007,11 +1007,11 @@
+ // Toggling Search bar on and off in about:preferences
+ pref("browser.preferences.search", true);
+ #if defined(NIGHTLY_BUILD)
+-pref("browser.preferences.experimental", true);
++pref("browser.preferences.experimental", false);
+ #else
+ pref("browser.preferences.experimental", false);
+ #endif
+-pref("browser.preferences.moreFromMozilla", true);
++pref("browser.preferences.moreFromMozilla", false);
+ pref("browser.preferences.experimental.hidden", false);
+ pref("browser.preferences.defaultPerformanceSettings.enabled", true);
+
+@@ -1907,7 +1907,7 @@
+ pref("browser.promo.focus.disallowed_regions", "cn");
+
+ // Default to enabling focus promos to be shown where allowed.
+-pref("browser.promo.focus.enabled", true);
++pref("browser.promo.focus.enabled", false);
+
+ // Comma separated string of mozilla vpn supported platforms.
+ pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux");
+diff -Nru source_orig/browser/base/content/test/static/browser_all_files_referenced.js source/browser/base/content/test/static/browser_all_files_referenced.js
+--- source_orig/browser/base/content/test/static/browser_all_files_referenced.js 2022-05-22 09:35:55.336673325 +0000
++++ source/browser/base/content/test/static/browser_all_files_referenced.js 2022-05-22 21:50:33.783348501 +0000
+@@ -32,9 +32,6 @@
+ "chrome://activity-stream/content/data/content/assets/remote/",
+ "chrome://browser/content/assets/moz-vpn.svg",
+ "chrome://browser/content/assets/vpn-logo.svg",
+- "chrome://browser/content/assets/focus-promo.png",
+- "chrome://browser/content/preferences/more-from-mozilla-qr-code-advanced.svg",
+- "chrome://browser/content/assets/klar-qr-code.svg",
+
+ // These app marketplace icons are referenced based on the user's locale
+ // in browser/components/newtab/content-src/aboutwelcome/components/MobileDownloads.jsx
+@@ -136,17 +133,6 @@
+ // extensions/pref/autoconfig/src/nsReadConfig.cpp
+ { file: "resource://gre/defaults/autoconfig/prefcalls.js" },
+
+- // browser/components/preferences/moreFromMozilla.js
+- // These files URLs are constructed programatically at run time.
+- {
+- file:
+- "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg",
+- },
+- {
+- file:
+- "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg",
+- },
+-
+ { 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-05-22 09:35:55.448674482 +0000
++++ source/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-05-22 21:37:23.090968112 +0000
+@@ -96,221 +96,6 @@
+ },
+ },
+ {
+- id: "PB_NEWTAB_FOCUS_PROMO",
+- 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",
+- metrics: "block",
+- backdrop: "transparent",
+- screens: [
+- {
+- id: "DEFAULT_MODAL_UI",
+- order: 0,
+- 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/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
+- where: "tabshifted",
+- },
+- type: "OPEN_URL",
+- navigate: true,
+- },
+- },
+- android: {
+- action: {
+- data: {
+- args:
+- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
+- where: "tabshifted",
+- },
+- type: "OPEN_URL",
+- navigate: true,
+- },
+- },
+- tiles: {
+- type: "mobile_downloads",
+- data: {
+- QR_code: {
+- image_url:
+- "chrome://browser/content/assets/focus-qr-code.svg",
+- alt_text: {
+- string_id: "spotlight-focus-promo-qr-code",
+- },
+- image_overrides: {
+- de:
+- "chrome://browser/content/assets/klar-qr-code.svg",
+- },
+- },
+- marketplace_buttons: ["ios", "android"],
+- },
+- },
+- },
+- },
+- ],
+- },
+- },
+- },
+- },
+- },
+- priority: 2,
+- frequency: {
+- custom: [
+- {
+- cap: 1,
+- period: 604800000, // Max 1 per week
+- },
+- ],
+- lifetime: 3,
+- },
+- targeting: "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en')",
+- },
+- {
+- id: "PB_NEWTAB_KLAR_PROMO",
+- 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: "Download Firefox Klar",
+- promoLinkType: "button",
+- promoSectionStyle: "below-search",
+- promoTitle:
+- "Firefox Klar clears your history every time while blocking ads and trackers.",
+- promoTitleEnabled: true,
+- promoButton: {
+- action: {
+- type: "SHOW_SPOTLIGHT",
+- data: {
+- content: {
+- id: "KLAR_PROMO",
+- template: "multistage",
+- modal: "tab",
+- metrics: "block",
+- backdrop: "transparent",
+- screens: [
+- {
+- id: "DEFAULT_MODAL_UI",
+- order: 0,
+- content: {
+- logo: {
+- imageURL:
+- "chrome://browser/content/assets/focus-logo.svg",
+- height: "48px",
+- },
+- title: "Get Firefox Klar",
+- 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: 1,
+- period: 604800000, // Max 1 per week
+- },
+- ],
+- lifetime: 3,
+- },
+- targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'",
+- },
+- {
+ 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 @@
+ trigger: { id: "defaultBrowserCheck" },
+ },
+ {
+- id: "PB_FOCUS_PROMO",
+- groups: ["panel-test-provider"],
+- template: "spotlight",
+- content: {
+- template: "multistage",
+- backdrop: "transparent",
+- screens: [
+- {
+- id: "PBM_FIREFOX_FOCUS",
+- order: 0,
+- 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/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
+- where: "tabshifted",
+- },
+- type: "OPEN_URL",
+- navigate: true,
+- },
+- },
+- android: {
+- action: {
+- data: {
+- args:
+- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
+- where: "tabshifted",
+- },
+- type: "OPEN_URL",
+- navigate: true,
+- },
+- },
+- email_link: {
+- action: {
+- data: {
+- args: "https://mozilla.org",
+- where: "tabshifted",
+- },
+- type: "OPEN_URL",
+- navigate: true,
+- },
+- },
+- tiles: {
+- type: "mobile_downloads",
+- data: {
+- QR_code: {
+- image_url:
+- "chrome://browser/content/assets/focus-qr-code.svg",
+- 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",
+- },
+- marketplace_buttons: ["ios", "android"],
+- },
+- },
+- },
+- },
+- ],
+- },
+- trigger: { id: "defaultBrowserCheck" },
+- },
+- {
+ id: "PB_NEWTAB_VPN_PROMO",
+ template: "pb_newtab",
+ content: {
+diff -Nru source_orig/browser/components/preferences/jar.mn source/browser/components/preferences/jar.mn
+--- source_orig/browser/components/preferences/jar.mn 2022-05-22 09:35:55.400673986 +0000
++++ source/browser/components/preferences/jar.mn 2022-05-22 21:45:51.512354083 +0000
+@@ -18,8 +18,5 @@
+ content/browser/preferences/fxaPairDevice.xhtml
+ content/browser/preferences/fxaPairDevice.js
+ content/browser/preferences/findInPage.js
+- content/browser/preferences/more-from-mozilla-qr-code-simple.svg
+- content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg
+- content/browser/preferences/more-from-mozilla-qr-code-advanced.svg
+ content/browser/preferences/web-appearance-dark.svg
+ content/browser/preferences/web-appearance-light.svg
+diff -Nru source_orig/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg source/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg
+--- source_orig/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg 2022-05-22 09:35:55.404674027 +0000
++++ source/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg 1970-01-01 00:00:00.000000000 +0000
+@@ -1,4 +0,0 @@
+-
+-
+\ No newline at end of file
+diff -Nru source_orig/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg source/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg
+--- source_orig/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg 2022-05-22 09:35:55.400673986 +0000
++++ source/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg 1970-01-01 00:00:00.000000000 +0000
+@@ -1,4 +0,0 @@
+-
+-
+diff -Nru source_orig/browser/components/preferences/more-from-mozilla-qr-code-simple.svg source/browser/components/preferences/more-from-mozilla-qr-code-simple.svg
+--- source_orig/browser/components/preferences/more-from-mozilla-qr-code-simple.svg 2022-05-22 09:35:55.404674027 +0000
++++ source/browser/components/preferences/more-from-mozilla-qr-code-simple.svg 1970-01-01 00:00:00.000000000 +0000
+@@ -1,4 +0,0 @@
+-
+-
+\ No newline at end of file
+diff -Nru source_orig/browser/components/preferences/moreFromMozilla.js source/browser/components/preferences/moreFromMozilla.js
+--- source_orig/browser/components/preferences/moreFromMozilla.js 2022-05-22 09:35:55.404674027 +0000
++++ source/browser/components/preferences/moreFromMozilla.js 2022-05-22 21:42:46.814391896 +0000
+@@ -81,38 +81,7 @@
+ },
+
+ renderProducts() {
+- let products = [
+- {
+- id: "firefox-mobile",
+- title_string_id: "more-from-moz-firefox-mobile-title",
+- description_string_id: "more-from-moz-firefox-mobile-description",
+- region: "global",
+- button: {
+- id: "fxMobile",
+- type: "link",
+- label_string_id: "more-from-moz-learn-more-link",
+- actionURL: AppConstants.isChinaRepack()
+- ? "https://www.firefox.com.cn/browsers/mobile/"
+- : "https://www.mozilla.org/firefox/browsers/mobile/",
+- },
+- qrcode: {
+- title: {
+- string_id: "more-from-moz-qr-code-box-firefox-mobile-title",
+- },
+- image_src_prefix:
+- "chrome://browser/content/preferences/more-from-mozilla-qr-code",
+- button: {
+- id: "qr-code-send-email",
+- label: {
+- string_id: "more-from-moz-qr-code-box-firefox-mobile-button",
+- },
+- actionURL: AppConstants.isChinaRepack()
+- ? "https://www.firefox.com.cn/mobile/get-app/"
+- : "https://www.mozilla.org/firefox/mobile/get-app/?v=mfm",
+- },
+- },
+- },
+- ];
++ let products = [];
+
+ if (BrowserUtils.shouldShowVPNPromo()) {
+ const vpn = {
+diff -Nru source_orig/browser/components/privatebrowsing/content/assets/focus-qr-code.svg source/browser/components/privatebrowsing/content/assets/focus-qr-code.svg
+--- source_orig/browser/components/privatebrowsing/content/assets/focus-qr-code.svg 2022-05-22 09:35:55.412674110 +0000
++++ source/browser/components/privatebrowsing/content/assets/focus-qr-code.svg 1970-01-01 00:00:00.000000000 +0000
+@@ -1,114 +0,0 @@
+-
+-
+diff -Nru source_orig/browser/components/privatebrowsing/content/assets/klar-qr-code.svg source/browser/components/privatebrowsing/content/assets/klar-qr-code.svg
+--- source_orig/browser/components/privatebrowsing/content/assets/klar-qr-code.svg 2022-05-22 09:35:55.412674110 +0000
++++ source/browser/components/privatebrowsing/content/assets/klar-qr-code.svg 1970-01-01 00:00:00.000000000 +0000
+@@ -1,114 +0,0 @@
+-
+-
+
diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js
index b1a3a9c..8f52787 100644
--- a/helpers/DATA/firefox/settings.js
+++ b/helpers/DATA/firefox/settings.js
@@ -232,7 +232,7 @@ pref("browser.onboarding.updatetour", "performance,library,singlesearch,customiz
pref("browser.onboarding.enabled", false);
// New tab settings
-pref("browser.newtabpage.activity-stream.default.sites", "https://trisquel.info/,https://www.gnu.org/,https://www.fsf.org/,https://directory.fsf.org,https://libreplanet.org/,https://fsfe.org,https://www.wikipedia.org/wiki/,https://www.wikinews.org/wiki/");
+pref("browser.newtabpage.activity-stream.default.sites", "https://trisquel.info/,https://www.gnu.org/,https://www.fsf.org/,https://directory.fsf.org,https://libreplanet.org/,https://fsfe.org,https://www.wikipedia.org/wiki/,https://www.h-node.org/");
pref("browser.newtabpage.activity-stream.showTopSites",true);
pref("browser.newtabpage.activity-stream.feeds.section.topstories",false);
pref("browser.newtabpage.activity-stream.feeds.snippets",false);
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 6eb53df..9dfb926 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -18,7 +18,9 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=87
+VERSION=89
+EXTERNAL='deb-src https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
+REPOKEY=9BDB3D89CE49EC21
. ./config
@@ -76,9 +78,13 @@ sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in
# Disable DRM support, armhf has no such option.
## Add other archs that might present the same lack of disable-eme option
cat << ARCH >> debian/config/mozconfig.in
+%%if DEB_HOST_ARCH != ppc64el
+%%if DEB_HOST_ARCH != arm64
%%if DEB_HOST_ARCH != armhf
ac_add_options --disable-eme
%%endif
+%%endif
+%%endif
ARCH
sed '/gmp-clearkey/d' -i ./debian/firefox.install.in
@@ -134,13 +140,14 @@ cat << EOF >> browser/components/newtab/data/content/tippytop/top_sites.json
"favicon_url": "favicons/wikipedia.ico"
},
{
- "domains": ["wikinews.org"],
- "image_url": "images/wikinews.png",
- "favicon_url": "favicons/wikinews.ico"
+ "domains": ["h-node.org"],
+ "image_url": "images/hnode.png",
+ "favicon_url": "favicons/hnode.ico"
}
]
EOF
+#uuidgen --sha1 --namespace @dns --name "trisquel.info"
cat << TOP_JSON > services/settings/dumps/main/top-sites.json
{
"data": [
@@ -148,49 +155,49 @@ cat << TOP_JSON > services/settings/dumps/main/top-sites.json
"url": "https://trisquel.info/",
"order": 0,
"title": "Trisquel",
- "id": "17aeb24c-da88-53bc-8915-c3e3d458070d",
+ "id": "ec7f4843-6be5-5e86-870a-1c8383500a4b",
"last_modified": $(date +%s%N | cut -b1-13)
},
{
"url": "https://www.gnu.org/",
"order": 1,
"title": "GNU",
- "id": "2a833806-e5c1-58e9-8b7c-69d9417a1253",
+ "id": "1baee931-751c-5993-b6fe-d86fbf78f9b0",
"last_modified": $(date +%s%N | cut -b1-13)
},
{
"url": "https://www.fsf.org/",
"order": 2,
"title": "FSF",
- "id": "d4e3e7e2-64d3-5bac-9c59-3c5c8e1efd8c",
+ "id": "fcc60dd8-4d97-5aca-8e5d-784652c75818",
"last_modified": $(date +%s%N | cut -b1-13)
},
{
"url": "https://directory.fsf.org/",
"order": 3,
"title": "FSF Directory",
- "id": "dbff6206-2ada-57ad-8091-8a62ac37be4c",
+ "id": "abe5bfb2-9487-5697-9f27-e0b782dfe006",
"last_modified": $(date +%s%N | cut -b1-13)
},
{
"url": "https://libreplanet.org/",
"order": 4,
"title": "LibrePlanet",
- "id": "6f586839-4063-58b8-95ed-62e034e1915e",
+ "id": "e3d2cf88-a4dc-5d2e-9f9a-f3ea241d17d8",
"last_modified": $(date +%s%N | cut -b1-13)
},
{
"url": "https://www.wikipedia.org/",
"order": 5,
"title": "Wikipedia",
- "id": "5a18acd7-0440-5512-b3a4-20a35bdc9a1d",
+ "id": "02c295f5-54a8-5d29-8d1f-b619216b20c0",
"last_modified": $(date +%s%N | cut -b1-13)
},
{
- "url": "https://www.wikinews.org/",
+ "url": "https://h-node.org/",
"order": 6,
- "title": "Wikinews",
- "id": "3bb633ba-0823-4501-b3b5-bc1b8670e3e1",
+ "title": "h-node",
+ "id": "c426481f-8c3f-53b8-b23a-431a91a1c7b4",
"last_modified": $(date +%s%N | cut -b1-13)
}
]
@@ -368,6 +375,10 @@ cp $DATA/android/mobile.ico mobile/android/app/
#cp $DATA/android/images/* mobile/android/themes/core/images/
cp -a $DATA/android/res/main/* mobile/android/geckoview/src/main/res
+#Fixes by patch on source.
+##Firefox v100, based on parabola 9004-FSDG-misc.patch
+patch -p1 < $DATA/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
+
# Postinst script to manage profile migration and system links
echo '