From 426ad2f613372e64a2566211de888a784854fa3f Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sat, 2 Jul 2022 18:20:16 -0400 Subject: [icecat]: upgrade to v91.11.0 --- ...e-remoting-name-for-GDK-application-names.patch | 7 +- libre/icecat/9003-FSDG-urihandlers.patch | 240 +++++ libre/icecat/9003-misc-libre.patch | 62 -- libre/icecat/9004-FSDG-misc.patch | 1095 ++++++++++++++++++++ libre/icecat/PKGBUILD | 323 +++--- libre/icecat/arm.patch | 15 + libre/icecat/avoid-libxul-OOM-python-check.patch | 30 + libre/icecat/build-arm-libopus.patch | 12 + ...-disable-network-test-on-static-libraries.patch | 13 +- libre/icecat/rust_1.48.patch.gz | Bin 38741 -> 0 bytes libre/icecat/searchplugins_list.json | 69 -- 11 files changed, 1578 insertions(+), 288 deletions(-) create mode 100644 libre/icecat/9003-FSDG-urihandlers.patch delete mode 100644 libre/icecat/9003-misc-libre.patch create mode 100644 libre/icecat/9004-FSDG-misc.patch create mode 100644 libre/icecat/arm.patch create mode 100644 libre/icecat/avoid-libxul-OOM-python-check.patch create mode 100644 libre/icecat/build-arm-libopus.patch delete mode 100644 libre/icecat/rust_1.48.patch.gz delete mode 100644 libre/icecat/searchplugins_list.json diff --git a/libre/icecat/0001-Use-remoting-name-for-GDK-application-names.patch b/libre/icecat/0001-Use-remoting-name-for-GDK-application-names.patch index b1dcee50f..f313d7d95 100644 --- a/libre/icecat/0001-Use-remoting-name-for-GDK-application-names.patch +++ b/libre/icecat/0001-Use-remoting-name-for-GDK-application-names.patch @@ -12,7 +12,7 @@ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 49e2c73986ab..43ebcac381c7 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3822,11 +3822,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { +@@ -4262,11 +4262,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { // consistently. // Set program name to the one defined in application.ini. @@ -29,15 +29,16 @@ diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp index cfe022e65d82..06325264dbb1 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp -@@ -24,6 +24,7 @@ +@@ -24,6 +24,8 @@ # include "WakeLockListener.h" #endif #include "gfxPlatform.h" +#include "nsAppRunner.h" ++#include "mozilla/XREAppData.h" #include "ScreenHelperGTK.h" #include "HeadlessScreenHelper.h" #include "mozilla/widget/ScreenManager.h" -@@ -159,13 +160,9 @@ nsresult nsAppShell::Init() { +@@ -152,13 +154,9 @@ nsresult nsAppShell::Init() { // See https://bugzilla.gnome.org/show_bug.cgi?id=747634 // // Only bother doing this for the parent process, since it's the one diff --git a/libre/icecat/9003-FSDG-urihandlers.patch b/libre/icecat/9003-FSDG-urihandlers.patch new file mode 100644 index 000000000..504d18b36 --- /dev/null +++ b/libre/icecat/9003-FSDG-urihandlers.patch @@ -0,0 +1,240 @@ +diff --git a/uriloader/exthandler/HandlerList.jsm b/uriloader/exthandler/HandlerList.jsm +index 04b9205..ff3aec5 100644 +--- a/uriloader/exthandler/HandlerList.jsm ++++ b/uriloader/exthandler/HandlerList.jsm +@@ -11,229 +11,25 @@ this.kHandlerListVersion = 1; + this.kHandlerList = { + default: { + schemes: { +- mailto: { ++ irc: { + handlers: [ + { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", ++ name: "KiwiIRC", ++ uriTemplate: "https://web.libera.chat/?url=%s", + }, + ], + }, +- }, +- }, +- cs: { +- schemes: { +- mailto: { ++ ircs: { + handlers: [ + { +- name: "Seznam", +- uriTemplate: "https://email.seznam.cz/newMessageScreen?mailto=%s", +- }, +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", ++ name: "KiwiIRC", ++ uriTemplate: "https://web.libera.chat/?url=%s", + }, + ], + }, +- }, +- }, +- csb: { +- schemes: { + mailto: { + handlers: [ + { +- name: "Poczta Interia.pl", +- uriTemplate: "http://poczta.interia.pl/mh/?mailto=%s", +- }, +- { +- name: "OnetPoczta", +- uriTemplate: "http://poczta.onet.pl/napisz.html?uri=%s", +- }, +- ], +- }, +- }, +- }, +- "es-CL": { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- { +- name: "Outlook", +- uriTemplate: +- "https://outlook.live.com/default.aspx?rru=compose&to=%s", +- }, +- ], +- }, +- }, +- }, +- "ja-JP-mac": { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Yahoo!メール", +- uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s", +- }, +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- ], +- }, +- }, +- }, +- ja: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Yahoo!メール", +- uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s", +- }, +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- ], +- }, +- }, +- }, +- kk: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Яндекс.Почта", +- uriTemplate: "https://mail.yandex.ru/compose?mailto=%s", +- }, +- { +- name: "Mail.Ru", +- uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s", +- }, +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- ], +- }, +- }, +- }, +- ltg: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- { +- name: "inbox.lv mail", +- uriTemplate: "https://mail.inbox.lv/compose?to=%s", +- }, +- ], +- }, +- }, +- }, +- lv: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- { +- name: "inbox.lv mail", +- uriTemplate: "https://mail.inbox.lv/compose?to=%s", +- }, +- ], +- }, +- }, +- }, +- pl: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Poczta Interia.pl", +- uriTemplate: "https://poczta.interia.pl/mh/?mailto=%s", +- }, +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- ], +- }, +- }, +- }, +- ru: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Яндекс.Почту", +- uriTemplate: "https://mail.yandex.ru/compose?mailto=%s", +- }, +- { +- name: "Mail.Ru", +- uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s", +- }, +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- ], +- }, +- }, +- }, +- sah: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Яндекс.Почта", +- uriTemplate: "https://mail.yandex.ru/compose?mailto=%s", +- }, +- { +- name: "Mail.Ru", +- uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s", +- }, +- ], +- }, +- }, +- }, +- uk: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- { +- name: "Outlook", +- uriTemplate: +- "https://outlook.live.com/default.aspx?rru=compose&to=%s", +- }, +- ], +- }, +- }, +- }, +- uz: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- { +- name: "Mail.Ru", +- uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s", + }, + ], + }, diff --git a/libre/icecat/9003-misc-libre.patch b/libre/icecat/9003-misc-libre.patch deleted file mode 100644 index 8476f6d4c..000000000 --- a/libre/icecat/9003-misc-libre.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -rupN icecat-78.4.0/browser/app/profile/icecat.js icecat-78.4.0-new/browser/app/profile/icecat.js ---- icecat-78.4.0/browser/app/profile/icecat.js 2020-10-24 04:33:19.000000000 +0200 -+++ icecat-78.4.0-new/browser/app/profile/icecat.js 2020-12-15 13:35:02.966838162 +0100 -@@ -1303,10 +1303,6 @@ pref("browser.newtabpage.activity-stream - pref("browser.newtabpage.activity-stream.asrouter.providers.cfr", "{\"id\":\"cfr\",\"enabled\":true,\"type\":\"remote-settings\",\"bucket\":\"cfr\",\"frequency\":{\"custom\":[{\"period\":\"daily\",\"cap\":1}]},\"categories\":[\"cfrAddons\",\"cfrFeatures\"],\"updateCycleInMs\":3600000}"); - pref("browser.newtabpage.activity-stream.asrouter.providers.whats-new-panel", "{\"id\":\"whats-new-panel\",\"enabled\":true,\"type\":\"remote-settings\",\"bucket\":\"whats-new-panel\",\"updateCycleInMs\":3600000}"); - pref("browser.newtabpage.activity-stream.asrouter.providers.message-groups", "{\"id\":\"message-groups\",\"enabled\":false,\"type\":\"remote-settings\",\"bucket\":\"message-groups\",\"updateCycleInMs\":3600000}"); --// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into --// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream --// repackager of this code using an alternate snippet url, please keep your users safe --pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "{\"id\":\"snippets\",\"enabled\":true,\"type\":\"remote\",\"url\":\"https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/\",\"updateCycleInMs\":14400000}"); - pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiments", "{\"id\":\"messaging-experiments\",\"enabled\":true,\"type\":\"remote-experiments\",\"messageGroups\":[\"cfr\",\"whats-new-panel\",\"moments-page\",\"snippets\",\"cfr-fxa\",\"aboutwelcome\"],\"updateCycleInMs\":3600000}"); - - // The pref that controls if ASRouter uses the remote fluent files. -diff -rupN icecat-78.4.0/browser/locales/en-US/chrome/browser-region/region.properties icecat-78.4.0-new/browser/locales/en-US/chrome/browser-region/region.properties ---- icecat-78.4.0/browser/locales/en-US/chrome/browser-region/region.properties 2020-10-24 04:33:19.000000000 +0200 -+++ icecat-78.4.0-new/browser/locales/en-US/chrome/browser-region/region.properties 2020-12-15 13:41:00.218218564 +0100 -@@ -9,16 +9,10 @@ - # don't make any spelling errors here. - gecko.handlerService.defaultHandlersVersion=4 - --# The default set of protocol handlers for mailto: --gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail --gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s --gecko.handlerService.schemes.mailto.1.name=Gmail --gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -- - # The default set of protocol handlers for irc: --gecko.handlerService.schemes.irc.0.name=Mibbit --gecko.handlerService.schemes.irc.0.uriTemplate= -+gecko.handlerService.schemes.irc.0.name=Freenode Web IRC -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net - - # The default set of protocol handlers for ircs: --gecko.handlerService.schemes.ircs.0.name=Mibbit --gecko.handlerService.schemes.ircs.0.uriTemplate= -+gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net -diff -rupN icecat-78.4.0/browser/locales/generic/profile/bookmarks.html.in icecat-78.4.0-new/browser/locales/generic/profile/bookmarks.html.in ---- icecat-78.4.0/browser/locales/generic/profile/bookmarks.html.in 2020-10-24 04:25:35.000000000 +0200 -+++ icecat-78.4.0-new/browser/locales/generic/profile/bookmarks.html.in 2020-12-15 13:42:11.272489118 +0100 -@@ -12,5 +12,20 @@ -
Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar -

-

-+
Parabola GNU/Linux-libre -+

-+

Parabola GNU/Linux-libre

-+

-+

Parabola GNU/Linux-libre -+
Parabola GNU/Linux-libre Packages -+
Parabola GNU/Linux-libre Wiki -+
Parabola GNU/Linux-libre Labs -+

-+

Free Software Foundation

-+

-+

Free Software Foundation -+
The GNU Operating System and the Free Software Movement -+
LibrePlanet -+
h-node -

-

diff --git a/libre/icecat/9004-FSDG-misc.patch b/libre/icecat/9004-FSDG-misc.patch new file mode 100644 index 000000000..c45b97eb0 --- /dev/null +++ b/libre/icecat/9004-FSDG-misc.patch @@ -0,0 +1,1095 @@ +From d8ea43891548f1e2a205cf73bb5b39f916a0ee8d Mon Sep 17 00:00:00 2001 +From: grizzlyuser +Date: Sat, 12 Mar 2022 17:14:25 +0100 +Subject: [PATCH] FSDG: Replace upstream default bookmarks + +--- + browser/base/content/default-bookmarks.html | 50 +++++++++------------ + 1 file changed, 21 insertions(+), 29 deletions(-) + +diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html +index b2d18d3098..e2e643bcf2 100644 +--- a/browser/base/content/default-bookmarks.html ++++ b/browser/base/content/default-bookmarks.html +@@ -1,14 +1,14 @@ + #filter substitution + +-#define mozilla_icon data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3E %3Cpath d='M0 0h16v16H0z'/%3E %3Cpath d='M13.994 10.356H15V12h-3.171V7.741c0-1.308-.435-1.81-1.29-1.81-1.04 0-1.46.737-1.46 1.8v2.63h1.006V12H6.918V7.741c0-1.308-.435-1.81-1.291-1.81-1.039 0-1.459.737-1.459 1.8v2.63h1.441V12H1v-1.644h1.006V6.079H1V4.435h3.168v1.139a2.507 2.507 0 0 1 2.3-1.29A2.452 2.452 0 0 1 8.931 5.91 2.535 2.535 0 0 1 11.4 4.284 2.448 2.448 0 0 1 14 6.9v3.458z' fill='%23fff'/%3E %3C/svg%3E +- +-#define firefox_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAHY0lEQVR4Aa3VA5RrSdfG8f+uOidJp/umczm2ffFhbNvG9722bdv22LZt+3I81+04B1XvfpPmWHut3yk06smus1Z4L8uXDv6MHzpowA8eWFS8FaY9eU+cCvxaFfF8W/FWGDy8a6n7DM7/H96DR3ldu0MVb8a0J+9CI1qXJP11a+79GOdP1f11FW/EtCfvQpx8mziFxMHEEEV1KYkrKl6Pea1Nbnrs/7hz7q2KUQsqRcUE/eV1acb/pyFQ7b9N3fguzNTxVsXrMa/avFgPb6SnukY8W6EgXvszrszjivH08F0VLZFK0rbUgRt9H2aS+lORznUxnTMV45kJG6fNPZSGnEodTJwUFGbphqdSll/H/SxWjEc92kYxSoO0uzEcwo90g/9rlKpHpCmX491MxQgzuvjtE0UieyqxhYZA3UGp8CjUtSMR2YrkFdf+/szi9X88+zM3/uncSx/81/f+7/HzPsu8q09i8MUNcCUHUTImceAAL+RC+UW1nMzHuUvxSVGBCloTgMT+GuOLipaGyg/OpLuE/jVI58wHb/zsdxD5tBVbDMQwOPe/8UDqHYuuPJjCZnP5nw/+mfyUPhADRtkAaIfosum23klBxH8b+KzCfuczG8IPXi4C5yHQwvDoPYhCBSkz1n9y1+WLd8xFzVUxxmIRjBIBVHXFZF58aEtW3exxsp0V8Aac8gpBnGQBRNymkP4VXKPdgdj8H2JB/DgMVwreATFhdoCdj/wY8x7+GM8/djyJ81hlnCPTUWfHb/0QlyRUelalEPcCHswIQARJPd64ohh/KHBagPcQB7sggHgIVHcM0wUyWWUAoNaEuobI9bP1dj9lw1nnMvehj/LS0wdinYO4wM1f/h6z3v9n1t3pTnAWBj04ZQA7LFROwMsu7QCpgcjuCh4Asg5Wa0ImgNDqqHTOtDyIgPPKkZ/cZOstzmT+Nw4jcA5JBO9SHjzzWKZt8CRd03ohD/RZALCigIwHawBmKgKSVoAiAi2VDCzsgo0bYB04lSojEAaQDyETsmTZf3PPdZ+irvMgTTF4SAVX7+SRC/dj5/f/C6D9d5UQLBAIFBJILIhtB1g2a8uZq+1+LwiAV8CSTujPwqoRbJjCJMdAeRVue+j/WLh4T2I3jcCEhN4ShmDFYR2IAXC8OHdDaMYAYBxU82AFAgPShHoejAEgUEViy2h5UbS9LLBajf5oMr866wc0wlWQvEEyNQKbIcSSwZBNIfAO41NQ9ZXd0IgBAQdUDAQWpjQhcfi6gCgguDtTm3vIUBdhdwUA/Pggqmy49/n/pr/q8ZMq4DziEwI0QOtpiT1kXUqQRqC8ohaDy0BqoGzxOUE6q9DwMBiOvtzm5OLi3migAFEwpjnOCzmKhZXUkyr1uEwtLqky1aStNk4jqhFFDVZb6ykYMjBodQxw5RAKZUgSqAq+YmmWzFxF0P8L61Z8pHhf5/S+bfHQJm1OLcuzw4YPcWH3/qysTcebFHyESTOkhLjUokt8M8VFCVYDbLXhvdCfARfiG3lkykDr2qhbXJTRUZBAngMwootGI3tbrbcIsR3ugp3Yhbun89l9/ko+qCDVGpQruHKJqDakBmnq2KyXaDZKrDX1KWau+ij0ZqAvgwR1JFuFmihwPTkdDQN9co3C6IMnwujs0sppELcOV+NHVc2wzv2eb+74J6ZP6kGazeEgZZJqiaRWJo6qbDb5MU7c4ixYmYUhC7YJaQxVgYrgSxa3sgNftdww31+usFuvuykfWDzU/4HytL0llTVz+SbiAScTryKxFFc6dlnnQVZP+wEo2grT7ACb5V7g2BnXsVfxHsLEgfGQTYb/1kJqWpKV3VDLM1iXi/a8PDrtqmecl451DwLg8oG1DtnMmcsKq/bQ1V3BmBTsfzgIfHucwINxICivADt8eADkBLJGtcc0ydHsmU7QEXBFfzwTeFwRnLFtDoBD7nv5+vv61v2XXzHlfR7oKtQxLkFcCqkDK8qMHdIex4gSMxaoKZBtS8lQ18NtJsPSmv/Nyfc3nma4RjsA8Jnq1HU+WC9cY01z865pJQrdDcQkrW6IpGOfun3oxLnw6m/SEBIyVFbOIMhmiXJy35oL+vYDBhkuGxY3YaTuy9TLA+Jv2inu2j2ph9NrTUMmCyIGjwEnyiCtUaUWnGlLR1hIlM6rKwpUX5qBiTuI02Du94aqx8zJhEsVI4IPduUZV+7vDC0CDv9GdeolUjObL18ckutqMKkQkc2kiFHOITLCwyiUp1bNUhuYRFrrxPoMzdDM/XbUf/gZvvYsozX+Cl5d5vh690afrk3+0hR4XyoxqYmQICaTSwjClI6cA3EIvhWi0QiIm6rRgaQh1ikfsMK43/xv8YWfASuUe6sBAIzqPmNwjb1nJdnP5PDbOpPgJMXjWhDAC4JgvEWUaQkoib/o/NzQb37S1fP0+Dt/6wHGKqe6v1yZvuG+zc69p3m7d4dnW8TjAaEdwmFKEcztkfSG67KVG346aeV8YEglincRYLQClVcdKsery6lI1VVNJbyF+jdp8gPG4E08mAAAAABJRU5ErkJggg== +- +-#define bugzilla_icon data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnYCL7J0pY9wwETY9kYEM9AAAAAEBAYAhVVVUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1bjTOS1Vb/wAA2/8JEqT/Q0g8kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnMqoiJtJ/0haST/NEkp/yQnW/8AAPD8AAHY/RsgP/JZUI+GKitih4ObUEAAAAAAAAAAAAAAAAAAAAAAKnouwip5Lv9ooW//a6Jz/y9GIv8JBXb/AADO/gEBvf8AAK7/FRJp/z9BfP8iLGj1AAAAAAAAAAAAAAAAL4YzwiB0I/+UwJ3/bK+C/02eZ/9CTjz/DBa1/wABxf8BAOj/AACp/w8Oc/sJCv//EhCN9AAAAAAAAAAANJA6iC2MMv93tYL/TZ5U/3mzjP9NoWr/NEss/wYIU/8CBOn/ARCX/wwNqP0TD6X/Cgyex5qacDAAAAAAAAAAADKUN/ZirWj/d76R/0SgXf9Ln1P/eLSM/1mda/8rOkb/CQiD/wMQvf8UEnT/MTAt4P//MwUhZyN8AAAAAAAAAAAznDf5UqlZ/228jP9NqnD/Qp9c/0yiVP+Dv5b/VaVw/0VxXf9PZXD/S3pQ/y54Nf8jcCf/I2wn/wAAAAA0ozjIM6E4/zOeOP+Uz6z/XLR+/06scv9BoV3/TqZX/4XBmP9XqHP/hr6Z/yp+Lf8leSr1JXUqbQAAAAA3rTz7Nqo7/zWmOqM3oz7rUK1W/43Mpf9etYD/T61z/0KjXf9Rqln/msup/46/lf8pgy7/JFg6sAAAAAAAAAAAOK8+8jqvOiMAAAAAAAAAADSlOv85pT//kM6o/2K5hP9Ysnv/YLJ2/ziXPv8piS3/V6Ri/yZQQ9wAAAAAAAAAAAAAAAAAAAAAAAAAADetP0E2qzz/OKg98UWsS/+e1K3/pNe4/4XDjv8ojy3/T7df/5fIqv8sjTH/K4kw/yqFLv8AAAAAAAAAAAAAAAA4sT3xN7A8+QAAAAA4qz3yNag6/zSlOf80oTn/csJ+/6/jwv9fjHj/MmRMdQAAAAAAAAAAAAAAAAAAAAAAAAAAOrdA/zm0QHQAAAAAAAAAADasO/k2qTvuRX5lpjqGT/gznDr/O3FXigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADq9QiMAAAAAAAAAAAAAAAA4sj7/Nq09s0uOaSI1qTplM6U68wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrc//zu0P0EAAAAAOK4+UjWsPPgAAAAAAAAAAAAAAAAAAAAA/48AAP8HAAD4AQAA8AAAAOAAAADAAQAAwAMAAMAAAACAAwAAAAMAAHADAADwAAAA5AcAAO4HAAD+bwAA/u8AAA== +- +-#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAABgElEQVR4AWPouPiRpmjUAjgatSBj+aG0OVuyVhymsgWl2y475zXySikwwIC4lpFDVk3avG0BrXP9mmeV7bhCvgXuxW3M7JwMeAGfpByZFpjHFzAQB2KmrSfZAtuMKgaiAZ+MUuLc7SRY4FbYwkA60HAJiJm8uubQAwIWeJV1MlAAOAREHDJrcFqQMG+ngIK6oKyykLwqAyMjeXZwiUjgtKD+yGMIwyGzmoGBTAs4hcXrgObgi4OiVkpCiUtYov7YU5wW1B194t0ww69ldvjktYouwWRYIGdkQ1Q+iJ28hp2Xn7B5zKzIPAlNw6S52wlbkL3mJJecOq+CBqeIJC6TjUJTMlcdz9lwLmriSuPgJBVbj/D+5SSXRequQVhNN4nIoEJhV77jKgs7B6bprJw85XtuU8GCpNlbSS3gSA4ii4QiTAvElDWpWeH41kxg5eZDSypUrtFKd1zTcA1EpHRDS5rUyQEts+VN7JjYOGR0TWhY6RdsOhc/Y9NoswUJjVoAAE+h555Rgcg2AAAAAElFTkSuQmCC +- +-#define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABOFBMVEUAAAAAzdwAydcAyNgA//8AzOYAydcAyNgAyNgA2NgAytoAzNkAytgAydgA29sA0egAyNgAyNgA//8AyNgAydgA//8Ay9cAydcAytkAz90Ay9gA1eoAydgAytsAyNgAytgAydkAydgAydgAyNgAydgAyNcAy9oAydgA//8AytsAy9kAytkAyNgAydgAydkAy9kAzP8AydgAydgAydgAz98AzN0AyNcAyNsAydcAydgAydgAydcAytgAytcAydcAydcAytcAydcAyNcAydcAy9gAztgAydcAydgAzOAAydcAyNgAyNgAytwAyNcAyNgAy9wAyNcAyNcAyNgAydgAyNcAydcAydgA0uEAydkAyNgAyeQA4+MAyNgAydkAzN0AyNsA1f8AyNgAydgAydcA1eMAydgAydcAyNdj6PGJAAAAZ3RSTlMAJFpBAQqm8qwNPiiPygcLv8QEw5cDQMA1JU4MwiuDbl/+6+m4+0XLAj9KePz9cjYFvervEA/IDsfFr+xcgeaOYIDo+ica1OMZ9bXlHe73LM3M35itxs8Rf5ATCbFeHjgGttC5ErzO3WvwaAAAAWxJREFUOMt9kudCwkAQhFcITQWCoaggiBqxoaixYUVsYMMGCmLXff838LIXCJAL84fvmCHsTg4AYMDhlIDkcnu8Po4w6BjiIA0joj+gY1BmGKLEiMIwHNFR9xGjuh8jpMQoYZjRGBGOA8QTHDEUB4hynABwcEqCT8GW2DNSnCYBnJzSoSk0NT2jcphlM/rRXpk5NkRgfmFxSWBml6MrOWNlWBUEEmDKtyYIrGttP66gSP4Nww8mUKzNLd5/zHaJbb1Tl9xnzR2WcGM/5QE8BLvJvf0Dc4HDo8IxUVECL5Vywv7s9Mzwz/WLcFHSsWy8w0sa9+qa/JtbOlUY3mnGLbjnCz9Q4JEfnhCrNb5nXi3w754p8MIPKVWpt6psGJ+vFJBbBUO3GlozzYdsSmCV1NlntiTnegNvPQ29Wx7h7fKrEUvg47PD/6oLpgh8m7//AZEav4b/J/bbb75SAzvR3crY+6y8fLGsQV9ZSvwHF4LQIhDjT+8AAAAASUVORK5CYII= ++#define parabola_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC ++ ++#define fsf_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC ++ ++#define gnu_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC ++ ++#define libreplanet_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC ++ ++#define hnode_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC + +@@ -29,31 +29,23 @@ +

+

default-bookmarks-toolbarfolder

+
default-bookmarks-toolbarfolder-description
+-#ifndef NIGHTLY_BUILD +

+-

default-bookmarks-getting-started
++
Parabola GNU/Linux-libre
+

+-

default-bookmarks-firefox-heading

++

Parabola GNU/Linux-libre

+

+-

default-bookmarks-firefox-get-help
+-
default-bookmarks-firefox-customize
+-
default-bookmarks-firefox-community
+-
default-bookmarks-firefox-about
+-

+-#else +-

+-

default-bookmarks-firefox-community
+-

+-

default-bookmarks-nightly-heading

++
Parabola GNU/Linux-libre ++
Parabola GNU/Linux-libre Packages ++
Parabola GNU/Linux-libre Wiki ++
Parabola GNU/Linux-libre Labs ++

++

Free Software Foundation

+

+-

default-bookmarks-nightly-blog
+-
default-bookmarks-bugzilla
+-
default-bookmarks-mdn
+-
default-bookmarks-nightly-tester-tools
+-
default-bookmarks-crashes
+-
default-bookmarks-planet
++
Free Software Foundation ++
The GNU Operating System and the Free Software Movement ++
LibrePlanet ++
h-node +

+-#endif + + + +-- +2.35.1 + +From f4475bc77e63f16562aa8360233140522d72d8d4 Mon Sep 17 00:00:00 2001 +From: grizzlyuser +Date: Sat, 7 May 2022 21:46:48 +0200 +Subject: [PATCH] Remove 'More from Mozilla' section in Preferences + +Currently it contains functionality to provide links to nonfree software +like Firefox Mobile, which is not compatible with the FSDG for the same +reasons as desktop Firefox. +--- + browser/app/profile/firefox.js | 2 +- + .../static/browser_all_files_referenced.js | 12 ------- + browser/components/preferences/jar.mn | 4 --- + .../more-from-mozilla-qr-code-advanced.svg | 4 --- + .../more-from-mozilla-qr-code-simple-cn.svg | 4 --- + .../more-from-mozilla-qr-code-simple.svg | 4 --- + .../components/preferences/moreFromMozilla.js | 33 +------------------ + browser/components/preferences/preferences.js | 9 ----- + .../components/preferences/preferences.xhtml | 12 ------- + 9 files changed, 2 insertions(+), 82 deletions(-) + delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-advanced.svg + delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg + delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple.svg + +diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +index 76b495ea6c..d0c2b98b11 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -1011,7 +1011,7 @@ pref("browser.preferences.experimental", true); + #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); + +diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js +index 4c59b84a7c..44d36d3b28 100644 +--- a/browser/base/content/test/static/browser_all_files_referenced.js ++++ b/browser/base/content/test/static/browser_all_files_referenced.js +@@ -33,7 +33,6 @@ var gExceptionPaths = [ + "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 +@@ -136,17 +135,6 @@ var whitelist = [ + // 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 --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn +index 912d9edf08..dd4697a368 100644 +--- a/browser/components/preferences/jar.mn ++++ b/browser/components/preferences/jar.mn +@@ -14,12 +14,8 @@ browser.jar: + content/browser/preferences/containers.js + content/browser/preferences/sync.js + content/browser/preferences/experimental.js +- content/browser/preferences/moreFromMozilla.js + 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 --git a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg b/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg +deleted file mode 100644 +index 4848d3e20c..0000000000 +--- a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg ++++ /dev/null +@@ -1,4 +0,0 @@ +- +- +\ No newline at end of file +diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg +deleted file mode 100644 +index 5052db9702..0000000000 +--- a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg ++++ /dev/null +@@ -1,4 +0,0 @@ +- +- +diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg +deleted file mode 100644 +index 279595db10..0000000000 +--- a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg ++++ /dev/null +@@ -1,4 +0,0 @@ +- +- +\ No newline at end of file +diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js +index 1208a5dbcd..ff91f7421e 100644 +--- a/browser/components/preferences/moreFromMozilla.js ++++ b/browser/components/preferences/moreFromMozilla.js +@@ -81,38 +81,7 @@ var gMoreFromMozillaPane = { + }, + + 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 --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js +index f6dc2b3781..34c7d8c528 100644 +--- a/browser/components/preferences/preferences.js ++++ b/browser/components/preferences/preferences.js +@@ -10,7 +10,6 @@ + /* import-globals-from privacy.js */ + /* import-globals-from sync.js */ + /* import-globals-from experimental.js */ +-/* import-globals-from moreFromMozilla.js */ + /* import-globals-from findInPage.js */ + /* import-globals-from /browser/base/content/utilityOverlay.js */ + /* import-globals-from /toolkit/content/preferencesBindings.js */ +@@ -203,14 +202,6 @@ function init_all() { + register_module("paneExperimental", gExperimentalPane); + } + +- NimbusFeatures.moreFromMozilla.recordExposureEvent({ once: true }); +- if (NimbusFeatures.moreFromMozilla.getVariable("enabled")) { +- document.getElementById("category-more-from-mozilla").hidden = false; +- gMoreFromMozillaPane.option = NimbusFeatures.moreFromMozilla.getVariable( +- "template" +- ); +- register_module("paneMoreFromMozilla", gMoreFromMozillaPane); +- } + // The Sync category needs to be the last of the "real" categories + // registered and inititalized since many tests wait for the + // "sync-pane-loaded" observer notification before starting the test. +diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml +index 81059f3d2e..be23729276 100644 +--- a/browser/components/preferences/preferences.xhtml ++++ b/browser/components/preferences/preferences.xhtml +@@ -33,7 +33,6 @@ + + + +- + + + +@@ -152,16 +151,6 @@ + + + +- + + + +@@ -214,7 +203,6 @@ + #include containers.inc.xhtml + #include sync.inc.xhtml + #include experimental.inc.xhtml +-#include moreFromMozilla.inc.xhtml + + + +-- +2.36.0 + + +From 66dec07e773e35b82aa42120441dea0fb185986d Mon Sep 17 00:00:00 2001 +From: grizzlyuser +Date: Sat, 7 May 2022 21:51:06 +0200 +Subject: [PATCH] Remove promos of Firefox Focus and Klar from Private + Browsing + +Please correct me if I'm wrong, but these are not compatible with FSDG +for the same reasons as the original Firefox. +--- + browser/app/profile/firefox.js | 2 +- + .../static/browser_all_files_referenced.js | 2 - + .../newtab/lib/OnboardingMessageProvider.jsm | 215 ------------------ + .../newtab/lib/PanelTestProvider.jsm | 84 ------- + .../content/assets/focus-qr-code.svg | 114 ---------- + .../content/assets/klar-qr-code.svg | 114 ---------- + 6 files changed, 1 insertion(+), 530 deletions(-) + delete mode 100644 browser/components/privatebrowsing/content/assets/focus-qr-code.svg + delete mode 100644 browser/components/privatebrowsing/content/assets/klar-qr-code.svg + +diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +index d0c2b98b11..54cc9de7e6 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -1907,7 +1907,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,be,ca,ch,de,es,fi,fr,g + 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 --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js +index 44d36d3b28..6823855d56 100644 +--- a/browser/base/content/test/static/browser_all_files_referenced.js ++++ b/browser/base/content/test/static/browser_all_files_referenced.js +@@ -32,8 +32,6 @@ var gExceptionPaths = [ + "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/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 +diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm +index 940332f27f..1f7378bbae 100644 +--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm ++++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm +@@ -95,220 +95,6 @@ const ONBOARDING_MESSAGES = () => [ + ], + }, + }, +- { +- id: "PB_NEWTAB_FOCUS_PROMO", +- 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/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: 3, +- period: 604800000, // Max 3 per week +- }, +- ], +- lifetime: 12, +- }, +- targeting: "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en')", +- }, +- { +- id: "PB_NEWTAB_KLAR_PROMO", +- 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: "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", +- 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: 3, +- period: 604800000, // Max 3 per week +- }, +- ], +- lifetime: 12, +- }, +- targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'", +- }, + { + id: "PB_NEWTAB_INFO_SECTION", + template: "pb_newtab", + +diff --git a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/components/newtab/lib/PanelTestProvider.jsm +index a991581f7b..af57c3eea8 100644 +--- a/browser/components/newtab/lib/PanelTestProvider.jsm ++++ b/browser/components/newtab/lib/PanelTestProvider.jsm +@@ -558,90 +558,6 @@ const MESSAGES = () => [ + frequency: { lifetime: 3 }, + 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", +diff --git a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg +deleted file mode 100644 +index f182567314..0000000000 +--- a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg ++++ /dev/null +@@ -1,114 +0,0 @@ +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff --git a/browser/components/privatebrowsing/content/assets/klar-qr-code.svg b/browser/components/privatebrowsing/content/assets/klar-qr-code.svg +deleted file mode 100644 +index 2217ca055c..0000000000 +--- a/browser/components/privatebrowsing/content/assets/klar-qr-code.svg ++++ /dev/null +@@ -1,114 +0,0 @@ +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-- +2.36.0 + +diff --git a/browser/app/permissions b/browser/app/permissions +index 991284081d..888cc811ce 100644 +--- a/browser/app/permissions ++++ b/browser/app/permissions +@@ -15,11 +15,5 @@ origin uitour 1 https://support.mozilla.org + origin uitour 1 about:home + origin uitour 1 about:newtab + +-# XPInstall +-origin install 1 https://addons.mozilla.org +- + # Remote troubleshooting + origin remote-troubleshooting 1 https://support.mozilla.org +- +-# addon install +-origin install 1 https://fpn.firefox.com +diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml +index 7d37d26..4ebbc06 100644 +--- a/browser/components/preferences/sync.inc.xhtml ++++ b/browser/components/preferences/sync.inc.xhtml +@@ -35,22 +35,6 @@ + + + +- + + + +diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl +index dabfadc..3ce732e 100644 +--- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl ++++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl +@@ -96,7 +96,7 @@ policy-ExtensionSettings = Manage all aspects of extension installation. + + policy-ExtensionUpdate = Enable or disable automatic extension updates. + +-policy-FirefoxHome = Configure Firefox Home. ++policy-FirefoxHome = Configure Iceweasel Home. + + policy-FlashPlugin = Allow or deny usage of the Flash plugin. + +diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl +index 1b29e8d..6f7566c 100644 +--- a/browser/locales/en-US/browser/preferences/preferences.ftl ++++ b/browser/locales/en-US/browser/preferences/preferences.ftl +@@ -550,7 +550,7 @@ home-restore-defaults = + # "Firefox" should be treated as a brand and kept in English, + # while "Home" and "(Default)" can be localized. + home-mode-choice-default = +- .label = Firefox Home (Default) ++ .label = Iceweasel Home (Default) + + home-mode-choice-custom = + .label = Custom URLs… +@@ -577,10 +577,10 @@ choose-bookmark = + .label = Use Bookmark… + .accesskey = B + +-## Home Section - Firefox Home Content Customization ++## Home Section - Iceweasel Home Content Customization + +-home-prefs-content-header = Firefox Home Content +-home-prefs-content-description = Choose what content you want on your Firefox Home screen. ++home-prefs-content-header = Iceweasel Home Content ++home-prefs-content-description = Choose what content you want on your Iceweasel Home screen. + + home-prefs-search-header = + .label = Web Search +@@ -714,16 +714,6 @@ sync-signedout-account-signin2 = + .label = Sign in to { -sync-brand-short-name }… + .accesskey = i + +-# This message contains two links and two icon images. +-# `` - Android logo icon +-# `` - Link to Android Download +-# `` - iOS logo icon +-# `` - Link to iOS Download +-# +-# They can be moved within the sentence as needed to adapt +-# to your language, but should not be changed or translated. +-sync-mobile-promo = Download Firefox for Android or iOS to sync with your mobile device. +- + ## Firefox Account - Signed in + + sync-profile-picture = +diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl +index edd871b..77870fe 100644 +--- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl ++++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl +@@ -7,7 +7,7 @@ addons-window = + addons-page-title = Add-ons Manager + + search-header = +- .placeholder = Search addons.mozilla.org ++ .placeholder = Search www.parabola.nu/packages + .searchbuttonlabel = Search + + search-header-shortcut = +@@ -482,7 +482,7 @@ theme-heading-search-label = Find more themes + + default-heading-search-label = Find more add-ons + addons-heading-search-input = +- .placeholder = Search addons.mozilla.org ++ .placeholder = Search www.parabola.nu/packages + + addon-page-options-button = + .title = Tools for all add-ons +diff --git a/browser/components/protections/content/protections.ftl b/browser/components/protections/content/protections.ftl +index 5ac8a7b08c..fec81698e3 100644 +--- a/browser/components/protections/content/protections.ftl ++++ b/browser/components/protections/content/protections.ftl +@@ -18,7 +18,7 @@ get-vpn-link = Get { -mozilla-vpn-brand-name } + + vpn-title-subscribed = VPN: Subscribed + # Note This text is not being translated, and the
will need to be removed if or when it does get translated +-vpn-header-content-subscribed = Using the { -mozilla-vpn-brand-name } encrypts all your traffic and hides your location — on up to 5 devices. Get the most from your subscription — add it from
the Google Play Store or Apple App Store. ++vpn-header-content-subscribed = Using the { -mozilla-vpn-brand-name } encrypts all your traffic and hides your location — on up to 5 devices. + + vpn-banner-header = Protection that extends beyond the browser + # Note This text is not being translated, and the
will need to be removed if or when it does get translated +diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html +index e33c814f62..5698f2b3e9 100644 +--- a/browser/components/protections/content/protections.html ++++ b/browser/components/protections/content/protections.html +@@ -303,8 +303,6 @@ + +

+

+- +- +

+ + +diff --git a/browser/components/protections/content/vpn-card.js b/browser/components/protections/content/vpn-card.js +index 2417f1a641..698c48ccc3 100644 +--- a/browser/components/protections/content/vpn-card.js ++++ b/browser/components/protections/content/vpn-card.js +@@ -23,22 +23,6 @@ export default class VPNCard { + vpnLink.addEventListener("click", () => { + this.doc.sendTelemetryEvent("click", "vpn_card_link"); + }); +- let androidVPNAppLink = document.getElementById( +- "vpn-google-playstore-link" +- ); +- androidVPNAppLink.href = RPMGetStringPref( +- "browser.contentblocking.report.vpn-android.url" +- ); +- androidVPNAppLink.addEventListener("click", () => { +- document.sendTelemetryEvent("click", "vpn_app_link_android"); +- }); +- let iosVPNAppLink = document.getElementById("vpn-app-store-link"); +- iosVPNAppLink.href = RPMGetStringPref( +- "browser.contentblocking.report.vpn-ios.url" +- ); +- iosVPNAppLink.addEventListener("click", () => { +- document.sendTelemetryEvent("click", "vpn_app_link_ios"); +- }); + + const vpnBanner = this.doc.querySelector(".vpn-banner"); + const exitIcon = vpnBanner.querySelector(".exit-icon"); diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 7e19563a0..e2d101649 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -15,62 +15,60 @@ # Contributor: grizzlyuser -# NOTE: icecat (60.7 < V <= 78.10) are not upstream releases -# upstream releases would normally have '-gnu' appended to $_upstream_ver +# NOTE: icecat (60.7 < V <= current) are not complete upstream releases +# upstream releases normally have $_upstream_ver ending in '-gnu' # this build is based on gnuzilla VCS developement sources -# rev: b72c22186cf381d7b1f93be550c9da30865d03b4 +# rev: 65a61287a5142a9403ec00d973cb5e5d658a3c71 +# with parabola patches applied +# https://git.parabola.nu/~bill-auger/icecat.git/log/?h=parabola pkgname=icecat -_upstream_ver=78.10.0-pre2 # -gnu1 +_upstream_ver=91.11.0-gnu1 +_upstream_ver=${_upstream_ver/-gnu1/-pre1} # parabola pre-release pkgver=${_upstream_ver//-/_} pkgrel=1 pkgdesc="the GNU web browser, based on Mozilla Firefox ESR" -arch=(x86_64 i686 armv7h) +arch=(armv7h i686 x86_64) license=(MPL GPL LGPL) url=http://www.gnu.org/software/gnuzilla/ depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse) -makedepends=(m4 unzip zip diffutils python2-setuptools yasm mesa imake inetutils - xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 - python nodejs python2-psutil cbindgen nasm) -makedepends+=(mozilla-searchplugins jq) -if [[ "${CARCH}" == 'i686' ]] -then makedepends=(${makedepends[*]/llvm/llvm10}) # FIXME: i686 configure fails with LLVM11 - # rustup: error while loading shared libraries: libLLVM-10.so - makedepends=(${makedepends[*]/rust/rust=1:1.47.0}) # FIXME: Sandbox: seccomp sandbox violation -else makedepends=(${makedepends[*]/rust/rust=1:1.49.0}) # https://lists.gnu.org/archive/html/gnuzilla-dev/2021-04/msg00000.html -fi +makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb + autoconf2.13 rust clang llvm jack nodejs cbindgen nasm + python-setuptools python-psutil python-zstandard lld dump_syms) +makedepends+=(jq python-jsonschema) +makedepends_i686=(gcc10) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' 'speech-dispatcher: Text-to-Speech' - 'hunspell-en_US: Spell checking, American English') -options=(!emptydirs !makeflags !strip) + 'hunspell-en_US: Spell checking, American English' + 'xdg-desktop-portal: Screensharing with Wayland') +options=(!emptydirs !makeflags !strip !lto !debug) source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${_upstream_ver}.tar.bz2{,.sig} icecat.desktop icecat-safe.desktop 0001-Use-remoting-name-for-GDK-application-names.patch - rust_1.48.patch.gz) -source+=(searchplugins_list.json - 9003-misc-libre.patch) -source_i686=('rust-static-disable-network-test-on-static-libraries.patch') -sha256sums=('f4334ab97a30bf8e8fe400c55ed00fcea1d44536dc6df1c7f65fec8eae1664a3' +) +source_armv7h=(arm.patch + build-arm-libopus.patch) +source_i686=(avoid-libxul-OOM-python-check.patch + rust-static-disable-network-test-on-static-libraries.patch) +sha256sums=('f2a149d562b0b441f4df1e395d00a36717f56001acf7f05d40ebab0088069661' 'SKIP' 'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d' '33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208' - 'e0eaec8ddd24bbebf4956563ebc6d7a56f8dada5835975ee4d320dd3d0c9c442' - 'c7f867ccee684939c9f0a9c30ea69127077bbe43af545a03f09dfbbdc02545a9') -sha256sums+=('3edb4add450f94c579f2df7c16ac4d9bd9f5c6acf3fbd8a05ce24c21c317257d' - '28029afa3201e1be8138be06f741c59d64869edf0c9e90dbb05cfa6b5fff4ecd') -sha256sums_i686=('068efe37a99561490e6ec7b70a3cd4dd84e89e6bdf19f04a475d06c78fd28920') -validpgpkeys=('318C679D94F17700CC847DE646A70073E4E50D4E') # Ruben Rodriguez + 'a7f5ae9f018678a391739365329a5a5b527b536bc9aac441c73ae811d2fa530d' +) +sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966' + '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') +sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353' + '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041') validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger (VCS builds) -# PGO requires networking -_should_skip_pgo_armv7h=1 # disable for armv7h - always -_should_skip_pgo_i686=1 # disable for i686 - always -_should_skip_pgo_x86_64=0 # disable for x86_64 - libremakepkg -eval "_should_skip_pgo=\$_should_skip_pgo_${CARCH}" +# disable PGO for 32-bit arches +_should_skip_pgo=0 # for x86_64 +[[ "${CARCH}" != 'armv7h' && "${CARCH}" != 'i686' ]] || _should_skip_pgo=1 _check_build_config() { @@ -87,24 +85,20 @@ _check_build_config() { # E.g. if the value of any key is true or null (in case the key is missing from mozinfo.json), # that means the build configuration has to be reworked. local obj_directory=$(./mach environment | sed -En '/object directory:/{n;s/^\s+//;p;}') - local mozinfo_json="${obj_directory}"/mozinfo.json - local antifeature_keys=('.crashreporter' '.datareporting' '.healthreport' '.normandy' '.telemetry' '.updater') + local antifeature_keys=(.crashreporter .datareporting .healthreport .normandy .telemetry .updater) local antifeatures=() - local jq_cmd=( jq -e "${key} != false" "${mozinfo_json}" ) - - printf "\$mozinfo_json %s - obj_directory is: %s\n" \ - "$( [[ -f "${mozinfo_json}" ]] || printf "not " )found" \ - "${obj_directory}" - - for key in ${antifeature_keys[@]} ; do ${jq_cmd[@]} && antifeatures+=(${key}); done ; + echo "obj_directory is: ${obj_directory}" + for key in ${antifeature_keys[@]} + do jq -e "${key} != false" "${obj_directory}/mozinfo.json" &> /dev/null && antifeatures+=(${key}) + done if (( ${#antifeatures[@]} )) then echo "Some anti-features are not disabled in build configuration files, aborting:" - for key in ${antifeature_keys[@]} - do echo "${key} - $( ${jq_cmd[@]} || echo "not " )detected\n" - done + for key in ${antifeatures[@]} ; do echo " - ${key} is enabled" ; done ; - # return 1 # FIXME: .datareporting is detected + [[ -z "${ar[*]/.datareporting/}" ]] && return 0 # FIXME: .datareporting is detected + + return 1 fi popd > /dev/null @@ -117,35 +111,34 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch - # https://bugzilla.mozilla.org/show_bug.cgi?id=1667736 - patch -Np1 -i ../rust_1.48.patch +# # https://bugzilla.mozilla.org/show_bug.cgi?id=1667736 +# patch -Np1 -i ../rust_1.48.patch cat >../mozconfig < 0.23 (currently 0.24) + # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 + sed -i '/const uint64_t ROOT_CLIP_CHAIN = ~0;/d' gfx/webrender_bindings/webrender_ffi.h + + ## [ARCH-SPECIFIC CONFIG] ## - case "${CARCH}" in - armv7h) -# TODO: re-work for armv7h -# sed -i '/--enable-linker=gold/d' ../mozconfig -# sed -i '/--enable-rust-simd/d' ../mozconfig -# -# # https://bugzilla.mozilla.org/show_bug.cgi?id=1463035 -# patch -Np1 -i "$srcdir"/mozilla-1463035.patch -# -# cat >> ../mozconfig <>../mozconfig <>../mozconfig < /dev/null - - # Patch search-engines configs - cp "${srcdir}"/searchplugins_list.json list.json - sed -i 's|https://duckduckgo.com/|https://html.duckduckgo.com/html/|' ddg/manifest.json - - # Removing URL parameters that let DuckDuckGo know the place in UI - # the search was ran from (like address bar, context menu, etc.) - local jq_cmd='del(.chrome_settings_overrides.search_provider.params)' - jq "${jq_cmd}" ddg/manifest.json > manifest.json.tmp - ! diff manifest.json.tmp ddg/manifest.json > /dev/null - mv manifest.json.tmp ddg/manifest.json - - # Delete unused search engine configs - cp -rv /usr/share/mozilla/searchplugins/* . - find -mindepth 1 -maxdepth 1 \ - -not -name ddg \ - -not -name duckduckgo-html \ - -not -name duckduckgo-lite \ - -not -name internet-archive \ - -not -name parabola-labs \ - -not -name parabola-packages \ - -not -name parabola-wiki \ - -not -name searx \ - -not -name wikipedia \ - -not -name yacy \ - -not -name list.json \ - -exec rm -rf {} \; - - # Sanity-check search-engines patching - local engines_err_msg="search-engines patching needs re-working" - jq < list.json || ! echo "${engines_err_msg}" - - popd > /dev/null + # let's use icecat's default search-engines ## libre patching ## - # Remove remaining non-free bits - echo "applying 9003-misc-libre.patch" - patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9003-misc-libre.patch + # let's assume that icecat is already FSDG-fit upstream } build() { @@ -260,12 +252,14 @@ build() { ## [ARCH-SPECIFIC BUILD ENV] ## - case "${CARCH}" in + case ${CARCH} in armv7h) -# TODO: re-work for armv7h -# export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off" -# export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" - ;; + export MOZ_DEBUG_FLAGS=" " + export CFLAGS+=" -g0" + export CXXFLAGS+=" -g0" + export LDFLAGS+=" -Wl,--no-keep-memory" + export RUSTFLAGS="-Cdebuginfo=0" + ;; i686) # -fno-plt with cross-LTO -> LLVM ERROR: Function Import: link error CFLAGS="${CFLAGS/-fno-plt/}" @@ -274,11 +268,18 @@ build() { # disable LTO (clang has issues on IA32) export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off" export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" - ;; + + # libvpx has some hard-coded compiler flags for MMX, SSE, SSE2, use the correct one + # per CARCH (75.0 uses an intrisic _mm_empty now, which required the corresponding + # architecture flag to be preset - before it was merely embedding some assembly + # code with EMMS + export CFLAGS+=" -mmmx" + export CXXFLAGS+=" -mmmx" + ;; x86_64) - ;; + ;; *) echo "no [ARCH-SPECIFIC BUILD ENV] for arch: ${CARCH}" ; return 1 ; - ;; + ;; esac export CFLAGS export CXXFLAGS @@ -287,16 +288,18 @@ build() { ## [ARCH-SPECIFIC BUILD CONFIG] ## case ${CARCH} in - armv7h) -# TODO: re-work for armv7h + armv7h) ;; - i686) - # avoid excessive debug symbols in rust leading to out-of-memory situations - sed -i "s/debug_info = '\''2'\''/debug_info = '\''0'\''/" build/moz.configure/toolchain.configure + i686) + # /usr/bin/ld.bfd: error: libxul.so(.debug_info) is too large (0x54c5369a bytes) + options=( ${options[*]/\!strip/} ) + + # avoid excessive debug symbols in rust leading to out-of-memory situations + sed -i "s/debug_info = '\''2'\''/debug_info = '\''0'\''/" build/moz.configure/toolchain.configure ;; - x86_64) + x86_64) ;; - *) echo "no [ARCH-SPECIFIC BUILD CONFIG] for arch: ${CARCH}" ; return 1 ; + *) echo "no [ARCH-SPECIFIC BUILD CONFIG] for arch: ${CARCH}" ; return 1 ; ;; esac @@ -334,10 +337,10 @@ END return 1 fi - echo "Removing instrumented browser..." - ./mach clobber + echo "Removing instrumented browser..." + ./mach clobber - cat >.mozconfig ../mozconfig - <.mozconfig ../mozconfig - < "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf + + # disable stripping in mozconfig. (insists to use llvm-strip which runs + # out of memory on libxul.so). Now 2.5 GB can be stripped to 166 MB, so we do + # that with the normal 'strip' from binutils after 'mach install' + strip "$pkgdir/usr/lib/$pkgname/libxul.so" ;; x86_64) ;; diff --git a/libre/icecat/arm.patch b/libre/icecat/arm.patch new file mode 100644 index 000000000..9e2ed1510 --- /dev/null +++ b/libre/icecat/arm.patch @@ -0,0 +1,15 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=1526653 + +diff --git a/js/src/wasm/WasmSignalHandlers.cpp.orig b/js/src/wasm/WasmSignalHandlers.cpp +index 636537f..0f3461a 100644 +--- a/js/src/wasm/WasmSignalHandlers.cpp.orig ++++ b/js/src/wasm/WasmSignalHandlers.cpp +@@ -244,7 +244,7 @@ using mozilla::DebugOnly; + // emulation here. + + #if defined(__linux__) && defined(__arm__) +-# define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS ++//# define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS + #endif + + #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS diff --git a/libre/icecat/avoid-libxul-OOM-python-check.patch b/libre/icecat/avoid-libxul-OOM-python-check.patch new file mode 100644 index 000000000..632281134 --- /dev/null +++ b/libre/icecat/avoid-libxul-OOM-python-check.patch @@ -0,0 +1,30 @@ +diff -rauN a/config/rules.mk b/config/rules.mk +--- a/config/rules.mk 2020-10-13 20:28:50.994026769 +0200 ++++ b/config/rules.mk 2020-10-13 20:29:06.594023940 +0200 +@@ -470,7 +470,7 @@ + $(LINKER) -OUT:$@ -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_OBJS) $(filter %.res,$^) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS) + else # !WINNT || GNU_CC + $(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) $($(notdir $@)_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS) +- $(call py_action,check_binary,--target $@) ++# $(call py_action,check_binary,--target $@) + endif # WINNT && !GNU_CC + + ifdef ENABLE_STRIP +@@ -514,7 +514,7 @@ + $(LINKER) -out:$@ -pdb:$(LINK_PDBFILE) $($@_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS) + else + $(call EXPAND_CC_OR_CXX,$@) $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) -o $@ $($@_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS) +- $(call py_action,check_binary,--target $@) ++# $(call py_action,check_binary,--target $@) + endif # WINNT && !GNU_CC + + ifdef ENABLE_STRIP +@@ -594,7 +594,7 @@ + $(RM) $@ + endif + $(MKSHLIB) $($@_OBJS) $(filter %.res,$^) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) +- $(call py_action,check_binary,--target $@) ++# $(call py_action,check_binary,--target $@) + + ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) + endif # WINNT && !GCC diff --git a/libre/icecat/build-arm-libopus.patch b/libre/icecat/build-arm-libopus.patch new file mode 100644 index 000000000..1b3f31b58 --- /dev/null +++ b/libre/icecat/build-arm-libopus.patch @@ -0,0 +1,12 @@ +diff -up firefox-66.0/media/libopus/silk/arm/arm_silk_map.c.old firefox-66.0/media/libopus/silk/arm/arm_silk_map.c +--- firefox-66.0/media/libopus/silk/arm/arm_silk_map.c.old 2019-03-12 21:07:35.356677522 +0100 ++++ firefox-66.0/media/libopus/silk/arm/arm_silk_map.c 2019-03-12 21:07:42.937693394 +0100 +@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. + # include "config.h" + #endif + +-#include "main_FIX.h" ++#include "fixed/main_FIX.h" + #include "NSQ.h" + #include "SigProc_FIX.h" + diff --git a/libre/icecat/rust-static-disable-network-test-on-static-libraries.patch b/libre/icecat/rust-static-disable-network-test-on-static-libraries.patch index 08915653a..c9ae89cb4 100644 --- a/libre/icecat/rust-static-disable-network-test-on-static-libraries.patch +++ b/libre/icecat/rust-static-disable-network-test-on-static-libraries.patch @@ -1,26 +1,31 @@ ---- config/makefiles/rust.mk -+++ config/makefiles/rust.mk -@@ -304,15 +304,15 @@ +diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk +--- a/config/makefiles/rust.mk 2020-10-13 20:23:09.920635480 +0200 ++++ b/config/makefiles/rust.mk 2020-10-13 20:24:02.273994137 +0200 +@@ -324,17 +324,17 @@ # the chance of proxy bypasses originating from rust code. - # The check only works when rust code is built with -Clto. + # The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS. # Sanitizers and sancov also fail because compiler-rt hooks network functions. -ifndef MOZ_PROFILE_GENERATE -ifeq ($(OS_ARCH), Linux) -ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) +-ifndef MOZ_LTO_RUST_CROSS -ifneq (,$(filter -Clto,$(cargo_rustc_flags))) - $(call py_action,check_binary,--target --networking $@) -endif -endif -endif -endif +-endif +#ifndef MOZ_PROFILE_GENERATE +#ifeq ($(OS_ARCH), Linux) +#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) ++#ifndef MOZ_LTO_RUST +#ifneq (,$(filter -Clto,$(cargo_rustc_flags))) +# $(call py_action,check_binary,--target --networking $@) +#endif +#endif +#endif ++#endif +#endif force-cargo-library-check: diff --git a/libre/icecat/rust_1.48.patch.gz b/libre/icecat/rust_1.48.patch.gz deleted file mode 100644 index eb1577e33..000000000 Binary files a/libre/icecat/rust_1.48.patch.gz and /dev/null differ diff --git a/libre/icecat/searchplugins_list.json b/libre/icecat/searchplugins_list.json deleted file mode 100644 index d4f142da6..000000000 --- a/libre/icecat/searchplugins_list.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "default": { - "searchDefault": "DuckDuckGo", - "searchOrder": [ "DuckDuckGo" ], - "visibleDefaultEngines": [ - "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-en", "searx", "wikipedia", "yacy" - ] - }, - "regionOverrides": { - }, - "locales": { - "en-US": { - "default": { - "visibleDefaultEngines": [ - "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-en", "searx", "wikipedia", "yacy" - ] - } - }, - "eo": { - "default": { - "visibleDefaultEngines": [ - "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-eo", "searx", "wikipedia-eo", "yacy" - ] - } - }, - "es-ES": { - "default": { - "visibleDefaultEngines": [ - "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-es", "searx", "wikipedia-es", "yacy" - ] - } - }, - "fr": { - "default": { - "visibleDefaultEngines": [ - "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-fr", "searx", "wikipedia-fr", "yacy" - ] - } - }, - "gl": { - "default": { - "visibleDefaultEngines": [ - "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-gl", "searx", "wikipedia-gl", "yacy" - ] - } - }, - "it": { - "default": { - "visibleDefaultEngines": [ - "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-it", "searx", "wikipedia-it", "yacy" - ] - } - }, - "pl": { - "default": { - "visibleDefaultEngines": [ - "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-pl", "searx", "wikipedia-pl", "yacy" - ] - } - }, - "pt-BR": { - "default": { - "visibleDefaultEngines": [ - "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-pt", "searx", "wikipedia-pt", "yacy" - ] - } - } - } -} -- cgit v1.2.3