Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • trisquel/package-helpers
  • aklis/package-helpers
  • leny2010/package-helpers
  • fr33domlover/package-helpers
  • Legimet/package-helpers
  • ralphtheninja/package-helpers
  • damo22/package-helpers
  • wherrfrye/package-helpers
  • habs/package-helpers
  • pehjota/package-helpers
  • kpengboy/package-helpers
  • alvaro/package-helpers
  • salman/package-helpers
  • pabloyoyoista/package-helpers
  • mixalis/package-helpers
  • jorgesumle/package-helpers
  • a_slacker_here/package-helpers
  • chaosmonk/package-helpers
  • Beformed/package-helpers
  • dknight/package-helpers
  • proninyaroslav/package-helpers
  • adfeno/package-helpers
  • snd/package-helpers
  • davidpgil/package-helpers
  • diopon/package-helpers
  • ruben/package-helpers
  • bandali/package-helpers
  • joshaspinall/package-helpers
  • GNUtoo/package-helpers
  • Ark74/package-helpers
  • dragestil/package-helpers
  • bill-auger/package-helpers
  • andi89gi/package-helpers
  • Fikar/package-helpers
  • davidl/package-helpers
  • jas/package-helpers
  • parodper/package-helpers
  • David_Hedlund/package-helpers
  • dinomug/package-helpers
  • bf/package-helpers
  • hartkemd/package-helpers
  • del111/package-helpers
  • jxself/package-helpers
  • JacobK/package-helpers
44 results
Show changes
Commits on Source (49)
Hide whitespace changes
Inline Side-by-side
Showing
with 1290 additions and 119 deletions
CONTRIBUTING.md
View file @ 6b5ae172
...@@ -8,7 +8,7 @@ Whether you've got a bugfix, documentation update, or new feature for us, these ...@@ -8,7 +8,7 @@ Whether you've got a bugfix, documentation update, or new feature for us, these
1. Install needed packages for running the helpers 1. Install needed packages for running the helpers
``` ```
sudo apt-get install cdbs devscripts dpkg-dev git gnupg patch quilt rpl sed sudo apt-get install cdbs devscripts dpkg-dev git gnupg2 patch quilt rpl sed sbuild
``` ```
1. Get the Trisquel build environment and follow the [README](https://gitlab.trisquel.org/trisquel/trisquel-builder/-/blob/master/README.md) to setup your system for building 1. Get the Trisquel build environment and follow the [README](https://gitlab.trisquel.org/trisquel/trisquel-builder/-/blob/master/README.md) to setup your system for building
......
README.md
View file @ 6b5ae172
...@@ -39,7 +39,7 @@ Those are the steps done by the helpers: ...@@ -39,7 +39,7 @@ Those are the steps done by the helpers:
* You don't need to use sudo in order to run those scripts, but some extra packages are needed: * You don't need to use sudo in order to run those scripts, but some extra packages are needed:
`sudo apt-get install cdbs devscripts dpkg-dev git gnupg patch quilt rpl sed python3-jsonschema python-pathlib` `sudo apt-get install cdbs devscripts dpkg-dev git gnupg2 patch quilt rpl sed sbuild`
* Take care to use the right sourcePackageName, many source packages produce * Take care to use the right sourcePackageName, many source packages produce
several binary packages. `apt-cache showsrc binary-package` can help you. several binary packages. `apt-cache showsrc binary-package` can help you.
......
helpers/DATA/accountsservice/daemon_Allow_SystemAccount-false_to_be_set_in_cache_file.patch 0 → 100644
View file @ 6b5ae172
From 985aed055313f968003c2515087974b2b934cf83 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 8 Sep 2021 16:38:17 -0400
Subject: [PATCH] daemon: Allow SystemAccount=false to be set in cache file
At the moment we do dodgy checks based on uid to decide whether or not
an account is a system account.
For legacy reasons, sometimes normal users have really low UIDs.
This commit reshuffles things, so the cache file "wins" for deciding
whether or not a user is a system user.
---
src/daemon.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/daemon.c b/src/daemon.c
index 122b652..1760ef2 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -247,6 +247,14 @@ entry_generator_fgetpwent (Daemon *daemon,
if (shadow_entry_buffers != NULL) {
*spent = &shadow_entry_buffers->spbuf;
}
+
+ /* Skip system users... */
+ if (!user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, (*spent)? (*spent)->sp_pwdp : NULL)) {
+ g_debug ("skipping user: %s", pwent->pw_name);
+
+ return entry_generator_fgetpwent (daemon, users, state, spent);
+ }
+
return pwent;
}
}
@@ -401,12 +409,6 @@ load_entries (Daemon *daemon,
if (pwent == NULL)
break;
- /* Skip system users... */
- if (!explicitly_requested && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, spent? spent->sp_pwdp : NULL)) {
- g_debug ("skipping user: %s", pwent->pw_name);
- continue;
- }
-
/* Only process users that haven't been processed yet.
* We do always make sure entries get promoted
* to "cached" status if they are supposed to be
@@ -990,7 +992,6 @@ finish_list_cached_users (ListUserData *data)
GHashTableIter iter;
gpointer key, value;
uid_t uid;
- const gchar *shell;
object_paths = g_ptr_array_new ();
@@ -1000,9 +1001,8 @@ finish_list_cached_users (ListUserData *data)
User *user = value;
uid = user_get_uid (user);
- shell = user_get_shell (user);
- if (!user_classify_is_human (uid, name, shell, NULL)) {
+ if (user_get_system_account (user)) {
g_debug ("user %s %ld excluded", name, (long) uid);
continue;
}
--
GitLab
helpers/DATA/apt-mirror/Trisquel-mirror.list
View file @ 6b5ae172
...@@ -14,14 +14,14 @@ set _tilde 0 ...@@ -14,14 +14,14 @@ set _tilde 0
# #
############# end config ############## ############# end config ##############
deb http://archive.trisquel.info/trisquel @CODENAME@ main deb http://archive.trisquel.org/trisquel @CODENAME@ main
deb http://archive.trisquel.info/trisquel @CODENAME@-security main deb http://archive.trisquel.org/trisquel @CODENAME@-security main
deb http://archive.trisquel.info/trisquel @CODENAME@-updates main deb http://archive.trisquel.org/trisquel @CODENAME@-updates main
deb http://archive.trisquel.info/trisquel @CODENAME@-backports main deb http://archive.trisquel.org/trisquel @CODENAME@-backports main
deb-src http://archive.trisquel.info/trisquel @CODENAME@ main deb-src http://archive.trisquel.org/trisquel @CODENAME@ main
deb-src http://archive.trisquel.info/trisquel @CODENAME@-security main deb-src http://archive.trisquel.org/trisquel @CODENAME@-security main
deb-src http://archive.trisquel.info/trisquel @CODENAME@-updates main deb-src http://archive.trisquel.org/trisquel @CODENAME@-updates main
deb-src http://archive.trisquel.info/trisquel @CODENAME@-backports main deb-src http://archive.trisquel.org/trisquel @CODENAME@-backports main
clean http://archive.trisquel.info/trisquel clean http://archive.trisquel.org/trisquel
helpers/DATA/debootstrap/aramo 0 → 120000
View file @ 6b5ae172
trisquel
\ No newline at end of file
helpers/DATA/debootstrap/trisquel
View file @ 6b5ae172
case $ARCH in default_mirror http://archive.trisquel.org/trisquel
amd64|i386)
default_mirror http://archive.trisquel.org/trisquel
;;
*)
default_mirror http://ports.trisquel.org/trisquel
;;
esac
mirror_style release mirror_style release
download_style apt download_style apt
finddebs_style from-indices finddebs_style from-indices
......
helpers/DATA/debootstrap/trisquel-common
View file @ 6b5ae172
case $ARCH in default_mirror http://archive.trisquel.org/trisquel
amd64|i386)
default_mirror http://archive.trisquel.org/trisquel
;;
*)
default_mirror http://ports.trisquel.org/trisquel
;;
esac
mirror_style release mirror_style release
download_style apt download_style apt
finddebs_style from-indices finddebs_style from-indices
......
helpers/DATA/distro-info-data/trisquel.csv
View file @ 6b5ae172
...@@ -11,3 +11,4 @@ version,codename,series,created,release,eol ...@@ -11,3 +11,4 @@ version,codename,series,created,release,eol
8.0 LTS,Flidas,flidas,2015-10-22,2018-04-18,2021-04-21 8.0 LTS,Flidas,flidas,2015-10-22,2018-04-18,2021-04-21
9.0 LTS,Etiona,etiona,2017-10-19,2020-10-16,2023-04-26 9.0 LTS,Etiona,etiona,2017-10-19,2020-10-16,2023-04-26
10.0 LTS,Nabia,nabia,2019-10-17,2021-12-16,2025-04-23 10.0 LTS,Nabia,nabia,2019-10-17,2021-12-16,2025-04-23
11.0 LTS,Aramo,aramo,2021-10-14,2027-04-21,2027-04-21
helpers/DATA/firefox/bookmarks.html.in deleted 100644 → 0
View file @ 60bc04ac
#filter substitution
#include @BOOKMARKS_INCLUDE_PATH@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE NETSCAPE-Bookmark-file-1>
<meta charset="UTF-8">
<title>@bookmarks_title@</title>
<h1>@bookmarks_heading@</h1>
<dl><p>
<dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt>
<dd>@bookmarks_toolbarfolder_description@
<dl>
</dl>
</dl>
helpers/DATA/firefox/branding/content/about-wordmark.svg
View file @ 6b5ae172
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1" version="1.1"
id="aboutWordmark" id="aboutWordmark"
x="0px" x="0px"
...@@ -15,40 +8,66 @@ ...@@ -15,40 +8,66 @@
height="38px" height="38px"
viewBox="0 0 130 38" viewBox="0 0 130 38"
xml:space="preserve" xml:space="preserve"
inkscape:version="0.48.4 r9939" inkscape:version="1.2 (1:1.2+202205241504+da316b6974)"
sodipodi:docname="about-wordmark.svg"><metadata sodipodi:docname="about-wordmark.svg"
id="metadata9"><rdf:RDF><cc:Work xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs xmlns="http://www.w3.org/2000/svg"
id="defs7" /><sodipodi:namedview xmlns:svg="http://www.w3.org/2000/svg"
pagecolor="#ffffff" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
bordercolor="#666666" xmlns:cc="http://creativecommons.org/ns#"
borderopacity="1" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
objecttolerance="10" id="metadata9"><rdf:RDF><cc:Work
gridtolerance="10" rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
guidetolerance="10" rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
inkscape:pageopacity="0" id="defs7" /><sodipodi:namedview
inkscape:pageshadow="2" pagecolor="#ffffff"
inkscape:window-width="1364" bordercolor="#666666"
inkscape:window-height="711" borderopacity="1"
id="namedview5" objecttolerance="10"
showgrid="false" gridtolerance="10"
inkscape:zoom="9.788073" guidetolerance="10"
inkscape:cx="48.569985" inkscape:pageopacity="0"
inkscape:cy="11.314337" inkscape:pageshadow="2"
inkscape:window-x="0" inkscape:window-width="1918"
inkscape:window-y="0" inkscape:window-height="1008"
inkscape:window-maximized="1" id="namedview5"
inkscape:current-layer="aboutWordmark" /><text showgrid="false"
xml:space="preserve" inkscape:zoom="4.8940365"
style="font-size:28.27791785999999874px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#6f6f6f;fill-opacity:1;stroke:none;font-family:Sans" inkscape:cx="77.952014"
x="0.4501974" inkscape:cy="4.9039275"
y="37.289883" inkscape:window-x="1366"
id="text2986" inkscape:window-y="0"
sodipodi:linespacing="125%"><tspan inkscape:window-maximized="1"
sodipodi:role="line" inkscape:current-layer="aboutWordmark"
id="tspan2988" inkscape:showpageshadow="2"
x="0.4501974" inkscape:pagecheckerboard="0"
y="37.289883" inkscape:deskcolor="#d1d1d1" /><g
style="font-weight:bold;-inkscape-font-specification:Sans Bold;fill:#6f6f6f;fill-opacity:1">Abrowser</tspan></text> aria-label="Abrowser"
</svg> id="text2986"
\ No newline at end of file style="line-height:0%;letter-spacing:0px;word-spacing:0px;fill:#6f6f6f"><path
d="M 10.419262,20.624147 4.9514648,37.289883 H 0.54685038 L 8.016745,17.186063 h 2.802936 z M 14.961952,37.289883 9.4803473,20.624147 9.0385051,17.186063 h 2.8305519 l 7.511317,20.10382 z M 14.713416,29.80618 v 3.244779 H 4.0953955 V 29.80618 Z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path166" /><path
d="m 20.995859,16.081457 h 3.97658 v 17.784149 l -0.400419,3.424277 h -3.576161 z m 13.434765,13.586648 v 0.289959 q 0,1.670715 -0.358997,3.06528 -0.345189,1.394564 -1.076991,2.416324 -0.731801,1.007953 -1.822599,1.574063 -1.07699,0.552303 -2.540592,0.552303 -1.36695,0 -2.374902,-0.552303 -0.994145,-0.552302 -1.670716,-1.560255 -0.676571,-1.007952 -1.090798,-2.361094 -0.414227,-1.353142 -0.62134,-2.95482 v -0.635148 q 0.207113,-1.601678 0.62134,-2.95482 0.414227,-1.353142 1.090798,-2.361094 0.676571,-1.007953 1.670716,-1.560255 0.994145,-0.552303 2.347287,-0.552303 1.477409,0 2.568207,0.56611 1.104606,0.552303 1.822599,1.574063 0.731802,1.007953 1.076991,2.402517 0.358997,1.380757 0.358997,3.051473 z m -3.97658,0.289959 v -0.289959 q 0,-0.9113 -0.138076,-1.712139 -0.124268,-0.814646 -0.441842,-1.422179 -0.317574,-0.621341 -0.869877,-0.980338 -0.538495,-0.358997 -1.394564,-0.358997 -0.814647,0 -1.380757,0.276152 -0.566111,0.276151 -0.938915,0.773224 -0.358997,0.497072 -0.552303,1.187451 -0.179498,0.67657 -0.207113,1.491217 v 1.808792 q 0.04142,1.090797 0.358997,1.933059 0.331381,0.828454 0.994145,1.311719 0.67657,0.469458 1.753561,0.469458 0.842262,0 1.394564,-0.331382 0.552303,-0.331382 0.85607,-0.938915 0.317574,-0.607533 0.441842,-1.422179 0.124268,-0.828455 0.124268,-1.794984 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path168" /><path
d="m 40.878758,25.60868 v 11.681203 h -3.97658 v -14.93979 h 3.741851 z m 4.501267,-3.35524 -0.06904,3.686621 q -0.289959,-0.04142 -0.704186,-0.06904 -0.400419,-0.04142 -0.731801,-0.04142 -0.842262,0 -1.463602,0.220921 -0.607533,0.207113 -1.02176,0.62134 -0.40042,0.40042 -0.607533,1.007953 -0.193306,0.593725 -0.220921,1.353142 L 39.760345,28.78442 q 0,-1.449794 0.289959,-2.66486 0.289959,-1.228874 0.842261,-2.140174 0.566111,-0.911299 1.380757,-1.408372 0.814647,-0.497072 1.864022,-0.497072 0.331382,0 0.676571,0.05523 0.345189,0.04142 0.56611,0.124268 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path170" /><path
d="m 46.194673,29.971871 v -0.289959 q 0,-1.6431 0.469457,-3.023857 0.469457,-1.394565 1.366949,-2.416325 0.897492,-1.02176 2.209211,-1.58787 1.311719,-0.579918 3.01005,-0.579918 1.698331,0 3.023858,0.579918 1.325526,0.56611 2.223018,1.58787 0.9113,1.02176 1.380757,2.416325 0.469458,1.380757 0.469458,3.023857 v 0.289959 q 0,1.629293 -0.469458,3.023858 -0.469457,1.380757 -1.380757,2.416324 -0.897492,1.02176 -2.209211,1.587871 -1.311719,0.56611 -3.01005,0.56611 -1.698331,0 -3.023857,-0.56611 -1.311719,-0.566111 -2.223019,-1.587871 -0.897492,-1.035567 -1.366949,-2.416324 -0.469457,-1.394565 -0.469457,-3.023858 z m 3.976579,-0.289959 v 0.289959 q 0,0.938915 0.165691,1.753561 0.165691,0.814647 0.524688,1.435988 0.372804,0.607533 0.96653,0.952722 0.593725,0.345189 1.449794,0.345189 0.828454,0 1.42218,-0.345189 0.593725,-0.345189 0.952722,-0.952722 0.358997,-0.621341 0.524688,-1.435988 0.179498,-0.814646 0.179498,-1.753561 v -0.289959 q 0,-0.911299 -0.179498,-1.712138 -0.165691,-0.814647 -0.538495,-1.435987 -0.358997,-0.635149 -0.952723,-0.994145 -0.593725,-0.358997 -1.435987,-0.358997 -0.842261,0 -1.435987,0.358997 -0.579918,0.358996 -0.952722,0.994145 -0.358997,0.62134 -0.524688,1.435987 -0.165691,0.800839 -0.165691,1.712138 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path172" /><path
d="m 67.057907,33.423763 3.106703,-11.07367 h 2.526785 l -0.814646,4.349384 -3.106703,10.590406 h -2.112558 z m -1.574062,-11.07367 2.223018,11.059863 0.207114,3.879927 H 65.428614 L 61.64534,22.350093 Z m 10.05191,10.880364 2.167788,-10.880364 h 3.852311 l -3.783273,14.93979 h -2.471555 z m -2.49917,-10.880364 3.092895,10.990825 0.428035,3.948965 H 74.431149 L 71.324446,26.713285 70.537415,22.350093 Z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path174" /><path
d="m 91.635383,33.16142 q 0,-0.428035 -0.248537,-0.773224 -0.248536,-0.345189 -0.925107,-0.635148 -0.662763,-0.303767 -1.919252,-0.552303 -1.13222,-0.248536 -2.112558,-0.621341 -0.96653,-0.386612 -1.684523,-0.925107 -0.704186,-0.538495 -1.104606,-1.270296 -0.400419,-0.745609 -0.400419,-1.698331 0,-0.938915 0.400419,-1.767369 0.414227,-0.828454 1.173644,-1.463602 0.773224,-0.648956 1.877829,-1.007953 1.118413,-0.372804 2.512978,-0.372804 1.946867,0 3.341431,0.621341 1.408372,0.62134 2.153981,1.712138 0.759416,1.07699 0.759416,2.457747 h -3.97658 q 0,-0.579918 -0.248536,-1.035567 -0.234729,-0.469458 -0.745609,-0.731802 -0.497072,-0.276151 -1.297911,-0.276151 -0.662763,0 -1.146028,0.234729 -0.483265,0.220921 -0.745609,0.607533 -0.248536,0.372804 -0.248536,0.828454 0,0.345189 0.138075,0.621341 0.151884,0.262343 0.483265,0.483264 0.331382,0.220922 0.85607,0.414227 0.538495,0.179499 1.325526,0.331382 1.615486,0.331382 2.885782,0.869877 1.270296,0.524688 2.015905,1.435987 0.745609,0.897492 0.745609,2.361094 0,0.994145 -0.441842,1.822599 -0.441843,0.828455 -1.270297,1.449795 -0.828454,0.607533 -1.98829,0.952722 -1.146028,0.331382 -2.582015,0.331382 -2.084943,0 -3.534738,-0.745609 -1.435987,-0.745608 -2.181595,-1.891637 -0.731802,-1.159835 -0.731802,-2.374901 h 3.769467 q 0.02761,0.814646 0.414227,1.311719 0.400419,0.497072 1.007952,0.717993 0.621341,0.220921 1.339334,0.220921 0.773224,0 1.284104,-0.207113 0.51088,-0.220921 0.773224,-0.579918 0.276152,-0.372804 0.276152,-0.856069 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path176" /><path
d="m 104.95968,37.566034 q -1.73975,0 -3.12051,-0.552303 -1.38075,-0.56611 -2.347285,-1.560255 -0.952722,-0.994145 -1.463602,-2.305864 -0.51088,-1.325527 -0.51088,-2.816744 v -0.552303 q 0,-1.698331 0.483265,-3.106703 0.483265,-1.408372 1.380757,-2.443939 0.911295,-1.035568 2.209215,-1.587871 1.29791,-0.56611 2.9272,-0.56611 1.58787,0 2.81674,0.524688 1.22888,0.524687 2.05733,1.491217 0.84226,0.96653 1.2703,2.319672 0.42803,1.339334 0.42803,2.982434 v 1.656909 H 99.215734 v -2.651054 h 7.966966 v -0.303766 q 0,-0.828454 -0.30377,-1.47741 -0.28995,-0.662763 -0.88368,-1.049375 -0.59373,-0.386612 -1.51883,-0.386612 -0.78703,0 -1.35314,0.345189 -0.56611,0.345189 -0.92511,0.96653 -0.34519,0.621341 -0.52469,1.463602 -0.16569,0.828454 -0.16569,1.822599 v 0.552303 q 0,0.897492 0.24854,1.656908 0.26234,0.759417 0.7318,1.311719 0.48326,0.552303 1.15983,0.85607 0.69038,0.303766 1.56026,0.303766 1.07699,0 2.0021,-0.414227 0.93891,-0.428035 1.61548,-1.284104 l 1.93306,2.098751 q -0.46946,0.67657 -1.2841,1.297911 -0.80084,0.621341 -1.93306,1.02176 -1.13222,0.386612 -2.58202,0.386612 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path178" /><path
d="m 117.33126,25.60868 v 11.681203 h -3.97658 v -14.93979 h 3.74186 z m 4.50127,-3.35524 -0.069,3.686621 q -0.28995,-0.04142 -0.70418,-0.06904 -0.40042,-0.04142 -0.7318,-0.04142 -0.84226,0 -1.46361,0.220921 -0.60753,0.207113 -1.02176,0.62134 -0.40041,0.40042 -0.60753,1.007953 -0.1933,0.593725 -0.22092,1.353142 l -0.80084,-0.248537 q 0,-1.449794 0.28996,-2.66486 0.28996,-1.228874 0.84226,-2.140174 0.56611,-0.911299 1.38076,-1.408372 0.81465,-0.497072 1.86402,-0.497072 0.33138,0 0.67657,0.05523 0.34519,0.04142 0.56611,0.124268 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
id="path180" /></g>
</svg>
helpers/DATA/firefox/branding/content/firefox-wordmark.svg
View file @ 6b5ae172
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg <svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1" version="1.1"
id="aboutWordmark" id="aboutWordmark"
x="0px" x="0px"
...@@ -15,11 +8,18 @@ ...@@ -15,11 +8,18 @@
height="21.484577" height="21.484577"
viewBox="0 0 121.3271 21.484577" viewBox="0 0 121.3271 21.484577"
xml:space="preserve" xml:space="preserve"
inkscape:version="1.0.2 (1.0.2+r75+1)" inkscape:version="1.2 (1:1.2+202205241504+da316b6974)"
sodipodi:docname="firefox-wordmark.svg"><metadata sodipodi:docname="firefox-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/"><metadata
id="metadata9"><rdf:RDF><cc:Work id="metadata9"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs7" /><sodipodi:namedview id="defs7" /><sodipodi:namedview
pagecolor="#ffffff" pagecolor="#ffffff"
bordercolor="#666666" bordercolor="#666666"
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-width="1918" inkscape:window-width="1918"
inkscape:window-height="1010" inkscape:window-height="1008"
id="namedview5" id="namedview5"
showgrid="false" showgrid="false"
inkscape:zoom="3.4606064" inkscape:zoom="3.4606064"
inkscape:cx="27.662416" inkscape:cx="27.885286"
inkscape:cy="-18.237972" inkscape:cy="-18.493869"
inkscape:window-x="0" inkscape:window-x="1366"
inkscape:window-y="0" inkscape:window-y="0"
inkscape:window-maximized="1" inkscape:window-maximized="1"
inkscape:current-layer="aboutWordmark" inkscape:current-layer="aboutWordmark"
...@@ -44,15 +44,35 @@ ...@@ -44,15 +44,35 @@
fit-margin-top="0" fit-margin-top="0"
fit-margin-left="0" fit-margin-left="0"
fit-margin-right="0" fit-margin-right="0"
fit-margin-bottom="0" /><text fit-margin-bottom="0"
xml:space="preserve" inkscape:showpageshadow="2"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none" inkscape:pagecheckerboard="0"
x="-0.096652985" inkscape:deskcolor="#d1d1d1" /><g
y="21.208426" aria-label="Abrowser"
id="text2986"><tspan id="text2986"
sodipodi:role="line" style="line-height:0%;letter-spacing:0px;word-spacing:0px;fill:#808080"><path
id="tspan2988" d="M 9.8724116,4.5426901 4.4046144,21.208426 H 0 L 7.4698947,1.1046055 H 10.272831 Z M 14.415102,21.208426 8.9334969,4.5426901 8.4916547,1.1046055 h 2.8305513 l 7.511318,20.1038205 z m -0.248537,-7.483703 v 3.244779 H 3.5485452 v -3.244779 z"
x="-0.096652985" style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
y="21.208426" id="path202" /><path
style="font-weight:bold;font-size:28.2779px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';fill:#ffffff;fill-opacity:1">Abrowser</tspan></text> d="m 20.449009,0 h 3.97658 v 17.784148 l -0.40042,3.424278 h -3.57616 z m 13.434764,13.586648 v 0.289959 q 0,1.670715 -0.358997,3.06528 -0.345189,1.394564 -1.07699,2.416324 -0.731801,1.007953 -1.822599,1.574063 -1.07699,0.552303 -2.540593,0.552303 -1.366949,0 -2.374901,-0.552303 -0.994145,-0.552303 -1.670716,-1.560255 -0.676571,-1.007953 -1.090798,-2.361094 -0.414227,-1.353142 -0.621341,-2.95482 v -0.635148 q 0.207114,-1.601678 0.621341,-2.95482 0.414227,-1.3531417 1.090798,-2.3610942 0.676571,-1.0079525 1.670716,-1.5602552 0.994145,-0.5523028 2.347286,-0.5523028 1.47741,0 2.568208,0.5661103 1.104606,0.5523028 1.822599,1.5740629 0.731801,1.0079525 1.07699,2.402517 0.358997,1.380757 0.358997,3.051473 z m -3.97658,0.289959 v -0.289959 q 0,-0.9113 -0.138075,-1.712139 Q 29.64485,11.059863 29.327276,10.45233 29.009701,9.8309889 28.457399,9.4719921 27.918904,9.1129953 27.062834,9.1129953 q -0.814646,0 -1.380757,0.2761514 -0.56611,0.2761514 -0.938914,0.7732243 -0.358997,0.497072 -0.552303,1.18745 -0.179498,0.676571 -0.207114,1.491218 v 1.808791 q 0.04142,1.090798 0.358997,1.93306 0.331382,0.828454 0.994145,1.311719 0.676571,0.469457 1.753561,0.469457 0.842262,0 1.394565,-0.331381 0.552303,-0.331382 0.856069,-0.938915 0.317574,-0.607533 0.441842,-1.42218 0.124268,-0.828454 0.124268,-1.794983 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path204" /><path
d="M 40.331907,9.5272224 V 21.208426 H 36.355328 V 6.2686362 h 3.741851 z m 4.501268,-3.3552392 -0.06904,3.6866209 q -0.289959,-0.041423 -0.704186,-0.069038 -0.40042,-0.041423 -0.731801,-0.041423 -0.842262,0 -1.463603,0.2209211 -0.607533,0.2071134 -1.02176,0.6213404 -0.400419,0.40042 -0.607533,1.007953 -0.193306,0.593725 -0.220921,1.353141 l -0.800839,-0.248536 q 0,-1.449795 0.289959,-2.664861 0.289959,-1.2288732 0.842262,-2.1401727 0.56611,-0.9112995 1.380757,-1.408372 0.814646,-0.4970725 1.864022,-0.4970725 0.331381,0 0.67657,0.05523 0.34519,0.041423 0.566111,0.1242681 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path206" /><path
d="m 45.647822,13.890414 v -0.289959 q 0,-1.643101 0.469458,-3.023857 0.469457,-1.3945648 1.366949,-2.4163249 0.897492,-1.0217601 2.209211,-1.5878704 1.311719,-0.5799179 3.01005,-0.5799179 1.698331,0 3.023857,0.5799179 1.325527,0.5661103 2.223019,1.5878704 0.911299,1.0217601 1.380757,2.4163249 0.469457,1.380756 0.469457,3.023857 v 0.289959 q 0,1.629293 -0.469457,3.023858 -0.469458,1.380757 -1.380757,2.416324 -0.897492,1.02176 -2.209211,1.587871 -1.311719,0.56611 -3.01005,0.56611 -1.698331,0 -3.023858,-0.56611 -1.311719,-0.566111 -2.223018,-1.587871 -0.897492,-1.035567 -1.366949,-2.416324 -0.469458,-1.394565 -0.469458,-3.023858 z m 3.97658,-0.289959 v 0.289959 q 0,0.938915 0.165691,1.753561 0.165691,0.814647 0.524687,1.435987 0.372805,0.607534 0.96653,0.952723 0.593726,0.345189 1.449795,0.345189 0.828454,0 1.42218,-0.345189 0.593725,-0.345189 0.952722,-0.952723 0.358997,-0.62134 0.524687,-1.435987 0.179499,-0.814646 0.179499,-1.753561 v -0.289959 q 0,-0.911299 -0.179499,-1.712138 Q 55.465004,11.07367 55.092199,10.45233 54.733202,9.8171813 54.139477,9.4581846 53.545752,9.0991878 52.70349,9.0991878 q -0.842262,0 -1.435987,0.3589968 -0.579918,0.3589967 -0.952723,0.9941454 -0.358996,0.62134 -0.524687,1.435987 -0.165691,0.800839 -0.165691,1.712138 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path208" /><path
d="M 66.511057,17.342306 69.61776,6.2686362 h 2.526785 L 71.329898,10.61802 68.223195,21.208426 H 66.110637 Z M 64.936994,6.2686362 67.160013,17.328499 67.367126,21.208426 H 64.881764 L 61.09849,6.2686362 Z M 74.988904,17.149 77.156692,6.2686362 h 3.852312 L 77.22573,21.208426 H 74.754175 Z M 72.489734,6.2686362 75.58263,17.259461 76.010664,21.208426 H 73.884299 L 70.777596,10.631828 69.990564,6.2686362 Z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path210" /><path
d="m 91.088532,17.079962 q 0,-0.428034 -0.248536,-0.773223 -0.248536,-0.34519 -0.925107,-0.635149 -0.662763,-0.303766 -1.919252,-0.552302 -1.132221,-0.248537 -2.112558,-0.621341 -0.96653,-0.386612 -1.684524,-0.925107 -0.704186,-0.538495 -1.104605,-1.270296 -0.40042,-0.745609 -0.40042,-1.698331 0,-0.9389149 0.40042,-1.767369 0.414227,-0.8284542 1.173643,-1.4636023 0.773224,-0.6489557 1.87783,-1.0079525 1.118413,-0.3728044 2.512977,-0.3728044 1.946867,0 3.341432,0.6213406 1.408372,0.6213406 2.15398,1.7121385 0.759417,1.0769904 0.759417,2.4577471 h -3.97658 q 0,-0.579918 -0.248536,-1.0355675 Q 90.453384,9.2786862 89.942504,9.0163424 89.445432,8.740191 88.644593,8.740191 q -0.662764,0 -1.146029,0.2347287 -0.483265,0.2209211 -0.745608,0.607533 -0.248537,0.3728043 -0.248537,0.8284543 0,0.345189 0.138076,0.62134 0.151883,0.262344 0.483265,0.483265 0.331382,0.220921 0.856069,0.414227 0.538495,0.179499 1.325527,0.331382 1.615485,0.331382 2.885782,0.869877 1.270296,0.524687 2.015905,1.435987 0.745608,0.897492 0.745608,2.361094 0,0.994145 -0.441842,1.822599 -0.441842,0.828454 -1.270296,1.449795 -0.828454,0.607533 -1.98829,0.952722 -1.146028,0.331382 -2.582015,0.331382 -2.084943,0 -3.534738,-0.745609 -1.435987,-0.745609 -2.181596,-1.891637 -0.731801,-1.159835 -0.731801,-2.374902 h 3.769466 q 0.02762,0.814647 0.414227,1.311719 0.40042,0.497073 1.007953,0.717994 0.621341,0.220921 1.339334,0.220921 0.773224,0 1.284104,-0.207113 0.51088,-0.220921 0.773224,-0.579918 0.276151,-0.372805 0.276151,-0.85607 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path212" /><path
d="m 104.41283,21.484577 q -1.73975,0 -3.12051,-0.552303 -1.380755,-0.56611 -2.347285,-1.560255 -0.952722,-0.994145 -1.463602,-2.305864 -0.51088,-1.325527 -0.51088,-2.816744 v -0.552303 q 0,-1.698331 0.483265,-3.106703 0.483264,-1.4083718 1.380756,-2.4439395 0.9113,-1.0355676 2.209216,-1.5878704 1.29791,-0.5661103 2.9272,-0.5661103 1.58787,0 2.81674,0.5246876 1.22888,0.5246876 2.05733,1.4912174 0.84226,0.9665299 1.2703,2.3196712 0.42803,1.339335 0.42803,2.982435 v 1.656908 H 98.668884 v -2.651053 h 7.966966 v -0.303766 q 0,-0.828454 -0.30377,-1.47741 -0.28995,-0.6627634 -0.88368,-1.0493753 -0.59373,-0.3866119 -1.51883,-0.3866119 -0.78703,0 -1.35314,0.3451892 -0.56611,0.3451892 -0.92511,0.96653 -0.34519,0.62134 -0.52469,1.463602 -0.16569,0.828454 -0.16569,1.822599 v 0.552303 q 0,0.897492 0.24854,1.656908 0.26234,0.759416 0.7318,1.311719 0.48326,0.552303 1.15983,0.856069 0.69038,0.303767 1.56026,0.303767 1.07699,0 2.0021,-0.414227 0.93891,-0.428035 1.61548,-1.284104 l 1.93306,2.09875 q -0.46946,0.676571 -1.2841,1.297912 -0.80084,0.62134 -1.93306,1.02176 -1.13222,0.386612 -2.58202,0.386612 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path214" /><path
d="M 116.78441,9.5272224 V 21.208426 h -3.97658 V 6.2686362 h 3.74186 z m 4.50127,-3.3552392 -0.069,3.6866209 q -0.28996,-0.041423 -0.70418,-0.069038 -0.40042,-0.041423 -0.7318,-0.041423 -0.84226,0 -1.46361,0.2209211 -0.60753,0.2071134 -1.02176,0.6213404 -0.40042,0.40042 -0.60753,1.007953 -0.1933,0.593725 -0.22092,1.353141 L 115.666,12.702963 q 0,-1.449795 0.28996,-2.664861 0.28996,-1.2288732 0.84226,-2.1401727 0.56611,-0.9112995 1.38076,-1.408372 0.81465,-0.4970725 1.86402,-0.4970725 0.33138,0 0.67657,0.05523 0.34519,0.041423 0.56611,0.1242681 z"
style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
id="path216" /></g>
</svg> </svg>
helpers/DATA/firefox/default-bookmarks.html 0 → 100644
View file @ 6b5ae172
#filter substitution
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE NETSCAPE-Bookmark-file-1>
<html>
<head>
<meta charset="UTF-8">
<!-- These localization links are not automatically applied to any XHR
response body and must be applied manually as well. They are included
so that viewing the file directly shows the results. -->
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="browser/profile/default-bookmarks.ftl"/>
<title data-l10n-id="default-bookmarks-title">default-bookmarks-title</title>
</head>
<body>
<h1 data-l10n-id="default-bookmarks-heading">default-bookmarks-heading</h1>
<dl><p>
<dt><h3 personal_toolbar_folder="true" data-l10n-id="default-bookmarks-toolbarfolder">Bookmarks Toolbar</h3></dt>
</dl>
</body>
</html>
helpers/DATA/firefox/newtab/hnode.ico 0 → 100644
View file @ 6b5ae172
helpers/DATA/firefox/newtab/hnode.ico

1.37 KiB

helpers/DATA/firefox/newtab/hnode.png 0 → 100644
View file @ 6b5ae172
helpers/DATA/firefox/newtab/hnode.png

62.3 KiB

helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch 0 → 100644
View file @ 6b5ae172
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,8 +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/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-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 @@
},
},
{
- 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",
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,7 +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/web-appearance-dark.svg
content/browser/preferences/web-appearance-light.svg
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 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg width="80" height="80" fill="context-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4 2h72a2 2 0 0 1 2 2v72a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2ZM0 4a4 4 0 0 1 4-4h72a4 4 0 0 1 4 4v72a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4Zm7.08 3.08h15.892v15.892H7.08V7.08Zm4.54 2.27H9.35V20.701H20.701V9.35h-9.08Zm18.163-2.27h4.541v2.27h2.27v2.27h-2.27v2.27h-2.27v2.271h4.54v-4.54h2.27V9.35h2.271v6.811h-2.27v2.27h2.27v4.541h-2.27v-2.27h-2.27v-2.27h-2.27v2.27h-2.271v-2.27h-2.27V7.08Zm0 13.622v-2.27h-2.27V9.35h-2.27v13.622h2.27v2.27h-9.081v2.271h-2.27v2.27H13.89v-4.54h-2.27v2.27H7.08v2.27h2.27v2.27h2.27v2.271h9.081v2.27h2.271v2.27h-2.27v2.271h-2.27v-2.27h-2.27v-2.27H7.08v2.27h4.54v2.27H9.35v2.27h6.811v-2.27h2.27v4.54h6.811v-2.27h2.271v2.27h2.27v-4.54h-4.54v-2.27h2.27v-4.54h2.27v-2.271h-4.54v-2.27h2.27v-2.271h2.27v-4.54h2.27v2.27h4.541v2.27h-2.27v2.27h2.27v-2.27h2.27v-4.54h-2.27v-2.271h-2.27v2.27h-2.27v-2.27h-2.27Zm0 0h-2.27v2.27h2.27v-2.27Zm-9.081 11.352v2.27h2.27v2.27h2.27v-4.54h-4.54Zm4.54 9.081h-4.54v2.27h4.54v-2.27Zm-4.54-9.081v-2.27h2.27v-2.271h-4.54v4.54h2.27Zm-9.082 0v-2.27h2.27v2.27h-2.27ZM41.135 9.35V7.08h2.27v2.27h-2.27Zm2.27 20.433h-2.27v-4.54h2.27v2.27h2.27v-2.27h2.271v-4.541h2.27v2.27h2.271v-4.54h2.27V25.242h2.27v2.271h-4.54v-2.27h-2.27v4.54h-6.811Zm9.082 2.27v-2.27h-2.27v2.27h2.27Zm2.27 0h-2.27v4.541h-2.27v4.541h2.27v4.54h-2.27v4.541h-4.541v2.271h-2.27v-2.27h-2.27v2.27h2.27v2.27h-4.541v-4.54h-6.811v2.27h-2.27v-4.54h-4.541v2.27h-2.27v-2.27h-2.271v2.27h2.27v2.27h-4.54v-4.54H13.89v2.27h-2.27v-4.541H9.35v2.27H7.08v2.27h4.54v2.271H7.08v2.27h4.54v-2.27h2.27v2.27h2.271v-2.27h2.27v2.27h6.811v6.811h2.271v2.27h2.27v2.271h-4.54v2.27h2.27v2.271h2.27v-4.54h2.27v-2.271h-2.27v-4.54h4.541v2.27h2.27v2.27h-2.27v2.27h2.27v4.541h-2.27v2.27h2.27v-2.27h2.27v2.27h6.811v-2.27h4.541v-4.54h4.541v2.27h-2.27v4.54h2.27v-2.27h2.27v2.27h9.082V66.11h2.27v2.27h4.541v-2.27h-2.27v-6.811h2.27V45.675h-2.27v13.622h-2.27v-2.27h-2.27v-4.541h-6.811v-2.27h-4.541v-6.811h2.27v4.54h4.54v-4.54h-2.27v-2.27h-6.811v-2.271h2.27v-2.27h2.27v2.27h2.271v-4.54h4.54v9.08h2.271v-2.27h2.27v-2.27h-2.27v-6.811h2.27v-2.27h2.271v2.27h2.27v-4.541h-2.27v-2.27H59.299v2.27h-2.271v2.27h-2.27v2.27Zm2.27 0v2.271h-2.27v-2.27h2.27Zm2.271-2.27h2.27v2.27h2.27v-4.54h-4.54v2.27Zm0 0v2.27h-2.27v-2.27h2.27Zm9.082 29.515h-2.27v2.27h-2.271v2.27h4.54v-4.54ZM54.757 66.11h2.27v2.27h2.271v2.271h4.54v-2.27h-2.27v-2.27h-2.27v-2.271h-4.54v2.27Zm-6.81-2.27v2.27h2.27v-2.27h-2.27Zm-2.271 0v-2.27h-6.811v-2.27h2.27v-2.271h2.27v-2.27h9.082v4.54h-4.54v-2.27h-2.271v2.27h2.27v4.54h-2.27Zm0 0h-9.081v2.27h2.27v2.27h2.27v2.271h2.27v-2.27h2.27v-4.541Zm-9.082-6.811v2.27h-2.27v-2.27h2.27Zm0-2.27h2.27v2.27h-2.27v-2.27Zm0 0h-2.27v-2.271h2.27v2.27Zm-6.81 4.54v-6.811h-2.271v6.811h2.27ZM47.945 7.08h4.541v4.54h-2.27V9.35h-2.27V7.08Zm0 2.27v2.27h2.27v2.27h4.541v2.271h-4.54v2.27h-6.811v-2.27h2.27v-2.27h-2.27v-2.27h2.27V9.35h2.27Zm9.082-2.27H72.92v15.892H57.028V7.08Zm4.54 2.27h-2.27V20.701H70.65V9.35h-9.081ZM11.62 11.62h6.811v6.811H11.621V11.621Zm49.949 0H68.379v6.811H61.57V11.621Zm-18.163 9.082h2.27v2.27h-2.27v-2.27ZM68.38 34.324h2.27v2.27h-2.27v-2.27Zm2.27 2.27h2.27v4.541h-2.27v-4.54Zm-4.54 11.352h2.27v2.27h-2.27v-2.27Zm-9.082 6.811h-2.27v6.811H61.567V54.758h-4.54ZM7.08 57.027h15.892V72.92H7.08V57.028Zm4.54 2.271H9.35V70.65H20.701V59.299h-9.08Zm45.408-2.27h2.27v2.27h-2.27v-2.27Zm-45.408 4.54h6.811v6.811H11.621V61.57Zm59.03 9.082h2.27v2.27h-2.27v-2.27Z"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.316-1.66.323.625.547 1.296.664 1.99l.002.01c-.742-1.847-1.998-2.593-3.025-4.215-.052-.082-.104-.164-.154-.25a2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.024.024 0 0 0-.013 0l-.003.002-.005.003.003-.005c-1.647.964-2.206 2.749-2.256 3.642a3.28 3.28 0 0 0-1.805.696 1.953 1.953 0 0 0-.17-.129 3.04 3.04 0 0 1-.018-1.602 4.856 4.856 0 0 0-1.578 1.22h-.003c-.26-.33-.242-1.416-.227-1.643-.077.031-.15.07-.219.117-.229.163-.444.347-.64.549-.225.227-.43.473-.613.735a5.537 5.537 0 0 0-.88 1.986l-.009.043c-.012.057-.056.346-.064.41l-.002.014c-.057.298-.093.6-.106.903v.034a6.556 6.556 0 0 0 13.017 1.109l.03-.254a6.742 6.742 0 0 0-.426-3.293Zm-7.556 5.132c.03.015.059.03.09.044l.005.003a3.257 3.257 0 0 1-.095-.047Zm6.906-4.79v-.006.007Z" fill="url(#a)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.316-1.66.323.625.547 1.296.664 1.99v.006l.002.007a5.937 5.937 0 0 1-.204 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093-.064.298-.099.6-.106.905v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.254a6.743 6.743 0 0 0-.426-3.293Z" fill="url(#b)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.316-1.66.323.625.547 1.296.664 1.99v.006l.002.007a5.937 5.937 0 0 1-.204 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093-.064.298-.099.6-.106.905v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.254a6.743 6.743 0 0 0-.426-3.293Z" fill="url(#c)"/><path d="m42.879 38.322.04.03a3.57 3.57 0 0 0-.608-.795c-2.039-2.038-.535-4.418-.28-4.54l.002-.004c-1.647.965-2.206 2.75-2.257 3.642.077-.005.152-.011.23-.011a3.307 3.307 0 0 1 2.873 1.677Z" fill="url(#d)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.865 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.073.036.11.053.065.029.129.055.193.079.274.097.562.152.853.164 3.268.154 3.9-3.907 1.542-5.086a2.263 2.263 0 0 1 1.581.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#e)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.865 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.073.036.11.053.065.029.129.055.193.079.274.097.562.152.853.164 3.268.154 3.9-3.907 1.542-5.086a2.263 2.263 0 0 1 1.581.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#f)"/><path d="m37.665 37.134.136.09a3.04 3.04 0 0 1-.019-1.602 4.854 4.854 0 0 0-1.578 1.22c.032-.002.983-.019 1.461.292Z" fill="url(#g)"/><path d="M33.503 40.145c.506 2.989 3.216 5.272 6.291 5.359 2.847.08 4.665-1.572 5.416-3.184a5.937 5.937 0 0 0 .204-4.425v-.012l.002.01c.232 1.52-.54 2.99-1.748 3.986l-.004.008c-2.352 1.917-4.604 1.156-5.059.846a3.524 3.524 0 0 1-.095-.047c-1.372-.656-1.939-1.905-1.817-2.977a1.683 1.683 0 0 1-1.553-.977 2.474 2.474 0 0 1 2.41-.097c.777.352 1.66.387 2.462.097-.003-.054-1.144-.508-1.589-.946-.238-.234-.35-.347-.45-.432a1.987 1.987 0 0 0-.17-.128 9.602 9.602 0 0 0-.135-.09c-.478-.31-1.429-.294-1.46-.293h-.003c-.26-.33-.242-1.415-.227-1.642-.077.03-.15.07-.219.116-.23.164-.444.348-.64.55a5.712 5.712 0 0 0-.616.733 5.536 5.536 0 0 0-.88 1.986c-.003.013-.236 1.031-.121 1.56l.001-.001Z" fill="url(#h)"/><path d="M42.31 37.557c.24.235.445.503.61.795.035.027.07.054.098.08 1.486 1.37.707 3.307.65 3.444 1.207-.994 1.978-2.466 1.747-3.985-.742-1.849-2-2.595-3.025-4.217a7.809 7.809 0 0 1-.154-.25 2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.024.024 0 0 0-.013 0l-.003.002-.004.003c-.254.12-1.758 2.501.28 4.538v.003Z" fill="url(#i)"/><path d="M43.017 38.433a1.349 1.349 0 0 0-.098-.08l-.04-.03a2.263 2.263 0 0 0-1.581-.384c2.358 1.179 1.725 5.239-1.543 5.086a2.915 2.915 0 0 1-.853-.164 3.434 3.434 0 0 1-.303-.132l.005.003c.455.311 2.706 1.071 5.059-.846l.004-.008c.058-.137.837-2.074-.65-3.444Z" fill="url(#j)"/><path d="M37.055 40.581s.302-1.127 2.167-1.127c.201 0 .778-.563.788-.726a3.265 3.265 0 0 1-2.461-.097 2.471 2.471 0 0 0-2.41.097 1.683 1.683 0 0 0 1.552.977c-.121 1.072.446 2.32 1.817 2.977l.091.045c-.8-.414-1.462-1.196-1.544-2.145Z" fill="url(#k)"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.316-1.66.323.625.547 1.296.664 1.99l.002.01c-.742-1.847-1.998-2.593-3.025-4.215a8.036 8.036 0 0 1-.154-.25 2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.024.024 0 0 0-.013 0l-.003.002-.005.003.003-.005c-1.647.964-2.206 2.749-2.256 3.642.076-.005.152-.011.23-.011a3.308 3.308 0 0 1 2.872 1.677 2.263 2.263 0 0 0-1.58-.384c2.357 1.18 1.725 5.239-1.543 5.087a2.916 2.916 0 0 1-.853-.165 3.432 3.432 0 0 1-.303-.132l.004.003a3.524 3.524 0 0 1-.095-.047l.09.044c-.8-.413-1.461-1.195-1.544-2.144 0 0 .303-1.128 2.167-1.128.202 0 .778-.563.789-.726-.003-.053-1.144-.507-1.589-.945-.237-.234-.35-.347-.45-.432a1.987 1.987 0 0 0-.17-.128 3.04 3.04 0 0 1-.018-1.603 4.854 4.854 0 0 0-1.578 1.22h-.003c-.26-.33-.241-1.415-.226-1.642-.077.03-.15.07-.22.116-.229.164-.443.347-.64.549-.224.227-.43.473-.613.735v.001-.001a5.536 5.536 0 0 0-.88 1.986l-.008.043c-.013.058-.068.35-.076.414-.05.302-.083.607-.097.914v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.253a6.743 6.743 0 0 0-.426-3.294Zm-.65.337v.006-.007Z" fill="url(#l)"/><defs><radialGradient id="b" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(44.777 34.536) scale(13.6677)"><stop offset=".129" stop-color="#FFBD4F"/><stop offset=".186" stop-color="#FFAC31"/><stop offset=".247" stop-color="#FF9D17"/><stop offset=".283" stop-color="#FF980E"/><stop offset=".403" stop-color="#FF563B"/><stop offset=".467" stop-color="#FF3750"/><stop offset=".71" stop-color="#F5156C"/><stop offset=".782" stop-color="#EB0878"/><stop offset=".86" stop-color="#E50080"/></radialGradient><radialGradient id="c" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.702 40.118) scale(13.6677)"><stop offset=".3" stop-color="#960E18"/><stop offset=".351" stop-color="#B11927" stop-opacity=".74"/><stop offset=".435" stop-color="#DB293D" stop-opacity=".343"/><stop offset=".497" stop-color="#F5334B" stop-opacity=".094"/><stop offset=".53" stop-color="#FF3750" stop-opacity="0"/></radialGradient><radialGradient id="d" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(41.394 31.491) scale(9.90066)"><stop offset=".132" stop-color="#FFF44F"/><stop offset=".252" stop-color="#FFDC3E"/><stop offset=".506" stop-color="#FF9D12"/><stop offset=".526" stop-color="#FF980E"/></radialGradient><radialGradient id="e" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(38.18 43.67) scale(6.5074)"><stop offset=".353" stop-color="#3A8EE6"/><stop offset=".472" stop-color="#5C79F0"/><stop offset=".669" stop-color="#9059FF"/><stop offset="1" stop-color="#C139E6"/></radialGradient><radialGradient id="f" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3.35414 -.81093 .9494 3.92687 40.363 38.945)"><stop offset=".206" stop-color="#9059FF" stop-opacity="0"/><stop offset=".278" stop-color="#8C4FF3" stop-opacity=".064"/><stop offset=".747" stop-color="#7716A8" stop-opacity=".45"/><stop offset=".975" stop-color="#6E008B" stop-opacity=".6"/></radialGradient><radialGradient id="g" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 34.028) scale(4.68222)"><stop stop-color="#FFE226"/><stop offset=".121" stop-color="#FFDB27"/><stop offset=".295" stop-color="#FFC82A"/><stop offset=".502" stop-color="#FFA930"/><stop offset=".732" stop-color="#FF7E37"/><stop offset=".792" stop-color="#FF7139"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(43.254 30.983) scale(19.9772)"><stop offset=".113" stop-color="#FFF44F"/><stop offset=".456" stop-color="#FF980E"/><stop offset=".622" stop-color="#FF5634"/><stop offset=".716" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="i" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="rotate(83.976 2.969 39.153) scale(14.6396 9.60783)"><stop stop-color="#FFF44F"/><stop offset=".06" stop-color="#FFE847"/><stop offset=".168" stop-color="#FFC830"/><stop offset=".304" stop-color="#FF980E"/><stop offset=".356" stop-color="#FF8B16"/><stop offset=".455" stop-color="#FF672A"/><stop offset=".57" stop-color="#FF3647"/><stop offset=".737" stop-color="#E31587"/></radialGradient><radialGradient id="j" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 35.72) scale(12.4701)"><stop offset=".137" stop-color="#FFF44F"/><stop offset=".48" stop-color="#FF980E"/><stop offset=".592" stop-color="#FF5634"/><stop offset=".655" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="k" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(42.747 36.397) scale(13.6491)"><stop offset=".094" stop-color="#FFF44F"/><stop offset=".231" stop-color="#FFE141"/><stop offset=".509" stop-color="#FFAF1E"/><stop offset=".626" stop-color="#FF980E"/></radialGradient><linearGradient id="a" x1="45.198" y1="35.108" x2="34.314" y2="45.609" gradientUnits="userSpaceOnUse"><stop offset=".048" stop-color="#FFF44F"/><stop offset=".111" stop-color="#FFE847"/><stop offset=".225" stop-color="#FFC830"/><stop offset=".368" stop-color="#FF980E"/><stop offset=".401" stop-color="#FF8B16"/><stop offset=".462" stop-color="#FF672A"/><stop offset=".534" stop-color="#FF3647"/><stop offset=".705" stop-color="#E31587"/></linearGradient><linearGradient id="l" x1="45.066" y1="35.053" x2="35.806" y2="44.314" gradientUnits="userSpaceOnUse"><stop offset=".167" stop-color="#FFF44F" stop-opacity=".8"/><stop offset=".266" stop-color="#FFF44F" stop-opacity=".634"/><stop offset=".489" stop-color="#FFF44F" stop-opacity=".217"/><stop offset=".6" stop-color="#FFF44F" stop-opacity="0"/></linearGradient></defs></svg>
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 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg width="80" height="80" fill="context-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M76 2H4a2 2 0 0 0-2 2v72a2 2 0 0 0 2 2h72a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2ZM4 0a4 4 0 0 0-4 4v72a4 4 0 0 0 4 4h72a4 4 0 0 0 4-4V4a4 4 0 0 0-4-4H4Zm3.08 7.08h15.892v15.892H7.08V7.08Zm4.54 2.27H9.35V20.701H20.701V9.35h-9.08Zm20.434-2.27h2.27v2.27h2.27V7.08h4.541v2.27h2.27v2.27H36.596v2.27h-4.541v2.271h-2.27v-2.27h-2.271v-2.27h2.27V9.35h2.27V7.08Zm-4.541 4.54h-2.27V9.35h2.27v2.27Zm2.27 11.352v-4.54h2.27v-2.27h4.541V13.89h4.541v2.27h4.54v2.27h-2.27v2.27h-2.27v-2.27h-2.27v2.27h-2.27v-2.27h-2.27v2.27h-2.271v2.271h-2.27Zm-4.54 2.27V18.433h2.27v4.54h2.27v2.27h-4.54Zm0 0v2.271h-9.081v-2.27h9.08Zm11.351-2.27h-2.27v-2.27h2.27v2.27Zm2.27 0h-2.27v4.541h-2.27v-2.27h-2.27v2.27h2.27v2.27h4.54V22.973Zm2.271 0v-2.27h-2.27v2.27h2.27Zm2.27 0h-2.27v6.811h4.54v-2.27h-2.27v-4.54Zm2.27 0h-2.27v-2.27h2.27v2.27Zm4.542-6.81h-2.27V22.971h-2.271v2.27h2.27v2.271h2.27v2.27h-2.27v2.27h2.27v-2.27h2.271v2.27h2.27v2.271h2.27v-4.54h2.271v2.27h2.27v2.27h-2.27v2.27h-2.27v2.27h-4.541v6.811h2.27v2.271h4.541v4.541h-6.811v-2.27h-2.27v2.27h-2.27v-2.27h-4.541v2.27h-4.541v-2.27h-4.54v2.27h2.27v2.27h2.27v2.27H45.675v4.541h2.271v2.27h-2.27v2.271h-2.27v-4.54h-4.541v-2.27h-2.27v-2.271h-2.27v2.27h2.27v2.27h-2.27v2.27h-2.271v-2.27h-2.27v-2.27h-2.271v-4.54h2.27v2.27h2.27v-2.27h-2.27v-2.271h2.27v-2.27h-4.54v-2.27h2.27v-2.271h-2.27v-4.54h2.27v-2.271h-2.27v-6.811h2.27v-2.27h-2.27v2.27h-4.54v-2.27h-2.271v2.27h2.27v2.27h-4.54v-4.54h-2.27V36.593H13.89v-4.54h-2.27v-2.27h2.27v-2.271H7.08v6.811h2.27v4.54h4.54v2.271h-2.27v2.27H9.35v-2.27H7.08v2.27h2.27v2.27H7.08v2.271h2.27v-2.27h2.27v2.27h2.27v-4.54h4.541v-2.27h-2.27v-4.541h2.27v2.27h2.27v2.27h2.271v2.27h-2.27v2.27h-2.27v2.271h-2.27v2.27H11.62v2.271H7.08v2.27h4.54v-2.27h4.541v2.27h9.081v9.081h4.541v4.541h-2.27v4.541h4.54v-2.27h2.271v2.27h2.27v-4.54h-4.54v-2.27h2.27v-2.271h2.27v-2.27h2.27v2.27h2.271v2.27h-2.27v6.811H45.675v-4.54h2.271v4.54h2.27v-4.54h2.271v4.54h6.811v-2.27h2.27v2.27h2.27v-2.27h-2.27v-2.27h-4.54v-2.27h-9.081v-2.271H59.297v2.27h2.27v-2.27h2.27v4.54h4.541v4.541h2.271v-2.27h2.27v-4.54h-2.27v-2.271h2.27v-2.27h-2.27v-2.27h2.27v-4.541h-2.27v-4.541h2.27V27.513h-2.27v-2.27h-2.27v2.27h-6.811v-2.27h-4.541v2.27h-2.27v-2.27h-2.271v-2.27h2.27v-4.541h-4.54v-2.27Zm2.27-6.812h2.27v4.54h-2.27v2.271h-2.27v-4.54h2.27V9.35Zm0 0h-6.811V7.08h6.811v2.27Zm0 13.622v-2.27h-2.27v2.27h2.27Zm9.081 6.811v2.27h2.27v2.271h-2.27v2.27h-2.27v4.541h-4.54v2.27h2.27v2.27h4.54v-2.27h2.27v4.541h-2.27v4.541h2.27v6.811h2.271v2.27h-2.27v2.27h4.54v-4.54h2.271v-4.54h-2.27v-4.541h2.27v-4.541h-2.27v-4.54h2.27v-6.811h-2.27v-2.271h2.27v-2.27h-4.54v2.27h-2.271v-2.27h-2.27Zm6.812 24.974h-2.27v2.27h2.27v-2.27Zm0-4.54h-4.541v-2.27h4.54v2.27Zm-4.541-9.082h2.27v2.27h-2.27v-2.27Zm-2.27 0v-4.54h2.27v4.54h-2.27Zm4.54-4.54v-2.27h-2.27v2.27h2.27Zm0 0h2.27v2.27h-2.27v-2.27Zm-4.54 4.54v2.27h-2.27v-2.27h2.27Zm0-11.352v-2.27h-2.27v2.27h2.27ZM57.028 68.38h-2.27v2.27h2.27v-2.27Zm-24.974 0h-2.27v2.27h2.27v-2.27ZM20.702 47.946v2.27h2.27v2.271h-4.54v-4.54h2.27Zm2.27-2.27v2.27h-2.27v-2.27h2.27Zm2.27 0v2.27h2.271v-2.27h-2.27Zm0 0h-2.27v-2.27h2.27v2.27Zm-2.27-9.082v2.27h-2.27v-2.27h2.27Zm0 0h2.27v-2.27h-2.27v2.27ZM9.35 34.324v-2.27h2.27v2.27H9.35Zm15.893 20.433h2.27v-2.27h-2.27v2.27ZM41.135 66.11v4.541h2.27v-4.54h-2.27Zm6.811-4.54v-2.27h2.27v2.27h-2.27Zm-2.27-6.812h-2.27v-2.27h2.27v2.27Zm0 0v2.27h2.27v-2.27h-2.27Zm4.54-20.433v2.27h2.271v-2.27h-2.27Zm2.271-9.081h-2.27v2.27h2.27v-2.27Zm4.54-18.163H72.92v15.892H57.028V7.08Zm4.541 2.27h-2.27V20.701H70.65V9.35h-9.081ZM11.62 11.62h6.811v6.811H11.621V11.621Zm34.056 0h2.27v2.27h-2.27v-2.27Zm15.892 0h6.811v6.811H61.57V11.621Zm-4.54 43.137h-2.27v6.811H61.567V54.758h-4.54ZM7.08 57.027h15.892V72.92H7.08V57.028Zm4.54 2.271H9.35V70.65H20.701V59.299h-9.08Zm45.408-2.27h2.27v2.27h-2.27v-2.27Zm-45.408 4.54h6.811v6.811H11.621V61.57Z"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.315-1.66a6.81 6.81 0 0 1 .663 1.99l.002.01c-.741-1.847-1.998-2.593-3.025-4.215a8.23 8.23 0 0 1-.154-.25 2.078 2.078 0 0 1-.072-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.011-.006.024.024 0 0 0-.013 0l-.003.002-.004.003.002-.005c-1.647.964-2.206 2.749-2.256 3.642a3.28 3.28 0 0 0-1.805.696 1.967 1.967 0 0 0-.17-.129 3.04 3.04 0 0 1-.018-1.602 4.855 4.855 0 0 0-1.578 1.22h-.003c-.26-.33-.242-1.416-.227-1.643-.076.031-.15.07-.218.117-.23.163-.444.347-.641.549a5.73 5.73 0 0 0-.613.735 5.535 5.535 0 0 0-.88 1.986l-.008.043c-.013.057-.057.346-.065.41l-.002.014c-.057.298-.092.6-.106.903v.034a6.556 6.556 0 0 0 13.017 1.109l.03-.254a6.743 6.743 0 0 0-.426-3.293Zm-7.556 5.132c.03.015.059.03.09.044l.005.003a3.257 3.257 0 0 1-.095-.047Zm6.906-4.79v-.006l.001.007h-.001Z" fill="url(#a)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.315-1.66a6.81 6.81 0 0 1 .664 1.99V37.895a5.937 5.937 0 0 1-.203 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093a4.88 4.88 0 0 0-.105.905v.034a6.557 6.557 0 0 0 13.016 1.108c.011-.084.02-.168.03-.254a6.742 6.742 0 0 0-.425-3.293h-.001Z" fill="url(#b)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.315-1.66a6.81 6.81 0 0 1 .664 1.99V37.895a5.937 5.937 0 0 1-.203 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093a4.88 4.88 0 0 0-.105.905v.034a6.557 6.557 0 0 0 13.016 1.108c.011-.084.02-.168.03-.254a6.742 6.742 0 0 0-.425-3.293h-.001Z" fill="url(#c)"/><path d="m42.879 38.322.04.03a3.567 3.567 0 0 0-.608-.795c-2.038-2.038-.534-4.418-.28-4.54l.002-.004c-1.647.965-2.206 2.75-2.257 3.642.077-.005.153-.011.23-.011a3.308 3.308 0 0 1 2.873 1.677Z" fill="url(#d)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.864 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.074.036.11.053.065.029.129.055.193.079.275.097.562.152.853.164 3.268.154 3.9-3.907 1.543-5.086a2.263 2.263 0 0 1 1.58.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#e)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.864 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.074.036.11.053.065.029.129.055.193.079.275.097.562.152.853.164 3.268.154 3.9-3.907 1.543-5.086a2.263 2.263 0 0 1 1.58.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#f)"/><path d="M37.666 37.134c.053.034.096.063.135.09a3.04 3.04 0 0 1-.019-1.602 4.854 4.854 0 0 0-1.578 1.22c.032-.002.983-.019 1.462.292Z" fill="url(#g)"/><path d="M33.503 40.145c.506 2.989 3.216 5.272 6.291 5.359 2.847.08 4.665-1.572 5.416-3.184a5.937 5.937 0 0 0 .204-4.425v-.012l.002.01c.232 1.52-.54 2.99-1.748 3.986l-.004.008c-2.352 1.917-4.604 1.156-5.059.846a3.524 3.524 0 0 1-.095-.047c-1.372-.656-1.939-1.905-1.817-2.977a1.684 1.684 0 0 1-1.553-.977 2.474 2.474 0 0 1 2.41-.097c.777.352 1.66.387 2.462.097-.003-.054-1.144-.508-1.589-.946-.237-.234-.35-.347-.45-.432a1.973 1.973 0 0 0-.17-.128 9.602 9.602 0 0 0-.135-.09c-.478-.31-1.429-.294-1.46-.293h-.003c-.26-.33-.242-1.415-.227-1.642-.077.03-.15.07-.219.116-.23.164-.444.348-.64.55a5.72 5.72 0 0 0-.616.733 5.538 5.538 0 0 0-.88 1.986c-.003.013-.236 1.031-.121 1.56l.001-.001Z" fill="url(#h)"/><path d="M42.31 37.557c.24.235.445.503.61.795.035.027.07.054.098.08 1.486 1.37.707 3.307.65 3.444 1.207-.994 1.978-2.466 1.747-3.985-.742-1.849-2-2.595-3.025-4.217a7.809 7.809 0 0 1-.154-.25 2.078 2.078 0 0 1-.072-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.011-.006.023.023 0 0 0-.013 0l-.003.002-.004.003c-.254.12-1.758 2.501.28 4.538v.003Z" fill="url(#i)"/><path d="M43.018 38.433a1.351 1.351 0 0 0-.099-.08l-.04-.03a2.263 2.263 0 0 0-1.581-.384c2.358 1.179 1.725 5.239-1.543 5.086a2.916 2.916 0 0 1-.853-.164 3.497 3.497 0 0 1-.192-.08c-.037-.016-.074-.033-.11-.052l.004.003c.455.311 2.706 1.071 5.06-.846l.003-.008c.058-.137.837-2.074-.65-3.444Z" fill="url(#j)"/><path d="M37.055 40.581s.302-1.127 2.167-1.127c.201 0 .778-.563.788-.726a3.265 3.265 0 0 1-2.461-.097 2.471 2.471 0 0 0-2.41.097 1.684 1.684 0 0 0 1.552.977c-.121 1.072.446 2.32 1.817 2.977l.091.045c-.8-.414-1.462-1.196-1.544-2.145Z" fill="url(#k)"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.316-1.66a6.81 6.81 0 0 1 .664 1.99l.002.01c-.742-1.847-1.998-2.593-3.025-4.215a8.23 8.23 0 0 1-.154-.25 2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.023.023 0 0 0-.013 0l-.003.002-.005.003.003-.005c-1.647.964-2.206 2.749-2.256 3.642.076-.005.152-.011.23-.011a3.307 3.307 0 0 1 2.872 1.677 2.263 2.263 0 0 0-1.58-.384c2.357 1.18 1.725 5.239-1.543 5.087a2.916 2.916 0 0 1-.853-.165 3.495 3.495 0 0 1-.193-.079c-.037-.017-.074-.033-.11-.053l.004.003a3.524 3.524 0 0 1-.095-.047l.09.044c-.8-.413-1.461-1.195-1.544-2.144 0 0 .303-1.128 2.167-1.128.202 0 .779-.563.789-.726-.003-.053-1.144-.507-1.589-.945-.237-.234-.35-.347-.45-.432a1.988 1.988 0 0 0-.17-.128 3.04 3.04 0 0 1-.018-1.603 4.854 4.854 0 0 0-1.578 1.22h-.003c-.26-.33-.241-1.415-.226-1.642-.077.03-.15.07-.22.116-.229.164-.443.347-.64.549-.224.227-.43.473-.613.735v.001-.001a5.538 5.538 0 0 0-.88 1.986l-.008.043c-.013.058-.068.35-.076.414-.05.302-.083.607-.097.914v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.253a6.742 6.742 0 0 0-.426-3.294Zm-.65.337v.006-.007Z" fill="url(#l)"/><defs><radialGradient id="b" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(44.777 34.536) scale(13.6677)"><stop offset=".129" stop-color="#FFBD4F"/><stop offset=".186" stop-color="#FFAC31"/><stop offset=".247" stop-color="#FF9D17"/><stop offset=".283" stop-color="#FF980E"/><stop offset=".403" stop-color="#FF563B"/><stop offset=".467" stop-color="#FF3750"/><stop offset=".71" stop-color="#F5156C"/><stop offset=".782" stop-color="#EB0878"/><stop offset=".86" stop-color="#E50080"/></radialGradient><radialGradient id="c" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.702 40.118) scale(13.6677)"><stop offset=".3" stop-color="#960E18"/><stop offset=".351" stop-color="#B11927" stop-opacity=".74"/><stop offset=".435" stop-color="#DB293D" stop-opacity=".343"/><stop offset=".497" stop-color="#F5334B" stop-opacity=".094"/><stop offset=".53" stop-color="#FF3750" stop-opacity="0"/></radialGradient><radialGradient id="d" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(41.394 31.491) scale(9.90066)"><stop offset=".132" stop-color="#FFF44F"/><stop offset=".252" stop-color="#FFDC3E"/><stop offset=".506" stop-color="#FF9D12"/><stop offset=".526" stop-color="#FF980E"/></radialGradient><radialGradient id="e" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(38.18 43.67) scale(6.50741)"><stop offset=".353" stop-color="#3A8EE6"/><stop offset=".472" stop-color="#5C79F0"/><stop offset=".669" stop-color="#9059FF"/><stop offset="1" stop-color="#C139E6"/></radialGradient><radialGradient id="f" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3.35414 -.81093 .9494 3.92687 40.363 38.945)"><stop offset=".206" stop-color="#9059FF" stop-opacity="0"/><stop offset=".278" stop-color="#8C4FF3" stop-opacity=".064"/><stop offset=".747" stop-color="#7716A8" stop-opacity=".45"/><stop offset=".975" stop-color="#6E008B" stop-opacity=".6"/></radialGradient><radialGradient id="g" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 34.028) scale(4.68221)"><stop stop-color="#FFE226"/><stop offset=".121" stop-color="#FFDB27"/><stop offset=".295" stop-color="#FFC82A"/><stop offset=".502" stop-color="#FFA930"/><stop offset=".732" stop-color="#FF7E37"/><stop offset=".792" stop-color="#FF7139"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(43.254 30.983) scale(19.9772)"><stop offset=".113" stop-color="#FFF44F"/><stop offset=".456" stop-color="#FF980E"/><stop offset=".622" stop-color="#FF5634"/><stop offset=".716" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="i" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.53635 14.55876 -9.55479 1.0083 41.594 32.091)"><stop stop-color="#FFF44F"/><stop offset=".06" stop-color="#FFE847"/><stop offset=".168" stop-color="#FFC830"/><stop offset=".304" stop-color="#FF980E"/><stop offset=".356" stop-color="#FF8B16"/><stop offset=".455" stop-color="#FF672A"/><stop offset=".57" stop-color="#FF3647"/><stop offset=".737" stop-color="#E31587"/></radialGradient><radialGradient id="j" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 35.72) scale(12.4701)"><stop offset=".137" stop-color="#FFF44F"/><stop offset=".48" stop-color="#FF980E"/><stop offset=".592" stop-color="#FF5634"/><stop offset=".655" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="k" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(42.747 36.397) scale(13.6491)"><stop offset=".094" stop-color="#FFF44F"/><stop offset=".231" stop-color="#FFE141"/><stop offset=".509" stop-color="#FFAF1E"/><stop offset=".626" stop-color="#FF980E"/></radialGradient><linearGradient id="a" x1="45.198" y1="35.108" x2="34.314" y2="45.609" gradientUnits="userSpaceOnUse"><stop offset=".048" stop-color="#FFF44F"/><stop offset=".111" stop-color="#FFE847"/><stop offset=".225" stop-color="#FFC830"/><stop offset=".368" stop-color="#FF980E"/><stop offset=".401" stop-color="#FF8B16"/><stop offset=".462" stop-color="#FF672A"/><stop offset=".534" stop-color="#FF3647"/><stop offset=".705" stop-color="#E31587"/></linearGradient><linearGradient id="l" x1="45.066" y1="35.053" x2="35.806" y2="44.314" gradientUnits="userSpaceOnUse"><stop offset=".167" stop-color="#FFF44F" stop-opacity=".8"/><stop offset=".266" stop-color="#FFF44F" stop-opacity=".634"/><stop offset=".489" stop-color="#FFF44F" stop-opacity=".217"/><stop offset=".6" stop-color="#FFF44F" stop-opacity="0"/></linearGradient></defs></svg>
\ 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 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg width="113" height="113" viewBox="0 0 113 113" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="113" height="113" rx="4" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2H109C110.105 2 111 2.89543 111 4V109C111 110.105 110.105 111 109 111H4C2.89543 111 2 110.105 2 109V4C2 2.89543 2.89543 2 4 2ZM0 4C0 1.79086 1.79086 0 4 0H109C111.209 0 113 1.79086 113 4V109C113 111.209 111.209 113 109 113H4C1.79086 113 0 111.209 0 109V4ZM103 10H99.7931H96.5862H93.3793H90.1724H86.9655H83.7586H80.5517V13.2069V16.4138V19.6207V22.8276V26.0345V29.2414V32.4483H83.7586H86.9655H90.1724H93.3793H96.5862H99.7931H103V29.2414V26.0345V22.8276V19.6207V16.4138V13.2069V10ZM96.5862 13.2069H99.7931V16.4138V19.6207V22.8276V26.0345V29.2414H96.5862H93.3793H90.1724H86.9655H83.7586V26.0345V22.8276V19.6207V16.4138V13.2069H86.9655H90.1724H93.3793H96.5862ZM77.3448 10H74.1379H70.931H67.7241V13.2069H64.5172H61.3103V16.4138V19.6207H58.1034H54.8966V16.4138V13.2069V10H51.6897V13.2069H48.4828V10H45.2759H42.069V13.2069H38.8621V10H35.6552V13.2069H38.8621V16.4138H35.6552V19.6207H38.8621V22.8276H35.6552V26.0345H38.8621H42.069V29.2414V32.4483H38.8621V29.2414H35.6552V32.4483H38.8621V35.6552V38.8621H42.069H45.2759V35.6552H42.069V32.4483H45.2759V29.2414V26.0345V22.8276H48.4828V26.0345H51.6897V22.8276H54.8966H58.1034H61.3103V26.0345H58.1034V29.2414H54.8966V32.4483H51.6897V29.2414H48.4828V32.4483V35.6552V38.8621H51.6897V42.069H54.8966V38.8621H58.1034H61.3103V35.6552H64.5172V38.8621V42.069H67.7241V45.2759H70.931H74.1379V42.069H77.3448H80.5517V45.2759H83.7586V48.4828H80.5517V51.6897H83.7586V54.8966H80.5517H77.3448H74.1379V51.6897V48.4828H70.931V51.6897V54.8966V58.1034H74.1379V61.3103H77.3448V64.5172V67.7241H74.1379V70.931H70.931V67.7241H67.7241V70.931H64.5172V74.1379H67.7241V70.931H70.931V74.1379H74.1379V77.3448H70.931H67.7241V80.5517H64.5172V83.7586H61.3103V86.9655H58.1034V83.7586H54.8966V86.9655H58.1034V90.1724H54.8966V93.3793H51.6897V90.1724V86.9655V83.7586V80.5517V77.3448H48.4828V74.1379H51.6897V70.931H48.4828V74.1379H45.2759V70.931V67.7241H42.069V64.5172V61.3103H38.8621V58.1034V54.8966H42.069V51.6897H38.8621V48.4828H35.6552V45.2759H38.8621V42.069H35.6552V38.8621V35.6552H32.4483H29.2414H26.0345V38.8621H22.8276V42.069H19.6207V45.2759H22.8276V48.4828H26.0345V51.6897H22.8276H19.6207V48.4828H16.4138V45.2759H13.2069V48.4828H10V51.6897V54.8966H13.2069H16.4138V51.6897H19.6207V54.8966H22.8276H26.0345V58.1034H22.8276H19.6207V61.3103H16.4138V58.1034H13.2069V61.3103H10V64.5172V67.7241H13.2069H16.4138V70.931H13.2069H10V74.1379H13.2069H16.4138V77.3448H13.2069H10V80.5517H13.2069H16.4138V77.3448H19.6207V80.5517H22.8276V83.7586H19.6207V86.9655H16.4138V83.7586H13.2069H10V86.9655V90.1724H13.2069V86.9655H16.4138V90.1724H19.6207H22.8276H26.0345V93.3793H22.8276H19.6207H16.4138H13.2069V96.5862V99.7931H16.4138V96.5862H19.6207V99.7931H22.8276V103H26.0345V99.7931V96.5862H29.2414H32.4483V99.7931H29.2414V103H32.4483V99.7931H35.6552H38.8621V103H42.069H45.2759V99.7931H48.4828V103H51.6897V99.7931H54.8966H58.1034V103H61.3103H64.5172V99.7931H67.7241V103H70.931V99.7931H74.1379V96.5862H77.3448V93.3793V90.1724V86.9655H74.1379V83.7586V80.5517H77.3448V77.3448V74.1379H80.5517V77.3448H83.7586H86.9655H90.1724H93.3793V74.1379H96.5862V70.931V67.7241H93.3793V64.5172H90.1724V61.3103H93.3793H96.5862V64.5172H99.7931V67.7241V70.931V74.1379V77.3448H103V74.1379V70.931V67.7241V64.5172H99.7931V61.3103H96.5862V58.1034H99.7931V54.8966H103V51.6897H99.7931V54.8966H96.5862V58.1034H93.3793V54.8966H90.1724V58.1034V61.3103H86.9655V58.1034H83.7586V54.8966H86.9655V51.6897H90.1724H93.3793H96.5862V48.4828H93.3793V45.2759V42.069H96.5862V45.2759H99.7931V42.069H103V38.8621H99.7931V42.069H96.5862V38.8621V35.6552H93.3793H90.1724H86.9655V38.8621H90.1724V42.069V45.2759V48.4828H86.9655V45.2759V42.069H83.7586H80.5517V38.8621H83.7586V35.6552H80.5517V38.8621H77.3448V35.6552V32.4483V29.2414V26.0345H74.1379V22.8276H70.931V26.0345H74.1379V29.2414V32.4483V35.6552V38.8621H70.931H67.7241V35.6552H70.931V32.4483V29.2414H67.7241V26.0345V22.8276H64.5172V19.6207V16.4138H67.7241H70.931V19.6207H74.1379H77.3448V16.4138V13.2069V10ZM64.5172 29.2414H67.7241V32.4483H64.5172V29.2414ZM61.3103 29.2414V32.4483H58.1034V29.2414H61.3103ZM61.3103 29.2414H64.5172V26.0345H61.3103V29.2414ZM83.7586 58.1034V61.3103H80.5517V58.1034H83.7586ZM90.1724 64.5172V67.7241V70.931H93.3793V74.1379H90.1724H86.9655V70.931V67.7241H83.7586H80.5517V64.5172H83.7586H86.9655H90.1724ZM80.5517 74.1379V70.931H83.7586V74.1379H80.5517ZM70.931 90.1724V93.3793H74.1379V96.5862H70.931H67.7241V93.3793V90.1724H70.931ZM64.5172 90.1724V86.9655H67.7241V90.1724H64.5172ZM61.3103 93.3793V90.1724H64.5172V93.3793H61.3103ZM61.3103 93.3793V96.5862H64.5172V99.7931H61.3103H58.1034V96.5862V93.3793H61.3103ZM70.931 90.1724V86.9655H74.1379V90.1724H70.931ZM45.2759 99.7931H42.069H38.8621V96.5862H42.069V93.3793H45.2759H48.4828V96.5862H45.2759V99.7931ZM16.4138 74.1379V70.931H19.6207H22.8276H26.0345V74.1379H22.8276H19.6207H16.4138ZM13.2069 61.3103H16.4138V64.5172H13.2069V61.3103ZM29.2414 51.6897V54.8966H26.0345V51.6897H29.2414ZM29.2414 51.6897V48.4828H32.4483V51.6897H29.2414ZM22.8276 45.2759V42.069H26.0345V45.2759H22.8276ZM26.0345 58.1034H29.2414V61.3103H32.4483V58.1034H35.6552V61.3103H38.8621V64.5172H35.6552H32.4483H29.2414H26.0345H22.8276V61.3103H26.0345V58.1034ZM42.069 80.5517H38.8621V77.3448V74.1379V70.931H35.6552V74.1379H32.4483V70.931V67.7241H35.6552H38.8621H42.069V70.931V74.1379V77.3448V80.5517ZM42.069 86.9655V83.7586V80.5517H45.2759V77.3448H48.4828V80.5517V83.7586V86.9655V90.1724H45.2759V86.9655H42.069ZM42.069 86.9655V90.1724H38.8621V86.9655H42.069ZM54.8966 38.8621H51.6897V35.6552H54.8966V38.8621ZM42.069 13.2069V16.4138H45.2759V19.6207H48.4828V16.4138V13.2069H45.2759H42.069ZM58.1034 74.1379V70.931H61.3103V74.1379H58.1034ZM32.4483 10H29.2414H26.0345H22.8276H19.6207H16.4138H13.2069H10V13.2069V16.4138V19.6207V22.8276V26.0345V29.2414V32.4483H13.2069H16.4138H19.6207H22.8276H26.0345H29.2414H32.4483V29.2414V26.0345V22.8276V19.6207V16.4138V13.2069V10ZM26.0345 13.2069H29.2414V16.4138V19.6207V22.8276V26.0345V29.2414H26.0345H22.8276H19.6207H16.4138H13.2069V26.0345V22.8276V19.6207V16.4138V13.2069H16.4138H19.6207H22.8276H26.0345ZM96.5862 16.4138H93.3793H90.1724H86.9655V19.6207V22.8276V26.0345H90.1724H93.3793H96.5862V22.8276V19.6207V16.4138ZM26.0345 16.4138H22.8276H19.6207H16.4138V19.6207V22.8276V26.0345H19.6207H22.8276H26.0345V22.8276V19.6207V16.4138ZM19.6207 35.6552H16.4138H13.2069H10V38.8621V42.069H13.2069V38.8621H16.4138H19.6207V35.6552ZM32.4483 77.3448H35.6552V80.5517V83.7586V86.9655H32.4483H29.2414H26.0345V83.7586V80.5517V77.3448H29.2414H32.4483ZM61.3103 77.3448H58.1034V80.5517H61.3103V77.3448ZM103 80.5517H99.7931H96.5862H93.3793H90.1724H86.9655H83.7586H80.5517V83.7586V86.9655V90.1724V93.3793V96.5862V99.7931V103H83.7586H86.9655H90.1724H93.3793H96.5862H99.7931H103V99.7931V96.5862V93.3793V90.1724V86.9655V83.7586V80.5517ZM96.5862 83.7586H99.7931V86.9655V90.1724V93.3793V96.5862V99.7931H96.5862H93.3793H90.1724H86.9655H83.7586V96.5862V93.3793V90.1724V86.9655V83.7586H86.9655H90.1724H93.3793H96.5862ZM32.4483 80.5517H29.2414V83.7586H32.4483V80.5517ZM96.5862 86.9655H93.3793H90.1724H86.9655V90.1724V93.3793V96.5862H90.1724H93.3793H96.5862V93.3793V90.1724V86.9655ZM29.2414 90.1724H32.4483V93.3793H29.2414V90.1724Z" fill="#1C1B22"/>
-<path d="M66.2056 52.7475C65.7266 51.5785 64.7572 50.3139 63.9959 49.9148C64.6155 51.1492 64.9742 52.3872 65.1112 53.3113C65.1112 53.3113 65.1112 53.3177 65.1112 53.3299C63.8657 50.1757 61.7537 48.9037 60.0292 46.1343C59.9419 45.994 59.8551 45.8537 59.7678 45.7055C59.7192 45.621 59.6805 45.546 59.6465 45.4738C59.575 45.3332 59.5199 45.1847 59.4823 45.0312C59.4825 45.0239 59.48 45.0169 59.4754 45.0114C59.4707 45.0059 59.4643 45.0023 59.4572 45.0014C59.4503 44.9995 59.4431 44.9995 59.4363 45.0014L59.431 45.0046C59.4283 45.0057 59.4256 45.0071 59.4232 45.0088L59.4274 45.0025C56.6608 46.6497 55.7222 49.6954 55.6359 51.2193C54.5305 51.2961 53.4736 51.7098 52.6032 52.4064C52.512 52.3282 52.4167 52.2551 52.3177 52.1875C52.0667 51.2949 52.0561 50.3502 52.2868 49.452C51.1553 49.9754 50.2753 50.8033 49.6358 51.5339H49.6379C49.2012 50.9722 49.2321 49.1183 49.2567 48.731C49.2514 48.7071 48.9309 48.9 48.8906 48.9292C48.5053 49.2088 48.145 49.5224 47.814 49.8665C47.4375 50.2545 47.0935 50.6738 46.7855 51.12C46.0764 52.1399 45.5731 53.2924 45.3047 54.5111C45.2994 54.535 45.2947 54.5605 45.29 54.5849C45.2691 54.6832 45.1943 55.1763 45.1813 55.2837C45.1813 55.2916 45.1813 55.2996 45.1813 55.3081C45.0847 55.8177 45.0249 56.3338 45.0024 56.8522C45.0024 56.8714 45.0024 56.89 45.0024 56.9091C45.0024 63.0898 49.9338 68.1 56.0166 68.1C61.464 68.1 65.9876 64.0813 66.8728 58.8012C66.8916 58.6583 66.9063 58.5143 66.9251 58.3698C67.139 56.4516 66.8932 54.434 66.2056 52.7475ZM53.5109 61.5074C53.5632 61.5324 53.6108 61.5606 53.6636 61.5834L53.6709 61.5882C53.6176 61.5622 53.5642 61.5351 53.5109 61.5074ZM65.1154 53.3331V53.3219C65.1151 53.326 65.1151 53.3301 65.1154 53.3341V53.3331Z" fill="url(#paint0_linear_1186_7637)"/>
-<path d="M66.2063 52.7477C65.7273 51.5787 64.7579 50.3141 63.9966 49.915C64.6162 51.1494 64.9749 52.3874 65.1119 53.3115C65.1119 53.3088 65.1119 53.3115 65.1119 53.3221C65.1116 53.3262 65.1116 53.3302 65.1119 53.3343C66.1509 56.1973 65.5825 59.108 64.7689 60.887C63.5066 63.6394 60.4509 66.4604 55.6706 66.3228C50.5029 66.174 45.9506 62.2776 45.1009 57.1744C44.9441 56.3699 45.1009 55.9608 45.1788 55.3078C45.0837 55.8115 45.0476 55.9571 45 56.8519C45 56.871 45 56.8896 45 56.9087C45 63.0895 49.9314 68.0996 56.0141 68.0996C61.4616 68.0996 65.9851 64.081 66.8704 58.8009C66.8892 58.658 66.9038 58.514 66.9227 58.3694C67.1397 56.4518 66.8939 54.4342 66.2063 52.7477Z" fill="url(#paint1_radial_1186_7637)"/>
-<path d="M66.2063 52.7477C65.7273 51.5787 64.7579 50.3141 63.9966 49.915C64.6162 51.1494 64.9749 52.3874 65.1119 53.3115C65.1119 53.3088 65.1119 53.3115 65.1119 53.3221C65.1116 53.3262 65.1116 53.3302 65.1119 53.3343C66.1509 56.1973 65.5825 59.108 64.7689 60.887C63.5066 63.6394 60.4509 66.4604 55.6706 66.3228C50.5029 66.174 45.9506 62.2776 45.1009 57.1744C44.9441 56.3699 45.1009 55.9608 45.1788 55.3078C45.0837 55.8115 45.0476 55.9571 45 56.8519C45 56.871 45 56.8896 45 56.9087C45 63.0895 49.9314 68.0996 56.0141 68.0996C61.4616 68.0996 65.9851 64.081 66.8704 58.8009C66.8892 58.658 66.9038 58.514 66.9227 58.3694C67.1397 56.4518 66.8939 54.4342 66.2063 52.7477Z" fill="url(#paint2_radial_1186_7637)"/>
-<path d="M60.854 54.0624C60.878 54.0794 60.9 54.0964 60.9225 54.1155C60.6463 53.6162 60.3021 53.159 59.9002 52.7574C56.4763 49.2786 59.0024 45.2121 59.4296 45.0081L59.4338 45.0017C56.6672 46.6489 55.7286 49.6946 55.6423 51.2186C55.7704 51.2095 55.8986 51.1984 56.0293 51.1984C58.0926 51.1989 59.8913 52.3525 60.854 54.0624Z" fill="url(#paint3_radial_1186_7637)"/>
-<path d="M56.0574 54.7568C56.0396 55.0352 55.0717 55.9954 54.7329 55.9954C51.6008 55.9954 51.0925 57.9205 51.0925 57.9205C51.2311 59.5422 52.3417 60.8769 53.6871 61.5836C53.7483 61.616 53.8105 61.6453 53.8727 61.674C53.9804 61.7223 54.0882 61.7675 54.1964 61.8084C54.6575 61.9743 55.1404 62.0688 55.6291 62.089C61.1195 62.3509 62.1825 55.4194 58.2206 53.4066C59.2355 53.227 60.2886 53.642 60.8763 54.0618C59.9137 52.3519 58.1155 51.1978 56.0506 51.1978C55.9198 51.1978 55.7891 51.2089 55.6636 51.2179C54.5582 51.2947 53.5013 51.7084 52.6309 52.405C52.7987 52.5495 52.988 52.7424 53.3875 53.1425C54.1357 53.8907 56.0532 54.6654 56.0574 54.7568Z" fill="url(#paint4_radial_1186_7637)"/>
-<path d="M56.0574 54.7568C56.0396 55.0352 55.0717 55.9954 54.7329 55.9954C51.6008 55.9954 51.0925 57.9205 51.0925 57.9205C51.2311 59.5422 52.3417 60.8769 53.6871 61.5836C53.7483 61.616 53.8105 61.6453 53.8727 61.674C53.9804 61.7223 54.0882 61.7675 54.1964 61.8084C54.6575 61.9743 55.1404 62.0688 55.6291 62.089C61.1195 62.3509 62.1825 55.4194 58.2206 53.4066C59.2355 53.227 60.2886 53.642 60.8763 54.0618C59.9137 52.3519 58.1155 51.1978 56.0506 51.1978C55.9198 51.1978 55.7891 51.2089 55.6636 51.2179C54.5582 51.2947 53.5013 51.7084 52.6309 52.405C52.7987 52.5495 52.988 52.7424 53.3875 53.1425C54.1357 53.8907 56.0532 54.6654 56.0574 54.7568Z" fill="url(#paint5_radial_1186_7637)"/>
-<path d="M52.0962 52.0338C52.1856 52.0927 52.2594 52.14 52.3247 52.1873C52.0738 51.2947 52.0631 50.3501 52.2939 49.4519C51.1623 49.9753 50.2823 50.8031 49.6428 51.5338C49.6951 51.5353 51.2925 51.5029 52.0962 52.0338Z" fill="url(#paint6_radial_1186_7637)"/>
-<path d="M45.1022 57.1743C45.9519 62.2753 50.5041 66.1738 55.6719 66.3226C60.4547 66.4602 63.5105 63.6393 64.7701 60.8868C65.5858 59.1079 66.1521 56.1971 65.1132 53.3341V53.323C65.1132 53.315 65.1132 53.3097 65.1132 53.3124C65.1132 53.315 65.1132 53.3187 65.1132 53.331C65.5038 55.9234 64.2059 58.432 62.1777 60.1323L62.1714 60.1467C58.2189 63.4172 54.4368 62.1201 53.6708 61.5888C53.6185 61.5627 53.5662 61.5356 53.5108 61.508C51.2059 60.3884 50.2542 58.255 50.4581 56.4256C48.5125 56.4256 47.8489 54.7576 47.8489 54.7576C47.8489 54.7576 49.5959 53.492 51.8982 54.5929C54.031 55.6126 56.0337 54.7582 56.0337 54.7582C56.0295 54.6668 54.1126 53.8921 53.367 53.1439C52.9675 52.7443 52.7782 52.5515 52.6103 52.4069C52.5192 52.3287 52.4239 52.2557 52.3248 52.188C52.2595 52.1423 52.1858 52.0934 52.0963 52.0344C51.2932 51.5031 49.6958 51.5334 49.6429 51.5344H49.6388C49.2022 50.9728 49.233 49.1189 49.2576 48.7315C49.2524 48.7076 48.9318 48.9005 48.8916 48.9297C48.5062 49.2093 48.1459 49.523 47.8149 49.867C47.4384 50.2551 47.0944 50.6744 46.7864 51.1205C46.0774 52.1403 45.5741 53.2927 45.3056 54.5111C45.2988 54.5345 44.9092 56.2725 45.1022 57.1743Z" fill="url(#paint7_radial_1186_7637)"/>
-<path d="M59.9009 52.7576C60.3027 53.1586 60.6468 53.6151 60.9232 54.1136C60.9839 54.1599 61.0403 54.2061 61.0884 54.2507C63.5858 56.5887 62.2775 59.8958 62.1797 60.1312C64.208 58.4309 65.5058 55.9218 65.1152 53.3299C63.8697 50.1757 61.7577 48.9037 60.0332 46.1343C59.9459 45.994 59.8591 45.8537 59.7718 45.7055C59.7232 45.621 59.6845 45.546 59.6505 45.4738C59.579 45.3332 59.5239 45.1847 59.4863 45.0312C59.4865 45.0239 59.484 45.0169 59.4794 45.0114C59.4747 45.0059 59.4683 45.0023 59.4612 45.0014C59.4543 44.9995 59.4471 44.9995 59.4403 45.0014L59.4351 45.0046C59.4323 45.0057 59.4296 45.0071 59.4272 45.0088C59.0031 45.215 56.4771 49.2793 59.9009 52.7576Z" fill="url(#paint8_radial_1186_7637)"/>
-<path d="M61.0892 54.251C61.0411 54.2064 60.9846 54.1601 60.924 54.1139C60.9015 54.0964 60.8795 54.0794 60.8555 54.0608C60.2677 53.641 59.2146 53.2265 58.1997 53.4056C62.1616 55.4184 61.0981 62.3488 55.6083 62.0869C55.1194 62.067 54.6362 61.9724 54.175 61.8063C54.0673 61.7654 53.9596 61.7203 53.8519 61.6719C53.7897 61.6432 53.7274 61.614 53.6663 61.5816L53.6736 61.5864C54.4396 62.1177 58.2227 63.4148 62.1742 60.1443L62.1805 60.1299C62.2756 59.8961 63.5839 56.589 61.0892 54.251Z" fill="url(#paint9_radial_1186_7637)"/>
-<path d="M51.07 57.9207C51.07 57.9207 51.5783 55.9956 54.7104 55.9956C55.0492 55.9956 56.0176 55.036 56.0349 54.7576C56.0349 54.7576 54.0322 55.612 51.8994 54.5923C49.5986 53.4913 47.8501 54.757 47.8501 54.757C47.8501 54.757 48.5136 56.425 50.4593 56.425C50.2554 58.2544 51.207 60.3878 53.5119 61.5074C53.5642 61.5324 53.6118 61.5605 53.6646 61.5834C52.3192 60.8772 51.2076 59.5419 51.07 57.9207Z" fill="url(#paint10_radial_1186_7637)"/>
-<path d="M66.2057 52.7475C65.7268 51.5785 64.7573 50.3139 63.996 49.9148C64.6156 51.1492 64.9743 52.3872 65.1113 53.3113C65.1113 53.3113 65.1113 53.3177 65.1113 53.3299C63.8658 50.1757 61.7539 48.9037 60.0294 46.1343C59.942 45.994 59.8552 45.8537 59.7679 45.7055C59.7193 45.621 59.6806 45.546 59.6466 45.4738C59.5751 45.3332 59.52 45.1847 59.4824 45.0312C59.4826 45.0239 59.4802 45.0169 59.4755 45.0114C59.4709 45.0059 59.4644 45.0023 59.4573 45.0014C59.4505 44.9995 59.4433 44.9995 59.4364 45.0014L59.4312 45.0046C59.4284 45.0057 59.4258 45.0071 59.4233 45.0088L59.4275 45.0025C56.6609 46.6497 55.7223 49.6954 55.6361 51.2193C55.7642 51.2103 55.8923 51.1991 56.023 51.1991C58.0874 51.1991 59.8861 52.3527 60.8487 54.0626C60.261 53.6428 59.2079 53.2284 58.193 53.4074C62.1549 55.4202 61.0914 62.3507 55.6015 62.0887C55.1126 62.0688 54.6295 61.9743 54.1683 61.8082C54.0606 61.7673 53.9529 61.7221 53.8452 61.6738C53.7829 61.6451 53.7207 61.6158 53.6595 61.5834L53.6669 61.5882C53.6146 61.5622 53.5623 61.5351 53.5069 61.5074C53.5591 61.5324 53.6067 61.5606 53.6595 61.5834C52.3141 60.8772 51.202 59.542 51.065 57.9208C51.065 57.9208 51.5732 55.9957 54.7053 55.9957C55.0441 55.9957 56.0125 55.0361 56.0298 54.7576C56.0256 54.6662 54.1087 53.8915 53.3631 53.1434C52.9636 52.7438 52.7743 52.5509 52.6064 52.4064C52.5153 52.3282 52.42 52.2551 52.3209 52.1875C52.07 51.2949 52.0593 50.3502 52.2901 49.452C51.1586 49.9754 50.2785 50.8033 49.639 51.5339H49.638C49.2014 50.9722 49.2322 49.1183 49.2568 48.731C49.2516 48.7071 48.931 48.9 48.8908 48.9292C48.5054 49.2088 48.1451 49.5224 47.8142 49.8665C47.4376 50.2545 47.0936 50.6738 46.7856 51.12C46.0766 52.1399 45.5733 53.2924 45.3048 54.5111C45.2996 54.535 45.2949 54.5605 45.2902 54.5849C45.2693 54.6832 45.1762 55.1832 45.1631 55.2906C45.078 55.8073 45.0237 56.3288 45.0005 56.8522C45.0005 56.8714 45.0005 56.89 45.0005 56.9091C45.0005 63.0898 49.9319 68.1 56.0146 68.1C61.4621 68.1 65.9856 64.0813 66.8709 58.8012C66.8897 58.6583 66.9043 58.5143 66.9231 58.3698C67.1391 56.4516 66.8933 54.434 66.2057 52.7475ZM65.1155 53.3219C65.1153 53.326 65.1153 53.3301 65.1155 53.3341V53.3219Z" fill="url(#paint11_linear_1186_7637)"/>
-<defs>
-<linearGradient id="paint0_linear_1186_7637" x1="65.8887" y1="50.9308" x2="46.6588" y2="62.8511" gradientUnits="userSpaceOnUse">
-<stop stop-color="#9658F9"/>
-<stop offset="0.13" stop-color="#9356F4"/>
-<stop offset="0.29" stop-color="#8951E5"/>
-<stop offset="0.46" stop-color="#7A49CD"/>
-<stop offset="0.64" stop-color="#643DAB"/>
-<stop offset="0.82" stop-color="#492E81"/>
-<stop offset="1" stop-color="#291D4F"/>
-</linearGradient>
-<radialGradient id="paint1_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.1519 48.6778) rotate(112.511) scale(23.2839 24.3126)">
-<stop stop-color="#9658F9"/>
-<stop offset="0.65" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint2_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.8824 59.334) scale(22.9415 23.3129)">
-<stop offset="0.25" stop-color="#AB71FF" stop-opacity="0"/>
-<stop offset="0.42" stop-color="#9462E0" stop-opacity="0.18"/>
-<stop offset="0.73" stop-color="#573B8D" stop-opacity="0.65"/>
-<stop offset="0.94" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint3_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(60.6484 44.5148) scale(16.5843 16.8528)">
-<stop offset="0.18" stop-color="#9658F9"/>
-<stop offset="0.33" stop-color="#7E48EA"/>
-<stop offset="0.37" stop-color="#7542E5"/>
-<stop offset="0.41" stop-color="#6A3DD0"/>
-<stop offset="0.48" stop-color="#5332A2"/>
-<stop offset="0.56" stop-color="#41297E"/>
-<stop offset="0.63" stop-color="#342264"/>
-<stop offset="0.69" stop-color="#2C1E54"/>
-<stop offset="0.74" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint4_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(52.8479 62.089) scale(10.9331 11.1101)">
-<stop offset="0.07" stop-color="#9358FC"/>
-<stop offset="0.13" stop-color="#9857F8"/>
-<stop offset="0.21" stop-color="#A755EB"/>
-<stop offset="0.3" stop-color="#BF52D7"/>
-<stop offset="0.39" stop-color="#E14EBA"/>
-<stop offset="0.42" stop-color="#EF4CAF"/>
-<stop offset="0.74" stop-color="#FF7583"/>
-<stop offset="0.97" stop-color="#FFB753"/>
-</radialGradient>
-<radialGradient id="paint5_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.4787 54.1254) rotate(-14.1133) scale(5.79733 6.90775)">
-<stop offset="0.22" stop-color="#FFB653" stop-opacity="0.3"/>
-<stop offset="0.34" stop-color="#FF807A" stop-opacity="0.5"/>
-<stop offset="0.44" stop-color="#FF7781" stop-opacity="0.48"/>
-<stop offset="0.57" stop-color="#FF5C94" stop-opacity="0.43"/>
-<stop offset="0.64" stop-color="#FF4AA2" stop-opacity="0.4"/>
-<stop offset="0.86" stop-color="#9658F9" stop-opacity="0.3"/>
-</radialGradient>
-<radialGradient id="paint6_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.5929 48.8515) scale(7.85915 7.9864)">
-<stop offset="0.03" stop-color="#9658F9"/>
-<stop offset="0.62" stop-color="#7542E5"/>
-<stop offset="0.72" stop-color="#6339C2"/>
-<stop offset="0.93" stop-color="#37246B"/>
-<stop offset="1" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint7_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(58.8404 39.1507) rotate(102.662) scale(32.7229 25.3152)">
-<stop offset="0.2" stop-color="#AB71FF"/>
-<stop offset="0.29" stop-color="#A46BFC"/>
-<stop offset="0.41" stop-color="#9059F2"/>
-<stop offset="0.54" stop-color="#7542E5"/>
-<stop offset="0.64" stop-color="#6239BF"/>
-<stop offset="0.94" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint8_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(59.5059 49.1947) rotate(84.0697) scale(24.9532 16.1464)">
-<stop offset="0.09" stop-color="#9658F9"/>
-<stop offset="0.14" stop-color="#8C51F3"/>
-<stop offset="0.26" stop-color="#7542E5"/>
-<stop offset="0.29" stop-color="#6E3ED6"/>
-<stop offset="0.4" stop-color="#5533A6"/>
-<stop offset="0.5" stop-color="#422980"/>
-<stop offset="0.59" stop-color="#342365"/>
-<stop offset="0.67" stop-color="#2C1E55"/>
-<stop offset="0.74" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint9_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.4076 51.8087) scale(20.9312 21.2702)">
-<stop stop-color="#9658F9"/>
-<stop offset="0.12" stop-color="#9155F6"/>
-<stop offset="0.25" stop-color="#834CEE"/>
-<stop offset="0.34" stop-color="#7542E5"/>
-<stop offset="0.78" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint10_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(62.9339 53.0525) scale(22.862 23.2321)">
-<stop offset="0.19" stop-color="#9658F9"/>
-<stop offset="0.49" stop-color="#834BED"/>
-<stop offset="0.66" stop-color="#7542E5"/>
-<stop offset="0.7" stop-color="#6B3DD2"/>
-<stop offset="0.79" stop-color="#52319F"/>
-<stop offset="0.91" stop-color="#291D4F"/>
-</radialGradient>
-<linearGradient id="paint11_linear_1186_7637" x1="64.5267" y1="48.4823" x2="48.7204" y2="64.0368" gradientUnits="userSpaceOnUse">
-<stop stop-color="#9059FF" stop-opacity="0.9"/>
-<stop offset="0.61" stop-color="#291D4F" stop-opacity="0"/>
-</linearGradient>
-</defs>
-</svg>
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 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg width="113" height="113" viewBox="0 0 113 113" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="113" height="113" rx="4" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2H109C110.105 2 111 2.89543 111 4V109C111 110.105 110.105 111 109 111H4C2.89543 111 2 110.105 2 109V4C2 2.89543 2.89543 2 4 2ZM0 4C0 1.79086 1.79086 0 4 0H109C111.209 0 113 1.79086 113 4V109C113 111.209 111.209 113 109 113H4C1.79086 113 0 111.209 0 109V4ZM103 10H99.7931H96.5862H93.3793H90.1724H86.9655H83.7586H80.5517V13.2069V16.4138V19.6207V22.8276V26.0345V29.2414V32.4483H83.7586H86.9655H90.1724H93.3793H96.5862H99.7931H103V29.2414V26.0345V22.8276V19.6207V16.4138V13.2069V10ZM96.5862 13.2069H99.7931V16.4138V19.6207V22.8276V26.0345V29.2414H96.5862H93.3793H90.1724H86.9655H83.7586V26.0345V22.8276V19.6207V16.4138V13.2069H86.9655H90.1724H93.3793H96.5862ZM70.931 10H67.7241V13.2069H64.5172V10H61.3103H58.1034V13.2069H54.8966V10H51.6897H48.4828H45.2759H42.069H38.8621V13.2069H35.6552V16.4138V19.6207H38.8621V22.8276H42.069V26.0345H38.8621H35.6552V29.2414V32.4483H38.8621V35.6552H35.6552V38.8621V42.069H32.4483V38.8621V35.6552H29.2414H26.0345V38.8621H22.8276H19.6207H16.4138V35.6552H13.2069V38.8621H10V42.069V45.2759V48.4828V51.6897V54.8966V58.1034V61.3103V64.5172V67.7241V70.931H13.2069V74.1379V77.3448H10V80.5517V83.7586H13.2069V86.9655H10V90.1724H13.2069V93.3793H10V96.5862V99.7931H13.2069V103H16.4138V99.7931V96.5862H19.6207V99.7931H22.8276V103H26.0345V99.7931H29.2414H32.4483V103H35.6552H38.8621H42.069H45.2759V99.7931V96.5862H48.4828H51.6897V99.7931H48.4828V103H51.6897H54.8966H58.1034V99.7931V96.5862V93.3793V90.1724H54.8966V86.9655H51.6897V90.1724H48.4828H45.2759V86.9655H48.4828V83.7586H45.2759V80.5517H48.4828H51.6897H54.8966V83.7586H58.1034V80.5517H61.3103V83.7586H64.5172V80.5517H61.3103V77.3448V74.1379H64.5172H67.7241H70.931V77.3448H67.7241V80.5517V83.7586V86.9655V90.1724V93.3793V96.5862H70.931V99.7931H67.7241V103H70.931H74.1379V99.7931V96.5862H70.931V93.3793V90.1724V86.9655H74.1379V90.1724H77.3448V86.9655V83.7586V80.5517V77.3448H80.5517H83.7586H86.9655H90.1724V74.1379V70.931V67.7241H86.9655V70.931V74.1379H83.7586H80.5517V70.931H83.7586V67.7241H80.5517V64.5172H83.7586H86.9655V61.3103H90.1724V64.5172H93.3793H96.5862V67.7241H99.7931H103V64.5172H99.7931H96.5862V61.3103V58.1034H99.7931V61.3103H103V58.1034H99.7931V54.8966H103V51.6897H99.7931V48.4828H103V45.2759V42.069V38.8621H99.7931H96.5862H93.3793V42.069H90.1724H86.9655V45.2759V48.4828H83.7586H80.5517V51.6897H77.3448V48.4828H74.1379V51.6897H70.931V54.8966V58.1034H74.1379V61.3103H70.931V64.5172V67.7241H74.1379V64.5172H77.3448V67.7241V70.931H74.1379H70.931H67.7241H64.5172H61.3103H58.1034V74.1379H54.8966V70.931H51.6897V74.1379H54.8966V77.3448H51.6897H48.4828V74.1379V70.931H45.2759V74.1379H42.069H38.8621H35.6552H32.4483H29.2414V70.931V67.7241V64.5172H26.0345H22.8276V67.7241H19.6207H16.4138V70.931H13.2069V67.7241V64.5172H16.4138V61.3103V58.1034H13.2069V54.8966V51.6897V48.4828H16.4138V45.2759H13.2069V42.069H16.4138H19.6207V45.2759H22.8276V42.069H26.0345H29.2414H32.4483V45.2759V48.4828H35.6552H38.8621V51.6897H42.069V48.4828V45.2759H45.2759V42.069H42.069V38.8621H45.2759V35.6552H48.4828V32.4483H51.6897V35.6552V38.8621V42.069H54.8966H58.1034H61.3103V38.8621H58.1034V35.6552H61.3103V32.4483H64.5172V29.2414H67.7241V32.4483H70.931V35.6552H74.1379H77.3448V38.8621H80.5517H83.7586H86.9655H90.1724V35.6552H86.9655H83.7586H80.5517H77.3448V32.4483V29.2414V26.0345H74.1379V22.8276H70.931V19.6207H74.1379V16.4138H77.3448V13.2069H74.1379V16.4138H70.931V13.2069V10ZM70.931 26.0345V22.8276H67.7241V19.6207H64.5172V16.4138H61.3103H58.1034H54.8966V19.6207H58.1034H61.3103V22.8276H64.5172H67.7241V26.0345H70.931ZM70.931 26.0345V29.2414V32.4483H74.1379V29.2414V26.0345H70.931ZM64.5172 29.2414V26.0345H61.3103H58.1034V29.2414V32.4483H61.3103V29.2414H64.5172ZM51.6897 29.2414H54.8966V32.4483H51.6897V29.2414ZM51.6897 29.2414V26.0345H48.4828V22.8276H51.6897V19.6207H48.4828H45.2759V16.4138H48.4828V13.2069H45.2759H42.069H38.8621V16.4138H42.069V19.6207V22.8276H45.2759V26.0345V29.2414V32.4483H48.4828V29.2414H51.6897ZM42.069 42.069H38.8621V45.2759H42.069V42.069ZM22.8276 90.1724H19.6207H16.4138V86.9655V83.7586H13.2069V80.5517V77.3448H16.4138V80.5517H19.6207V77.3448H16.4138V74.1379V70.931H19.6207H22.8276H26.0345V74.1379H22.8276V77.3448V80.5517V83.7586H19.6207V86.9655H22.8276V90.1724ZM80.5517 61.3103V64.5172H77.3448V61.3103H80.5517ZM86.9655 58.1034V61.3103H83.7586H80.5517V58.1034H83.7586H86.9655ZM86.9655 58.1034V54.8966H90.1724V58.1034H86.9655ZM80.5517 51.6897V54.8966H83.7586V51.6897H80.5517ZM96.5862 45.2759H99.7931V48.4828H96.5862V45.2759ZM93.3793 45.2759V42.069H96.5862V45.2759H93.3793ZM93.3793 45.2759V48.4828V51.6897H90.1724V48.4828V45.2759H93.3793ZM96.5862 58.1034V54.8966H93.3793V58.1034H96.5862ZM77.3448 77.3448V74.1379H74.1379V77.3448H77.3448ZM45.2759 83.7586V86.9655H42.069V83.7586H45.2759ZM32.4483 96.5862H29.2414H26.0345V99.7931H22.8276V96.5862V93.3793V90.1724H26.0345V93.3793H29.2414V90.1724H32.4483H35.6552H38.8621H42.069H45.2759V93.3793H42.069H38.8621H35.6552H32.4483V96.5862ZM51.6897 90.1724V93.3793V96.5862H54.8966V93.3793V90.1724H51.6897ZM32.4483 96.5862V99.7931H35.6552V96.5862H32.4483ZM42.069 38.8621H38.8621V35.6552H42.069V38.8621ZM38.8621 32.4483V29.2414H42.069V32.4483H38.8621ZM64.5172 38.8621V42.069H67.7241V38.8621V35.6552H64.5172V38.8621ZM32.4483 10H29.2414H26.0345H22.8276H19.6207H16.4138H13.2069H10V13.2069V16.4138V19.6207V22.8276V26.0345V29.2414V32.4483H13.2069H16.4138H19.6207H22.8276H26.0345H29.2414H32.4483V29.2414V26.0345V22.8276V19.6207V16.4138V13.2069V10ZM26.0345 13.2069H29.2414V16.4138V19.6207V22.8276V26.0345V29.2414H26.0345H22.8276H19.6207H16.4138H13.2069V26.0345V22.8276V19.6207V16.4138V13.2069H16.4138H19.6207H22.8276H26.0345ZM96.5862 16.4138H93.3793H90.1724H86.9655V19.6207V22.8276V26.0345H90.1724H93.3793H96.5862V22.8276V19.6207V16.4138ZM26.0345 16.4138H22.8276H19.6207H16.4138V19.6207V22.8276V26.0345H19.6207H22.8276H26.0345V22.8276V19.6207V16.4138ZM83.7586 42.069H80.5517V45.2759H83.7586V42.069ZM74.1379 42.069H70.931V45.2759H74.1379V42.069ZM29.2414 45.2759H26.0345V48.4828V51.6897H22.8276V48.4828H19.6207V51.6897H16.4138V54.8966H19.6207V51.6897H22.8276V54.8966V58.1034H19.6207V61.3103H22.8276V58.1034H26.0345V61.3103H29.2414V58.1034H32.4483H35.6552V61.3103H32.4483V64.5172V67.7241H35.6552V70.931H38.8621V67.7241V64.5172H35.6552V61.3103H38.8621V58.1034V54.8966H35.6552H32.4483V51.6897H29.2414V48.4828V45.2759ZM29.2414 51.6897V54.8966V58.1034H26.0345V54.8966V51.6897H29.2414ZM96.5862 70.931H93.3793V74.1379H96.5862V77.3448H99.7931H103V74.1379H99.7931H96.5862V70.931ZM32.4483 77.3448H35.6552V80.5517V83.7586V86.9655H32.4483H29.2414H26.0345V83.7586V80.5517V77.3448H29.2414H32.4483ZM70.931 80.5517H74.1379V83.7586H70.931V80.5517ZM103 80.5517H99.7931H96.5862H93.3793H90.1724H86.9655H83.7586H80.5517V83.7586V86.9655V90.1724V93.3793V96.5862V99.7931V103H83.7586H86.9655H90.1724H93.3793H96.5862H99.7931H103V99.7931V96.5862V93.3793V90.1724V86.9655V83.7586V80.5517ZM96.5862 83.7586H99.7931V86.9655V90.1724V93.3793V96.5862V99.7931H96.5862H93.3793H90.1724H86.9655H83.7586V96.5862V93.3793V90.1724V86.9655V83.7586H86.9655H90.1724H93.3793H96.5862ZM32.4483 80.5517H29.2414V83.7586H32.4483V80.5517ZM96.5862 86.9655H93.3793H90.1724H86.9655V90.1724V93.3793V96.5862H90.1724H93.3793H96.5862V93.3793V90.1724V86.9655ZM64.5172 90.1724H61.3103V93.3793V96.5862V99.7931V103H64.5172V99.7931V96.5862V93.3793V90.1724Z" fill="#1C1B22"/>
-<path d="M66.2056 52.7475C65.7266 51.5785 64.7572 50.3139 63.9959 49.9148C64.6155 51.1492 64.9742 52.3872 65.1112 53.3113C65.1112 53.3113 65.1112 53.3177 65.1112 53.3299C63.8657 50.1757 61.7537 48.9037 60.0292 46.1343C59.9419 45.994 59.8551 45.8537 59.7678 45.7055C59.7192 45.621 59.6805 45.546 59.6465 45.4738C59.575 45.3332 59.5199 45.1847 59.4823 45.0312C59.4825 45.0239 59.48 45.0169 59.4754 45.0114C59.4707 45.0059 59.4643 45.0023 59.4572 45.0014C59.4503 44.9995 59.4431 44.9995 59.4363 45.0014L59.431 45.0046C59.4283 45.0057 59.4256 45.0071 59.4232 45.0088L59.4274 45.0025C56.6608 46.6497 55.7222 49.6954 55.6359 51.2193C54.5305 51.2961 53.4736 51.7098 52.6032 52.4064C52.512 52.3282 52.4167 52.2551 52.3177 52.1875C52.0667 51.2949 52.0561 50.3502 52.2868 49.452C51.1553 49.9754 50.2753 50.8033 49.6358 51.5339H49.6379C49.2012 50.9722 49.2321 49.1183 49.2567 48.731C49.2514 48.7071 48.9309 48.9 48.8906 48.9292C48.5053 49.2088 48.145 49.5224 47.814 49.8665C47.4375 50.2545 47.0935 50.6738 46.7855 51.12C46.0764 52.1399 45.5731 53.2924 45.3047 54.5111C45.2994 54.535 45.2947 54.5605 45.29 54.5849C45.2691 54.6832 45.1943 55.1763 45.1813 55.2837C45.1813 55.2916 45.1813 55.2996 45.1813 55.3081C45.0847 55.8177 45.0249 56.3338 45.0024 56.8522C45.0024 56.8714 45.0024 56.89 45.0024 56.9091C45.0024 63.0898 49.9338 68.1 56.0166 68.1C61.464 68.1 65.9876 64.0813 66.8728 58.8012C66.8916 58.6583 66.9063 58.5143 66.9251 58.3698C67.139 56.4516 66.8932 54.434 66.2056 52.7475ZM53.5109 61.5074C53.5632 61.5324 53.6108 61.5606 53.6636 61.5834L53.6709 61.5882C53.6176 61.5622 53.5642 61.5351 53.5109 61.5074ZM65.1154 53.3331V53.3219C65.1151 53.326 65.1151 53.3301 65.1154 53.3341V53.3331Z" fill="url(#paint0_linear_1186_7637)"/>
-<path d="M66.2063 52.7477C65.7273 51.5787 64.7579 50.3141 63.9966 49.915C64.6162 51.1494 64.9749 52.3874 65.1119 53.3115C65.1119 53.3088 65.1119 53.3115 65.1119 53.3221C65.1116 53.3262 65.1116 53.3302 65.1119 53.3343C66.1509 56.1973 65.5825 59.108 64.7689 60.887C63.5066 63.6394 60.4509 66.4604 55.6706 66.3228C50.5029 66.174 45.9506 62.2776 45.1009 57.1744C44.9441 56.3699 45.1009 55.9608 45.1788 55.3078C45.0837 55.8115 45.0476 55.9571 45 56.8519C45 56.871 45 56.8896 45 56.9087C45 63.0895 49.9314 68.0996 56.0141 68.0996C61.4616 68.0996 65.9851 64.081 66.8704 58.8009C66.8892 58.658 66.9038 58.514 66.9227 58.3694C67.1397 56.4518 66.8939 54.4342 66.2063 52.7477Z" fill="url(#paint1_radial_1186_7637)"/>
-<path d="M66.2063 52.7477C65.7273 51.5787 64.7579 50.3141 63.9966 49.915C64.6162 51.1494 64.9749 52.3874 65.1119 53.3115C65.1119 53.3088 65.1119 53.3115 65.1119 53.3221C65.1116 53.3262 65.1116 53.3302 65.1119 53.3343C66.1509 56.1973 65.5825 59.108 64.7689 60.887C63.5066 63.6394 60.4509 66.4604 55.6706 66.3228C50.5029 66.174 45.9506 62.2776 45.1009 57.1744C44.9441 56.3699 45.1009 55.9608 45.1788 55.3078C45.0837 55.8115 45.0476 55.9571 45 56.8519C45 56.871 45 56.8896 45 56.9087C45 63.0895 49.9314 68.0996 56.0141 68.0996C61.4616 68.0996 65.9851 64.081 66.8704 58.8009C66.8892 58.658 66.9038 58.514 66.9227 58.3694C67.1397 56.4518 66.8939 54.4342 66.2063 52.7477Z" fill="url(#paint2_radial_1186_7637)"/>
-<path d="M60.854 54.0624C60.878 54.0794 60.9 54.0964 60.9225 54.1155C60.6463 53.6162 60.3021 53.159 59.9002 52.7574C56.4763 49.2786 59.0024 45.2121 59.4296 45.0081L59.4338 45.0017C56.6672 46.6489 55.7286 49.6946 55.6423 51.2186C55.7704 51.2095 55.8986 51.1984 56.0293 51.1984C58.0926 51.1989 59.8913 52.3525 60.854 54.0624Z" fill="url(#paint3_radial_1186_7637)"/>
-<path d="M56.0574 54.7568C56.0396 55.0352 55.0717 55.9954 54.7329 55.9954C51.6008 55.9954 51.0925 57.9205 51.0925 57.9205C51.2311 59.5422 52.3417 60.8769 53.6871 61.5836C53.7483 61.616 53.8105 61.6453 53.8727 61.674C53.9804 61.7223 54.0882 61.7675 54.1964 61.8084C54.6575 61.9743 55.1404 62.0688 55.6291 62.089C61.1195 62.3509 62.1825 55.4194 58.2206 53.4066C59.2355 53.227 60.2886 53.642 60.8763 54.0618C59.9137 52.3519 58.1155 51.1978 56.0506 51.1978C55.9198 51.1978 55.7891 51.2089 55.6636 51.2179C54.5582 51.2947 53.5013 51.7084 52.6309 52.405C52.7987 52.5495 52.988 52.7424 53.3875 53.1425C54.1357 53.8907 56.0532 54.6654 56.0574 54.7568Z" fill="url(#paint4_radial_1186_7637)"/>
-<path d="M56.0574 54.7568C56.0396 55.0352 55.0717 55.9954 54.7329 55.9954C51.6008 55.9954 51.0925 57.9205 51.0925 57.9205C51.2311 59.5422 52.3417 60.8769 53.6871 61.5836C53.7483 61.616 53.8105 61.6453 53.8727 61.674C53.9804 61.7223 54.0882 61.7675 54.1964 61.8084C54.6575 61.9743 55.1404 62.0688 55.6291 62.089C61.1195 62.3509 62.1825 55.4194 58.2206 53.4066C59.2355 53.227 60.2886 53.642 60.8763 54.0618C59.9137 52.3519 58.1155 51.1978 56.0506 51.1978C55.9198 51.1978 55.7891 51.2089 55.6636 51.2179C54.5582 51.2947 53.5013 51.7084 52.6309 52.405C52.7987 52.5495 52.988 52.7424 53.3875 53.1425C54.1357 53.8907 56.0532 54.6654 56.0574 54.7568Z" fill="url(#paint5_radial_1186_7637)"/>
-<path d="M52.0962 52.0338C52.1856 52.0927 52.2594 52.14 52.3247 52.1873C52.0738 51.2947 52.0631 50.3501 52.2939 49.4519C51.1623 49.9753 50.2823 50.8031 49.6428 51.5338C49.6951 51.5353 51.2925 51.5029 52.0962 52.0338Z" fill="url(#paint6_radial_1186_7637)"/>
-<path d="M45.1022 57.1743C45.9519 62.2753 50.5041 66.1738 55.6719 66.3226C60.4547 66.4602 63.5105 63.6393 64.7701 60.8868C65.5858 59.1079 66.1521 56.1971 65.1132 53.3341V53.323C65.1132 53.315 65.1132 53.3097 65.1132 53.3124C65.1132 53.315 65.1132 53.3187 65.1132 53.331C65.5038 55.9234 64.2059 58.432 62.1777 60.1323L62.1714 60.1467C58.2189 63.4172 54.4368 62.1201 53.6708 61.5888C53.6185 61.5627 53.5662 61.5356 53.5108 61.508C51.2059 60.3884 50.2542 58.255 50.4581 56.4256C48.5125 56.4256 47.8489 54.7576 47.8489 54.7576C47.8489 54.7576 49.5959 53.492 51.8982 54.5929C54.031 55.6126 56.0337 54.7582 56.0337 54.7582C56.0295 54.6668 54.1126 53.8921 53.367 53.1439C52.9675 52.7443 52.7782 52.5515 52.6103 52.4069C52.5192 52.3287 52.4239 52.2557 52.3248 52.188C52.2595 52.1423 52.1858 52.0934 52.0963 52.0344C51.2932 51.5031 49.6958 51.5334 49.6429 51.5344H49.6388C49.2022 50.9728 49.233 49.1189 49.2576 48.7315C49.2524 48.7076 48.9318 48.9005 48.8916 48.9297C48.5062 49.2093 48.1459 49.523 47.8149 49.867C47.4384 50.2551 47.0944 50.6744 46.7864 51.1205C46.0774 52.1403 45.5741 53.2927 45.3056 54.5111C45.2988 54.5345 44.9092 56.2725 45.1022 57.1743Z" fill="url(#paint7_radial_1186_7637)"/>
-<path d="M59.9009 52.7576C60.3027 53.1586 60.6468 53.6151 60.9232 54.1136C60.9839 54.1599 61.0403 54.2061 61.0884 54.2507C63.5858 56.5887 62.2775 59.8958 62.1797 60.1312C64.208 58.4309 65.5058 55.9218 65.1152 53.3299C63.8697 50.1757 61.7577 48.9037 60.0332 46.1343C59.9459 45.994 59.8591 45.8537 59.7718 45.7055C59.7232 45.621 59.6845 45.546 59.6505 45.4738C59.579 45.3332 59.5239 45.1847 59.4863 45.0312C59.4865 45.0239 59.484 45.0169 59.4794 45.0114C59.4747 45.0059 59.4683 45.0023 59.4612 45.0014C59.4543 44.9995 59.4471 44.9995 59.4403 45.0014L59.4351 45.0046C59.4323 45.0057 59.4296 45.0071 59.4272 45.0088C59.0031 45.215 56.4771 49.2793 59.9009 52.7576Z" fill="url(#paint8_radial_1186_7637)"/>
-<path d="M61.0892 54.251C61.0411 54.2064 60.9846 54.1601 60.924 54.1139C60.9015 54.0964 60.8795 54.0794 60.8555 54.0608C60.2677 53.641 59.2146 53.2265 58.1997 53.4056C62.1616 55.4184 61.0981 62.3488 55.6083 62.0869C55.1194 62.067 54.6362 61.9724 54.175 61.8063C54.0673 61.7654 53.9596 61.7203 53.8519 61.6719C53.7897 61.6432 53.7274 61.614 53.6663 61.5816L53.6736 61.5864C54.4396 62.1177 58.2227 63.4148 62.1742 60.1443L62.1805 60.1299C62.2756 59.8961 63.5839 56.589 61.0892 54.251Z" fill="url(#paint9_radial_1186_7637)"/>
-<path d="M51.07 57.9207C51.07 57.9207 51.5783 55.9956 54.7104 55.9956C55.0492 55.9956 56.0176 55.036 56.0349 54.7576C56.0349 54.7576 54.0322 55.612 51.8994 54.5923C49.5986 53.4913 47.8501 54.757 47.8501 54.757C47.8501 54.757 48.5136 56.425 50.4593 56.425C50.2554 58.2544 51.207 60.3878 53.5119 61.5074C53.5642 61.5324 53.6118 61.5605 53.6646 61.5834C52.3192 60.8772 51.2076 59.5419 51.07 57.9207Z" fill="url(#paint10_radial_1186_7637)"/>
-<path d="M66.2057 52.7475C65.7268 51.5785 64.7573 50.3139 63.996 49.9148C64.6156 51.1492 64.9743 52.3872 65.1113 53.3113C65.1113 53.3113 65.1113 53.3177 65.1113 53.3299C63.8658 50.1757 61.7539 48.9037 60.0294 46.1343C59.942 45.994 59.8552 45.8537 59.7679 45.7055C59.7193 45.621 59.6806 45.546 59.6466 45.4738C59.5751 45.3332 59.52 45.1847 59.4824 45.0312C59.4826 45.0239 59.4802 45.0169 59.4755 45.0114C59.4709 45.0059 59.4644 45.0023 59.4573 45.0014C59.4505 44.9995 59.4433 44.9995 59.4364 45.0014L59.4312 45.0046C59.4284 45.0057 59.4258 45.0071 59.4233 45.0088L59.4275 45.0025C56.6609 46.6497 55.7223 49.6954 55.6361 51.2193C55.7642 51.2103 55.8923 51.1991 56.023 51.1991C58.0874 51.1991 59.8861 52.3527 60.8487 54.0626C60.261 53.6428 59.2079 53.2284 58.193 53.4074C62.1549 55.4202 61.0914 62.3507 55.6015 62.0887C55.1126 62.0688 54.6295 61.9743 54.1683 61.8082C54.0606 61.7673 53.9529 61.7221 53.8452 61.6738C53.7829 61.6451 53.7207 61.6158 53.6595 61.5834L53.6669 61.5882C53.6146 61.5622 53.5623 61.5351 53.5069 61.5074C53.5591 61.5324 53.6067 61.5606 53.6595 61.5834C52.3141 60.8772 51.202 59.542 51.065 57.9208C51.065 57.9208 51.5732 55.9957 54.7053 55.9957C55.0441 55.9957 56.0125 55.0361 56.0298 54.7576C56.0256 54.6662 54.1087 53.8915 53.3631 53.1434C52.9636 52.7438 52.7743 52.5509 52.6064 52.4064C52.5153 52.3282 52.42 52.2551 52.3209 52.1875C52.07 51.2949 52.0593 50.3502 52.2901 49.452C51.1586 49.9754 50.2785 50.8033 49.639 51.5339H49.638C49.2014 50.9722 49.2322 49.1183 49.2568 48.731C49.2516 48.7071 48.931 48.9 48.8908 48.9292C48.5054 49.2088 48.1451 49.5224 47.8142 49.8665C47.4376 50.2545 47.0936 50.6738 46.7856 51.12C46.0766 52.1399 45.5733 53.2924 45.3048 54.5111C45.2996 54.535 45.2949 54.5605 45.2902 54.5849C45.2693 54.6832 45.1762 55.1832 45.1631 55.2906C45.078 55.8073 45.0237 56.3288 45.0005 56.8522C45.0005 56.8714 45.0005 56.89 45.0005 56.9091C45.0005 63.0898 49.9319 68.1 56.0146 68.1C61.4621 68.1 65.9856 64.0813 66.8709 58.8012C66.8897 58.6583 66.9043 58.5143 66.9231 58.3698C67.1391 56.4516 66.8933 54.434 66.2057 52.7475ZM65.1155 53.3219C65.1153 53.326 65.1153 53.3301 65.1155 53.3341V53.3219Z" fill="url(#paint11_linear_1186_7637)"/>
-<defs>
-<linearGradient id="paint0_linear_1186_7637" x1="65.8887" y1="50.9308" x2="46.6588" y2="62.8511" gradientUnits="userSpaceOnUse">
-<stop stop-color="#9658F9"/>
-<stop offset="0.13" stop-color="#9356F4"/>
-<stop offset="0.29" stop-color="#8951E5"/>
-<stop offset="0.46" stop-color="#7A49CD"/>
-<stop offset="0.64" stop-color="#643DAB"/>
-<stop offset="0.82" stop-color="#492E81"/>
-<stop offset="1" stop-color="#291D4F"/>
-</linearGradient>
-<radialGradient id="paint1_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.1519 48.6778) rotate(112.511) scale(23.2839 24.3126)">
-<stop stop-color="#9658F9"/>
-<stop offset="0.65" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint2_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.8824 59.334) scale(22.9415 23.3129)">
-<stop offset="0.25" stop-color="#AB71FF" stop-opacity="0"/>
-<stop offset="0.42" stop-color="#9462E0" stop-opacity="0.18"/>
-<stop offset="0.73" stop-color="#573B8D" stop-opacity="0.65"/>
-<stop offset="0.94" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint3_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(60.6484 44.5148) scale(16.5843 16.8528)">
-<stop offset="0.18" stop-color="#9658F9"/>
-<stop offset="0.33" stop-color="#7E48EA"/>
-<stop offset="0.37" stop-color="#7542E5"/>
-<stop offset="0.41" stop-color="#6A3DD0"/>
-<stop offset="0.48" stop-color="#5332A2"/>
-<stop offset="0.56" stop-color="#41297E"/>
-<stop offset="0.63" stop-color="#342264"/>
-<stop offset="0.69" stop-color="#2C1E54"/>
-<stop offset="0.74" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint4_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(52.8479 62.089) scale(10.9331 11.1101)">
-<stop offset="0.07" stop-color="#9358FC"/>
-<stop offset="0.13" stop-color="#9857F8"/>
-<stop offset="0.21" stop-color="#A755EB"/>
-<stop offset="0.3" stop-color="#BF52D7"/>
-<stop offset="0.39" stop-color="#E14EBA"/>
-<stop offset="0.42" stop-color="#EF4CAF"/>
-<stop offset="0.74" stop-color="#FF7583"/>
-<stop offset="0.97" stop-color="#FFB753"/>
-</radialGradient>
-<radialGradient id="paint5_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.4787 54.1254) rotate(-14.1133) scale(5.79733 6.90775)">
-<stop offset="0.22" stop-color="#FFB653" stop-opacity="0.3"/>
-<stop offset="0.34" stop-color="#FF807A" stop-opacity="0.5"/>
-<stop offset="0.44" stop-color="#FF7781" stop-opacity="0.48"/>
-<stop offset="0.57" stop-color="#FF5C94" stop-opacity="0.43"/>
-<stop offset="0.64" stop-color="#FF4AA2" stop-opacity="0.4"/>
-<stop offset="0.86" stop-color="#9658F9" stop-opacity="0.3"/>
-</radialGradient>
-<radialGradient id="paint6_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.5929 48.8515) scale(7.85915 7.9864)">
-<stop offset="0.03" stop-color="#9658F9"/>
-<stop offset="0.62" stop-color="#7542E5"/>
-<stop offset="0.72" stop-color="#6339C2"/>
-<stop offset="0.93" stop-color="#37246B"/>
-<stop offset="1" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint7_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(58.8404 39.1507) rotate(102.662) scale(32.7229 25.3152)">
-<stop offset="0.2" stop-color="#AB71FF"/>
-<stop offset="0.29" stop-color="#A46BFC"/>
-<stop offset="0.41" stop-color="#9059F2"/>
-<stop offset="0.54" stop-color="#7542E5"/>
-<stop offset="0.64" stop-color="#6239BF"/>
-<stop offset="0.94" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint8_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(59.5059 49.1947) rotate(84.0697) scale(24.9532 16.1464)">
-<stop offset="0.09" stop-color="#9658F9"/>
-<stop offset="0.14" stop-color="#8C51F3"/>
-<stop offset="0.26" stop-color="#7542E5"/>
-<stop offset="0.29" stop-color="#6E3ED6"/>
-<stop offset="0.4" stop-color="#5533A6"/>
-<stop offset="0.5" stop-color="#422980"/>
-<stop offset="0.59" stop-color="#342365"/>
-<stop offset="0.67" stop-color="#2C1E55"/>
-<stop offset="0.74" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint9_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.4076 51.8087) scale(20.9312 21.2702)">
-<stop stop-color="#9658F9"/>
-<stop offset="0.12" stop-color="#9155F6"/>
-<stop offset="0.25" stop-color="#834CEE"/>
-<stop offset="0.34" stop-color="#7542E5"/>
-<stop offset="0.78" stop-color="#291D4F"/>
-</radialGradient>
-<radialGradient id="paint10_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(62.9339 53.0525) scale(22.862 23.2321)">
-<stop offset="0.19" stop-color="#9658F9"/>
-<stop offset="0.49" stop-color="#834BED"/>
-<stop offset="0.66" stop-color="#7542E5"/>
-<stop offset="0.7" stop-color="#6B3DD2"/>
-<stop offset="0.79" stop-color="#52319F"/>
-<stop offset="0.91" stop-color="#291D4F"/>
-</radialGradient>
-<linearGradient id="paint11_linear_1186_7637" x1="64.5267" y1="48.4823" x2="48.7204" y2="64.0368" gradientUnits="userSpaceOnUse">
-<stop stop-color="#9059FF" stop-opacity="0.9"/>
-<stop offset="0.61" stop-color="#291D4F" stop-opacity="0"/>
-</linearGradient>
-</defs>
-</svg>
helpers/DATA/firefox/process-json-files.py
View file @ 6b5ae172
...@@ -51,10 +51,18 @@ class RemoteSettings: ...@@ -51,10 +51,18 @@ class RemoteSettings:
DUMPS_PATH_ABSOLUTE = arguments.MAIN_PATH / DUMPS_PATH_RELATIVE DUMPS_PATH_ABSOLUTE = arguments.MAIN_PATH / DUMPS_PATH_RELATIVE
_WRAPPER_NAME = 'data' _WRAPPER_NAME = 'data'
_LAST_MODIFIED_KEY_NAME = 'last_modified'
@classmethod
def get_collection_timestamp(cls, collection):
return max((record[cls._LAST_MODIFIED_KEY_NAME]
for record in collection.content), default=0)
@classmethod @classmethod
def wrap(cls, processed): def wrap(cls, processed):
return File(processed.path, {cls._WRAPPER_NAME: processed.content}) return File(processed.path,
{cls._WRAPPER_NAME: processed.content,
'timestamp': cls.get_collection_timestamp(processed)})
@classmethod @classmethod
def unwrap(cls, parsed_jsons): def unwrap(cls, parsed_jsons):
...@@ -88,13 +96,15 @@ class RemoteSettings: ...@@ -88,13 +96,15 @@ class RemoteSettings:
while timestamp in timestamps: while timestamp in timestamps:
timestamp += 1 timestamp += 1
timestamps.append(timestamp) timestamps.append(timestamp)
record['last_modified'] = timestamp record[cls._LAST_MODIFIED_KEY_NAME] = timestamp
if parsed_schema is not None: if parsed_schema is not None:
validate(record, schema=parsed_schema) validate(record, schema=parsed_schema)
result.append(record) result.append(record)
result.sort(
key=lambda record: record[cls._LAST_MODIFIED_KEY_NAME], reverse=True)
cls.OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True) cls.OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True)
return File(cls.OUTPUT_PATH, result) return File(cls.OUTPUT_PATH, result)
...@@ -109,7 +119,7 @@ class RemoteSettings: ...@@ -109,7 +119,7 @@ class RemoteSettings:
class Changes(RemoteSettings): class Changes(RemoteSettings):
JSON_PATHS = tuple(RemoteSettings.DUMPS_PATH_ABSOLUTE.glob('*/*.json')) JSON_PATHS = tuple(RemoteSettings.DUMPS_PATH_ABSOLUTE.glob('*/*.json'))
OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes.json' OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes'
@classmethod @classmethod
def wrap(cls, processed): def wrap(cls, processed):
...@@ -124,8 +134,8 @@ class Changes(RemoteSettings): ...@@ -124,8 +134,8 @@ class Changes(RemoteSettings):
for collection in unwrapped_jsons: for collection in unwrapped_jsons:
if collection.path != RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json': if collection.path != RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json':
latest_change = {} latest_change = {}
latest_change['last_modified'] = max( latest_change[cls._LAST_MODIFIED_KEY_NAME] = cls.get_collection_timestamp(
(record['last_modified'] for record in collection.content), default=0) collection)
latest_change['bucket'] = collection.path.parent.name latest_change['bucket'] = collection.path.parent.name
latest_change['collection'] = collection.path.stem latest_change['collection'] = collection.path.stem
changes.append(latest_change) changes.append(latest_change)
......
helpers/DATA/firefox/settings.js
View file @ 6b5ae172
...@@ -232,7 +232,7 @@ pref("browser.onboarding.updatetour", "performance,library,singlesearch,customiz ...@@ -232,7 +232,7 @@ pref("browser.onboarding.updatetour", "performance,library,singlesearch,customiz
pref("browser.onboarding.enabled", false); pref("browser.onboarding.enabled", false);
// New tab settings // 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.showTopSites",true);
pref("browser.newtabpage.activity-stream.feeds.section.topstories",false); pref("browser.newtabpage.activity-stream.feeds.section.topstories",false);
pref("browser.newtabpage.activity-stream.feeds.snippets",false); pref("browser.newtabpage.activity-stream.feeds.snippets",false);
......
helpers/DATA/freedom-maker/0001-documentation_could-be-upstreamed.patch 0 → 100644
View file @ 6b5ae172
diff --git a/README.md b/README.md
index b7931bb..3fb54f4 100644
--- a/README.md
+++ b/README.md
@@ -26,28 +26,29 @@ tweaks, see the *Build Images* section below.
Freedom-maker supports building for the following targets:
-
-- *a20-olinuxino-lime*: A20 OLinuXino Lime's SD card
-- *a20-olinuxino-lime2*: A20 OLinuXino Lime2's SD card
-- *a20-olinuxino-micro*: A20 OLinuXino MICRO's SD card
-- *amd64*: Disk image for any machine with amd64 architecture
-- *banana-pro*: Banana Pro's SD card
-- *beaglebone*: BeagleBone Black's SD card
-- *cubieboard2*: Cubieboard2's SD card
-- *cubietruck*: Cubietruck's SD card
-- *i386*: Disk image for any machine with i386 architecture
-- *lamobo-r1*: Lamobo R1 aka BananaPi Router SD card
-- *pcduino3*: pcDuino3's SD card
-- *pine64-lts*: Pine64 LTS board's SD card
-- *pine64-plus*: Pine64+ board's SD card
-- *qemu-amd64*: 64-bit image for the Qemu virtualization tool
-- *qemu-i386*: 32-bit image for the Qemu virtualization tool
-- *raspberry2*: RasbperryPi 2's SD card
-- *raspberry3*: RasbperryPi 3's SD card
-- *raspberry3-b-plus*: RasbperryPi 3 Model B+'s SD card
-- *test*: build virtualbox i386 image and run diagnostics tests on it
-- *virtualbox-amd64*: 64-bit image for the VirtualBox virtualization tool
-- *virtualbox-i386*: 32-bit image for the VirtualBox virtualization tool
+| target | description |
+|-----------------------|-------------|
+| *a20-olinuxino-lime* | A20 OLinuXino Lime's SD card |
+| *a20-olinuxino-lime2* | A20 OLinuXino Lime2's SD card |
+| *a20-olinuxino-micro* | A20 OLinuXino MICRO's SD card |
+| *amd64* | Disk image for any machine with amd64 architecture |
+| *banana-pro* | Banana Pro's SD card |
+| *beaglebone* | BeagleBone Black's SD card |
+| *cubieboard2* | Cubieboard2's SD card |
+| *cubietruck* | Cubietruck's SD card |
+| *i386* | Disk image for any machine with i386 architecture |
+| *lamobo-r1* | Lamobo R1 aka BananaPi Router SD card |
+| *pcduino3* | pcDuino3's SD card |
+| *pine64-lts* | Pine64 LTS board's SD card |
+| *pine64-plus* | Pine64+ board's SD card |
+| *qemu-amd64* | 64-bit image for the Qemu virtualization tool |
+| *qemu-i386* | 32-bit image for the Qemu virtualization tool |
+| *raspberry2* | RasbperryPi 2's SD card |
+| *raspberry3* | RasbperryPi 3's SD card |
+| *raspberry3-b-plus* | RasbperryPi 3 Model B+'s SD card |
+| *test* | build virtualbox i386 image and run diagnostics tests on it |
+| *virtualbox-amd64* | 64-bit image for the VirtualBox virtualization tool |
+| *virtualbox-i386* | 32-bit image for the VirtualBox virtualization tool |
## Running Build
@@ -69,10 +70,12 @@ Freedom-maker supports building for the following targets:
to run "parted".
```
- $ sudo python3 -m freedommaker a20-olinuxino-lime2
+ $ sudo python3 -m freedommaker <TARGET>
```
+ where: &lt;TARGET&gt; is one of the 'Supported Targets' above.
+
Take a break from your computer - this takes some time. :)
-
+
To see the full list of options read the help-page:
```
$ python3 -m freedommaker --help
@@ -91,25 +94,47 @@ for this task. Otherwise follow the steps:
A. Unplug your card.
- B. Run "lsblk -p" to show which storage devices are connected to your system.
+ B. Run `lsblk -p` to show which storage devices are connected to your system.
+ For example, if your computer has one internal SATA storage device
+ (the most common configuration), it will be identified as */dev/sda*;
+ and the result may look similar to this:
+
+ $ lsblk -p
+ NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINTS
+ /dev/sda 8:0 0 119.2G 0 disk
+ ├─/dev/sda1 8:1 0 2G 0 part /boot
+ ├─/dev/sda2 8:2 0 22.5G 0 part /
+ └─/dev/sda3 8:3 0 94.8G 0 part /home
+
+ C. Plug in your SDcard and run `lsblk -p` again. Find the new device and note
+ the name. For example, if the SDcard is unformatted (empty), the result may
+ look similar to this:
+
+ $ lsblk -p
+ NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINTS
+ /dev/sda 8:0 0 119.2G 0 disk
+ ├─/dev/sda1 8:1 0 2G 0 part /boot
+ ├─/dev/sda2 8:2 0 22.5G 0 part /
+ └─/dev/sda3 8:3 0 94.8G 0 part /home
+ /dev/sdb 8:32 1 29.7G 0 disk
+
+ Or, if the SDcard is already formatted, it may look more like this:
- C. Plug your card in and run "lsblk -p" again. Find the new device and note
- the name.
-
$ lsblk -p
- NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT
- /dev/sdg 8:0 1 14.9G 0 disk
- /dev/nvme0n1 259:0 0 477G 0 disk
- ├─/dev/nvme0n1p1 259:1 0 512M 0 part /boot/efi
- ├─/dev/nvme0n1p2 259:2 0 244M 0 part /boot
- └─/dev/nvme0n1p3 259:3 0 476.2G 0 part
- └─/dev/mapper/nvme0n1p3_crypt 253:0 0 476.2G 0 crypt
- ├─/dev/mapper/mjw--t470--vg-root 253:1 0 468.4G 0 lvm /
- └─/dev/mapper/mjw--t470--vg-swap_1 253:2 0 7.8G 0 lvm [SWAP]
-
- D. In the above case, the disk that is newly inserted is available
- as */dev/sdg*. You can also verify the size (16 GB in this example).
- Carefully note this and use it in the copying step below.
+ NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINTS
+ /dev/sda 8:0 0 119.2G 0 disk
+ ├─/dev/sda1 8:1 0 2G 0 part /boot
+ ├─/dev/sda2 8:2 0 22.5G 0 part /
+ └─/dev/sda3 8:3 0 94.8G 0 part /home
+ /dev/sdb 8:32 1 29.7G 0 disk
+ ├─/dev/sdb1 8:33 1 100M 0 part
+ └─/dev/sdb2 8:36 1 29.6G 0 part
+
+ D. In the above cases, the newly inserted SDcard is identified
+ as */dev/sdb*. To be more certain, you can compare the reported sizes
+ (approximately - the SDcard is 30 GB in this example - reported 29.7G).
+ Most importantly, */dev/sda*. is usually not the SDcard.
+ Carefully note this identifier and use it in the copying step below.
2. Copy the image to your card. Double check and make sure you don't
write to your computer's main storage (such as /dev/sda). Also
diff --git a/freedommaker/__main__.py b/freedommaker/__main__.py
index 9d29193..cb6a178 100644
--- a/freedommaker/__main__.py
+++ b/freedommaker/__main__.py
@@ -20,7 +20,15 @@
Module to provide ability to run this freedommaker package.
Run the package as:
- python3 -m freedommaker
+ $ sudo python3 -m freedommaker <TARGET>
+where:
+ <TARGET> is one of:
+ $ grep -r 'machine = ' freedommaker/builders/ | cut -d '=' -f 2
+eg:
+ $ sudo python3 -m freedommaker a20-olinuxino-lime2
+
+To see the full list of options read the help-page:
+ $ python3 -m freedommaker --help
"""
from .application import Application
helpers/DATA/freedom-maker/0002-generalize-distro-fork-name_could-be-upstreamed.patch 0 → 100644
View file @ 6b5ae172
diff --git a/freedommaker/builder.py b/freedommaker/builder.py
index 0f94d5c..8a13188 100644
--- a/freedommaker/builder.py
+++ b/freedommaker/builder.py
@@ -23,6 +23,8 @@ import os
from . import internal, library
+DISTRO_BRAND = 'Debian'
+
# initramfs-tools is a dependency for the kernel-image package. However, when
# kernel is not installed, as in case of Raspberry Pi image, explicit dependency
# is needed.
@@ -103,10 +105,11 @@ class ImageBuilder(object): # pylint: disable=too-many-instance-attributes
def _get_image_base_name(self):
"""Return the base file name of the final image."""
- free_tag = 'free' if self.free else 'nonfree'
+ free_tag = 'libre' if self.free else 'nonfree'
- return 'freedombox-{distribution}-{free_tag}_{build_stamp}_{machine}' \
+ return '{distro}freedombox-{distribution}-{free_tag}_{build_stamp}_{machine}' \
'-{architecture}'.format(
+ distro=DISTRO_BRAND.lower() + '-' if DISTRO_BRAND else '',
distribution=self.arguments.distribution, free_tag=free_tag,
build_stamp=self.arguments.build_stamp, machine=self.machine,
architecture=self.architecture)
helpers/DATA/freedom-maker/0003-trisquelize-documentation.patch 0 → 100644
View file @ 6b5ae172
diff --git a/README.md b/README.md
index 3fb54f4..8b01fbd 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-[![pipeline status](https://salsa.debian.org/freedombox-team/freedom-maker/badges/master/pipeline.svg)](https://salsa.debian.org/freedombox-team/freedom-maker/commits/master)
-[![Debian Unstable](https://badges.debian.net/badges/debian/unstable/freedom-maker/version.svg)](https://packages.debian.org/unstable/freedom-maker)
-[![Debian Testing](https://badges.debian.net/badges/debian/testing/freedom-maker/version.svg)](https://packages.debian.org/testing/freedom-maker)
-
# Freedom-Maker: The FreedomBox image builder
These scripts build FreedomBox-images for various supported hardware
@@ -13,9 +9,9 @@ during releases and for advanced users who intend to build their own
images. Regular users who wish to turn their devices into
FreedomBoxes should instead download the pre-built images.
-Get a pre-built image via https://freedombox.org/download/. There
+Get a pre-built image via https://cdimage.trisquel.info/trisquel-images/. There
are images available for all supported target devices. You also find
-the setup instructions on the [Wiki](https://wiki.debian.org/FreedomBox/).
+the setup instructions on the [Wiki](https://trisquel.info/en/wiki/FreedomBox/).
If you wish to create your own FreedomBox image, perhaps with some
tweaks, see the *Build Images* section below.
@@ -24,7 +20,7 @@ tweaks, see the *Build Images* section below.
## Supported Targets
-Freedom-maker supports building for the following targets:
+Trisquel Freedom-maker supports building for the following targets:
| target | description |
|-----------------------|-------------|
@@ -43,25 +39,18 @@ Freedom-maker supports building for the following targets:
| *pine64-plus* | Pine64+ board's SD card |
| *qemu-amd64* | 64-bit image for the Qemu virtualization tool |
| *qemu-i386* | 32-bit image for the Qemu virtualization tool |
-| *raspberry2* | RasbperryPi 2's SD card |
-| *raspberry3* | RasbperryPi 3's SD card |
-| *raspberry3-b-plus* | RasbperryPi 3 Model B+'s SD card |
-| *test* | build virtualbox i386 image and run diagnostics tests on it |
-| *virtualbox-amd64* | 64-bit image for the VirtualBox virtualization tool |
-| *virtualbox-i386* | 32-bit image for the VirtualBox virtualization tool |
## Running Build
-1. Fetch the git source of freedom-maker:
+1. Fetch the 'freedom-maker' source code:
```
- $ git clone https://salsa.debian.org/freedombox-team/freedom-maker.git
+ $ apt source freedom-maker
```
2. Install the required dependencies:
```shell
$ sudo apt install btrfs-progs debootstrap kpartx parted qemu-user-static sshpass
- $ cd freedom-maker
- $ sudo apt build-dep .
+ $ sudo apt build-dep freedom-maker
```
3. Build images:
@@ -70,6 +59,7 @@ Freedom-maker supports building for the following targets:
to run "parted".
```
+ $ cd $(find -type d -name 'freedom-maker-*')
$ sudo python3 -m freedommaker <TARGET>
```
where: &lt;TARGET&gt; is one of the 'Supported Targets' above.
diff --git a/debian/freedom-maker.1 b/debian/freedom-maker.1
index 60f3d86..820e84d 100644
--- a/debian/freedom-maker.1
+++ b/debian/freedom-maker.1
@@ -51,17 +51,17 @@ Size of the image to build
.PP
\fB\-\-build\-mirror\fR
.RS 4
-Debian mirror to use for building
+Trisquel mirror to use for building
.RE
.PP
\fB\-\-mirror\fR
.RS 4
-Debian mirror to use in built image
+Trisquel mirror to use in built image
.RE
.PP
\fB\-\-distribution\fR
.RS 4
-Debian release to use in built image
+Trisquel release to use in built image
.RE
.PP
\fB\-\-include\-source\fR
@@ -106,7 +106,7 @@ Force rebuild of images even when required image exists
.PP
\fBtargets\fR
.RS 4
-Image targets to build\&. Choose one or more of freedommaker, dreamplug, raspberry, raspberry2, beaglebone, cubieboard2, cubietruck, a20\-olinuxino\-lime, a20\-olinuxino\-lime2, a20\-olinuxino\-micro, i386, amd64, virtualbox\-i386, virtualbox\-amd64, qemu\-i386, qemu\-amd64, pcDuino3
+Image targets to build\&. Choose one or more of freedommaker, dreamplug, beaglebone, cubieboard2, cubietruck, a20\-olinuxino\-lime, a20\-olinuxino\-lime2, a20\-olinuxino\-micro, i386, amd64, qemu\-i386, qemu\-amd64, pcDuino3
.RE
.SH "EXAMPLES"
.PP
@@ -130,9 +130,9 @@ Build a FreedomBox image for the BeagleBone Single Board Computer\&.
.RS 4
.\}
.nf
-$ python3 \-m freedommaker dreamplug raspberry raspberry2
+$ python3 \-m freedommaker dreamplug
beaglebone cubieboard2 cubietruck a20\-olinuxino\-lime a20\-olinuxino\-lime2
- a20\-olinuxino\-micro i386 amd64 virtualbox\-i386 virtualbox\-amd64
+ a20\-olinuxino\-micro i386 amd64
qemu\-i386 qemu\-amd64 pcDuino3
.fi
.if n \{\
diff --git a/doc/freedom-maker.xml b/doc/freedom-maker.xml
index 74ce990..349a136 100644
--- a/doc/freedom-maker.xml
+++ b/doc/freedom-maker.xml
@@ -94,7 +94,7 @@
<term> <option>--build-mirror</option></term>
<listitem>
<para>
- Debian mirror to use for building
+ Trisquel mirror to use for building
</para>
</listitem>
</varlistentry>
@@ -102,7 +102,7 @@
<term> <option>--mirror</option></term>
<listitem>
<para>
- Debian mirror to use in built image
+ Trisquel mirror to use in built image
</para>
</listitem>
</varlistentry>
@@ -110,7 +110,7 @@
<term> <option>--distribution</option></term>
<listitem>
<para>
- Debian release to use in built image
+ Trisquel release to use in built image
</para>
</listitem>
</varlistentry>
diff --git a/freedommaker/application.py b/freedommaker/application.py
index dbe8ca0..0bebc35 100644
--- a/freedommaker/application.py
+++ b/freedommaker/application.py
@@ -94,15 +94,15 @@ class Application(object):
parser.add_argument(
'--build-mirror',
default=BUILD_MIRROR,
- help='Debian mirror to use for building')
+ help='Trisquel mirror to use for building')
parser.add_argument(
'--mirror',
default=MIRROR,
- help='Debian mirror to use in built image')
+ help='Trisquel mirror to use in built image')
parser.add_argument(
'--distribution',
default=DISTRIBUTION,
- help='Debian release to use in built image')
+ help='Trisquel release to use in built image')
parser.add_argument(
'--package',
action='append',
diff --git a/freedommaker/internal.py b/freedommaker/internal.py
index acc22d8..49bd4a9 100644
--- a/freedommaker/internal.py
+++ b/freedommaker/internal.py
@@ -275,9 +275,7 @@ class InternalBuilderBackend():
def _set_freedombox_disk_image_flag(self):
"""Set a flag to indicate that this is a FreedomBox image.
-
- And that FreedomBox is not installed using a Debian package.
-
+ And not a standard Trisquel system with the FreedomBox packages installed.
"""
library.run_in_chroot(
self.state, ['mkdir', '-p', '-m', '755', '/var/lib/freedombox'])