#63 libre/iceweasel: 104.0-1.parabola1
Closed 2 years ago by grizzlyuser. Opened 2 years ago by grizzlyuser.

[quassel]: upgrade to v0.14.0-2
Wael Karram • 2 years ago  
drop qtqr, now in [community]
David P • 2 years ago  
libre: libretools: add in forgetten pkgrel bump
Denis 'GNUtoo' Carikli • 2 years ago  
pcr: prosody-modules: Explain what is removed
Denis 'GNUtoo' Carikli • 2 years ago  
pcr: Add prosody-modules
Wael Karram • 2 years ago  
pcr: fcode-utils: add armv7h support
Denis 'GNUtoo' Carikli • 2 years ago  
Add fcode-utils
Denis 'GNUtoo' Carikli • 2 years ago  
libreboot-utils: Add ich9utils
Denis 'GNUtoo' Carikli • 2 years ago  
[gmid]: upgrade to v1.8.4
Wael Karram • 2 years ago  
pcr: remove lcov
Denis 'GNUtoo' Carikli • 2 years ago  
libre: epiphany: armv7h: build with libportal-gtk3
Denis 'GNUtoo' Carikli • 2 years ago  
libre: epiphany: unbreak armv7h and i686 builds
Denis 'GNUtoo' Carikli • 2 years ago  
pcr: libreboot-utils: Add intelmetool
Denis 'GNUtoo' Carikli • 2 years ago  
deprecate notsystemd
David P • 2 years ago  
drop openrc-security
David P • 2 years ago  
libre: linux-libre-64: Add rationale for the package
Denis 'GNUtoo' Carikli • 2 years ago  
file modified
+38 -26
@@ -1,33 +1,45 @@ 

- Many packages (PKGBUILDs and associated files) comes from one of these

- projects:

- - Arch Linux

- - Arch Linux ARM

- - Arch Linux 32

- - Aur (Arch User repository)

+ Many PKGBUILDs and associated files were originally imported

+ from other projects, such as:

  

- They typically come without a license, so while most of them seem to

- be uncopyrightable due to their extreme simplicity and standardness,

+ ---------------------------------------------------------------

+ | Project              | "Maintainer (upstream):" identifier  |

+ |-------------------------------------------------------------|

+ | Archlinux            | (arch)                               |

+ | Archlinux32          | (arch32)                             |

+ | ArchlinuxARM         | (archarm)                            |

+ | Artix                | (artix)                              |

+ | Arch User repository | (aur)                                |

+ | Gentoo               | n/a                                  |

+ | Hyperbola            | (hyperbola)                          |

+ ---------------------------------------------------------------

+ 

+ These typically come without a license, so while most of them seem to

+ be uncopyrightable, due to their extreme simplicity and standardness,

  this still creates some legal uncertaincy about their licensing.

  

- Some packages also come from Hyperbola, and here there is also some

- uncertaincy as the project added a CC0 license in its git repository

- without adding any clear statement associated with it. We still need

- to contact them to get more clarification on their packages licenses

- for new contributions.

+ Several PKGBUILDs and associated files in this repository were

+ created from scratch for the Parabola GNU/Linux-libre project,

+ so they don't depend on other projects licensing decisions.

  

- Several packages (and associated files) in this repository were

- created from scratch, so they don't depend on other projects licensing

- decisions.

+ Several contributors have agreed to license their past contributions

+ to this repository, under the CC0 license:

  

- And several contributors agreed to license their past contributions to

- packages in this repository under the CC0 license:

- - Andreas Grapentin

- - bill-auger

- - Denis 'GNUtoo' Carikli

- - Freemor

+ --------------------------------------

+ | Name              | Hacker ID      |

+ |------------------------------------|

+ | Andreas Grapentin | (oaken-source) |

+ | Bill Auger        | (bill-auger)   |

+ | Denis Carikli     | (gnutoo)       |

+ | Freemor           | (freemor)      |

+ | Joseph Graham     | (xylon)        |

+ | Omar Vega Ramos   | (ovruni)       |

+ | Luke Shumaker     | (lukeshu)      |

+ | David Pizarro     | (megver83)     |

+ --------------------------------------

  

- As for patches, as they are combined with original project source code

- they are under the same license than the original project.

+ As for patches, as they are combined with, or otherwise contributed to,

+ upstream project source code, they are taken under the same license

+ as the original project, per the inbound<->outbound convention.

  

- All contributions to packages in this repository must be offered under

- the CC0 license.

+ All contributions to this repository, from Parabola team members and users,

+ must be offered under the CC0 license.

file modified
+16 -2
@@ -6,7 +6,20 @@ 

  # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>

  

  

- _basekernel=5.17.3

+ # build order:

+ #   acpi_call-dkms          <- acpi_call-lts

+ #                              acpi_call

+ #   linux-libre-lts-headers <- acpi_call-lts

+ #                              tp_smapi-lts

+ #   linux-libre-headers     <- acpi_call

+ #                              tp_smapi

+ #

+ # these packages may be built as a batch, with the helper script:

+ #   'scripts/package-all-acpi_call-tp_smapi'

+ # simply edit '_basekernel' in each # TODO: automate that too

+ 

+ 

+ _basekernel=5.18.14

  

  pkgname=acpi_call-dkms

  _tag='9f1c0b5d046bdfdec769809435257647fd475473' # git rev-parse v${_tag_name}
@@ -16,7 +29,8 @@ 

  pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call - module sources'

  pkgdesc+=' (for linux-libre)'

  url='https://github.com/nix-community/acpi_call'

- arch=('armv7h' 'i686' 'x86_64')

+ arch=('any')

+ arch=('armv7h' 'i686' 'x86_64') # just to simplify the package-all-acpi_call-tp_smapi script

  license=('GPL')

  depends=('dkms')

  makedepends=('git')

file modified
+20 -7
@@ -1,12 +1,25 @@ 

- # Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org>

- # Contributor (Arch): mortzu <me@mortzu.de>

- # Contributor (Arch): fnord0 <fnord0@riseup.net>

- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>

- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>

+ # Maintainer (arch): Maxime Gauduin <alucryd@archlinux.org>

+ # Contributor: mortzu <me@mortzu.de>

+ # Contributor: fnord0 <fnord0@riseup.net>

+ # Contributor: André Silva <emulatorman@hyperbola.info>

+ # Contributor: Márcio Silva <coadde@hyperbola.info>

  # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>

  

  

- _basekernel=5.10.89

+ # build order:

+ #   acpi_call-dkms          <- acpi_call-lts

+ #                              acpi_call

+ #   linux-libre-lts-headers <- acpi_call-lts

+ #                              tp_smapi-lts

+ #   linux-libre-headers     <- acpi_call

+ #                              tp_smapi

+ #

+ # these packages may be built as a batch, with the helper script:

+ #   'scripts/package-all-acpi_call-tp_smapi'

+ # simply edit '_basekernel' in each # TODO: automate that too

+ 

+ 

+ _basekernel=5.15.41

  

  pkgname=acpi_call-lts

  pkgver=1.2.2
@@ -16,7 +29,7 @@ 

  pkgdesc+=' (for linux-libre-lts)'

  url='https://github.com/mkottman/acpi_call'

  arch=('x86_64')

- arch+=('i686' 'armv7h')

+ arch+=('armv7h' 'i686')

  license=('GPL')

  makedepends=(linux-libre-lts-headers=${_basekernel} acpi_call-dkms=$pkgver libelf)

  conflicts=('acpi_call-dkms')

file modified
+15 -2
@@ -6,7 +6,20 @@ 

  # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>

  

  

- _basekernel=5.17.3

+ # build order:

+ #   acpi_call-dkms          <- acpi_call-lts

+ #                              acpi_call

+ #   linux-libre-lts-headers <- acpi_call-lts

+ #                              tp_smapi-lts

+ #   linux-libre-headers     <- acpi_call

+ #                              tp_smapi

+ #

+ # these packages may be built as a batch, with the helper script:

+ #   'scripts/package-all-acpi_call-tp_smapi'

+ # simply edit '_basekernel' in each # TODO: automate that too

+ 

+ 

+ _basekernel=5.18.14

  

  pkgname=acpi_call

  pkgver=1.2.2
@@ -19,7 +32,7 @@ 

  arch+=('armv7h' 'i686')

  license=('GPL')

  makedepends=(linux-libre-headers=${_basekernel} "acpi_call-dkms=$pkgver")

- makedepends+=(gcc=11.2.0) # `dkms` requires the same compiler version which built the kernel

+ #makedepends+=(gcc=11.2.0) # `dkms` requires the same compiler version which built the kernel

  conflicts=('acpi_call-dkms')

  

  build() {

file modified
+13 -9
@@ -14,8 +14,8 @@ 

  #  - pin to sodeps

  

  pkgname=epiphany

- pkgver=41.3

- pkgrel=1

+ pkgver=42.3

+ pkgrel=3

  pkgrel+=.parabola1

  pkgdesc="A GNOME web browser based on the WebKit rendering engine"

  pkgdesc+=", with DuckDuckGo-HTML search"
@@ -24,23 +24,23 @@ 

  arch+=(i686 armv7h)

  license=(GPL)

  depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive)

+ # we don't have libportal-gtk3 yet on i686

+ depends_armv7h+=(libportal-gtk3)

+ depends_x86_64+=(libportal-gtk3)

  depends=( $( sed 's| icu | |' <<<${depends[@]} ) )

  depends+=(libhogweed.so)

  makedepends=(docbook-xml startup-notification lsb-release gobject-introspection

               yelp-tools git meson)

- makedepends=( ${makedepends[*]/meson/meson<0.61.0} ) # FIXME: FTBS with meson 0.61.x

-                                                      #        "epiphany/data/meson.build:18:0: ERROR: Function does not take positional arguments."

-                                                      #        possibly related: https://cgit.freebsd.org/ports/commit/?id=299348602e6d75b6f85b2e7303a0bea5f37541b6

  checkdepends=(xorg-server-xvfb aspell hspell hunspell nuspell libvoikko)

  groups=(gnome)

- _commit=ce3713dfd4f69275c2c46a6687c24deb8b8aa367  # tags/41.3^0

+ _commit=6cdf86702e747867b2f4b338429733f84f554f80  # tags/42.3^0

  source=("git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit")

  source+=(libre.patch)

  sha256sums=('SKIP')

- sha256sums+=('2ef991ade98fbe9a3a6cd80220d3348e69007abff5141bea42bbdf1c72836689')

+ sha256sums+=('bf1dd1692ec9f94f8fc669a5ee71dd811d6083465dbb197e3fcc64e2aaf2f709')

  

  # check() requires networking

- _run_check=1

+ _run_check=0

  

  

  pkgver() {
@@ -56,7 +56,11 @@ 

  }

  

  build() {

-   arch-meson $pkgname build -D soup2=disabled -D libportal=disabled

+   if [ "${CARCH}" != "i686" ] ; then

+     arch-meson $pkgname build -D soup2=disabled

+   else

+     arch-meson $pkgname build -D soup2=disabled -D libportal=disabled

+   fi

    meson compile -C build 

  }

  

file modified
+38 -21
@@ -1,24 +1,41 @@ 

- --- epiphany.orig/data/org.gnome.epiphany.gschema.xml	2019-04-27 00:17:50.060428000 -0500

- +++ epiphany/data/org.gnome.epiphany.gschema.xml	2019-04-27 00:17:50.360428000 -0500

- @@ -26,9 +26,7 @@

+ From f5240f67aa9f00277570b3b28b726311c32d7843 Mon Sep 17 00:00:00 2001

+ From: =?UTF-8?q?Iv=C3=A1n=20=C3=81valos?= <avalos@disroot.org>

+ Date: Sun, 24 Jul 2022 02:07:05 -0500

+ Subject: [PATCH] libre

+ 

+ ---

+  data/org.gnome.epiphany.gschema.xml | 4 +---

+  lib/ephy-search-engine-manager.h    | 2 +-

+  2 files changed, 2 insertions(+), 4 deletions(-)

+ 

+ diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml

+ index 7fcac67b3..6f1444167 100644

+ --- a/data/org.gnome.epiphany.gschema.xml

+ +++ b/data/org.gnome.epiphany.gschema.xml

+ @@ -53,9 +53,7 @@

   			<default l10n="messages">

-                                   <!-- TRANSLATORS: These are the prepopulated search engines. You should

-                                        add country-specific URL query parameters if appropriate. -->

- -                                 [('DuckDuckGo', 'https://duckduckgo.com/?q=%s&amp;t=epiphany', '!ddg'),

- -				  ('Google', 'https://www.google.com/search?q=%s', '!g'),

- -				  ('Bing', 'https://www.bing.com/search?q=%s', '!b')]

- +                                 [('DuckDuckGo', 'https://duckduckgo.com/html/?q=%s&amp;t=epiphany', '!ddg')]

-  			</default>

-  			<summary>Default search engines.</summary>

-  			<description>List of the default search engines. It is an array in which each search engine is described by a name, an address, and a bang (shortcut).</description>

- --- epiphany.orig/lib/ephy-search-engine-manager.c	2019-04-27 00:17:49.860428000 -0500

- +++ epiphany/lib/ephy-search-engine-manager.c	2019-04-27 00:55:14.840404975 -0500

- @@ -27,7 +27,7 @@

-  #include "ephy-settings.h"

-  #include "ephy-prefs.h"

+  				<![CDATA[

+  				[

+ -					{'name': <'DuckDuckGo'>, 'url': <'https://duckduckgo.com/?q=%s&t=epiphany'>, 'bang': <'!ddg'>},

+ -					{'name': <'Google'>, 'url': <'https://www.google.com/search?q=%s'>, 'bang': <'!g'>},

+ -					{'name': <'Bing'>, 'url': <'https://www.bing.com/search?q=%s'>, 'bang': <'!b'>}

+ +					{'name': <'DuckDuckGo'>, 'url': <'https://duckduckgo.com/html/?q=%s&t=epiphany'>, 'bang': <'!ddg'>}

+  				]

+  			]]></default>

+  			<summary>List of the search engines.</summary>

+ diff --git a/lib/ephy-search-engine-manager.h b/lib/ephy-search-engine-manager.h

+ index c1939d31f..d29bb78c2 100644

+ --- a/lib/ephy-search-engine-manager.h

+ +++ b/lib/ephy-search-engine-manager.h

+ @@ -32,7 +32,7 @@ G_BEGIN_DECLS

+   * the version used in your country. For example for the french version :

+   * replace the ".com" with ".fr" :  "https://duckduckgo.fr/?q=%s&amp;t=epiphany"

+  */

+ -#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/?q=%s&amp;t=epiphany")

+ +#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/html/?q=%s&amp;t=epiphany")

   

- -#define FALLBACK_ADDRESS "https://duckduckgo.com/?q=%s&t=epiphany"

- +#define FALLBACK_ADDRESS "https://duckduckgo.com/html/?q=%s&t=epiphany"

+  #define EPHY_TYPE_SEARCH_ENGINE_MANAGER (ephy_search_engine_manager_get_type ())

   

-  enum {

-    SEARCH_ENGINES_CHANGED,

+ -- 

+ 2.37.1

+ 

@@ -0,0 +1,91 @@ 

+ # Maintainer (arch): Alexander F. Rødseth <xyproto@archlinux.org>

+ # Contributor: loqs <bugs-archlinux@entropy-collector.net>

+ # Contributor: Gabriel Souza Franco <gabrielfrancosouza@gmail.com>

+ # Contributor: Florian Pritz

+ # Contributor: Jonas Heinrich <onny@project-insanity.org>

+ # Contributor: Jordi De Groof <jordi.degroof@gmail.com>

+ # Contributor: mickele

+ # Contributor: manwithgrenade

+ # Contributor: bricem13

+ # Contributor: gborzi

+ # Contributor: Adrian Insaurralde

+ 

+ 

+ # parabola changes and rationale:

+ #   - build without webengine

+ #   - disable downloader

+ #   - build from versioned source-ball, not VCS

+ 

+ # FIXME: this package fails to build with libretools, without the -N flag

+ #        -> could NOT find MPI (missing: MPI_C_FOUND MPI_CXX_FOUND)

+ 

+ 

+ pkgname=freecad

+ pkgver=0.20.1

+ pkgrel=5

+ pkgrel+=.parabola1

+ pkgdesc='Feature based parametric 3D CAD modeler'

+ arch=(x86_64)

+ arch+=(armv7h i686)

+ arch=( ${arch[*]/i686/} ) # FTBS on i686 - 'med-openmpi' is unavailable

+ url='https://freecadweb.org/'

+ license=(LGPL)

+ depends=(boost-libs fmt glew jsoncpp libspnav med-openmpi netcdf opencascade

+          openmpi pyside2 pyside2-tools python-gitpython python-markdown

+          python-matplotlib python-pivy python-ply python-pyqt5-webengine pugixml

+          qt5-svg qt5-tools qt5-webkit qt5-x11extras qt5-xmlpatterns xerces-c)

+ depends=( ${depends[*]/python-markdown/} )

+ depends=( ${depends[*]/python-pyqt5-webengine/} )

+ makedepends=(boost cgns cli11 cmake coin eigen gcc-fortran git jdk-openjdk

+              libharu liblas ninja openmpi openvdb openvr ospray pdal postgresql-libs

+              python-mpi4py python-shiboken2 shiboken2 swig utf8cpp)

+ makedepends=( ${makedepends[*]/git/} )                                  # build from source-ball

+ makedepends=( ${makedepends[*]/openmpi/} )                              # duplicate entry

+ [[ "${CARCH}" == x86_64 ]] || makedepends=( ${makedepends[*]/ospray/} ) # unavailable for i686 and armv7h

+ optdepends=('graphviz: dependency graph support'

+             'openscad: OpenSCAD support')

+ _upstream_name=FreeCAD

+ source=(${pkgname}-${pkgver}.tar.gz::https://github.com/${_upstream_name}/${_upstream_name}/archive/refs/tags/${pkgver}.tar.gz)

+ sha256sums=(70c15f7c1c676e3376cdc2a66c136030c5502f9802935e5b626ca8ce3f8812ed)

+ 

+ 

+ build() {

+   cmake \

+     -B build \

+     -D BUILD_ENABLE_CXX_STD=C++17 \

+     -D BUILD_FLAT_MESH=ON \

+     -D BUILD_QT5=ON \

+     -D BUILD_ADDONMGR=OFF \

+     -D CMAKE_BUILD_TYPE=Release \

+     -D CMAKE_C_FLAGS="$CFLAGS -fPIC -w" \

+     -D CMAKE_CXX_FLAGS="$CXXFLAGS -fPIC -w" \

+     -D CMAKE_INSTALL_BINDIR=/usr/lib/freecad/bin \

+     -D CMAKE_INSTALL_DATADIR=/usr/share/freecad \

+     -D CMAKE_INSTALL_DATAROOTDIR=/usr/share \

+     -D CMAKE_INSTALL_DOCDIR=/usr/share/freecad/doc \

+     -D CMAKE_INSTALL_LIBDIR=/usr/lib/freecad/lib \

+     -D CMAKE_INSTALL_PREFIX=/usr/lib/freecad \

+     -D FREECAD_USE_EXTERNAL_PIVY=ON \

+     -D FREECAD_USE_OCC_VARIANT='Official Version' \

+     -D FREECAD_USE_QT_FILEDIALOG=ON \

+     -D PYTHON_EXECUTABLE=/usr/bin/python \

+     -D INSTALL_TO_SITEPACKAGES=ON \

+     -G Ninja \

+     -S ${_upstream_name}-${pkgver}

+   ninja -C build

+ }

+ 

+ package() {

+   DESTDIR="$pkgdir" ninja -C build install

+ 

+   cd "${srcdir}"/${_upstream_name}-${pkgver}

+ 

+   # thumbnailer

+   install -Dm755 src/Tools/$pkgname-thumbnailer -t "$pkgdir/usr/bin/"

+   # symlinks

+   install -d "$pkgdir/usr/bin"

+   ln -sf /usr/lib/freecad/bin/FreeCAD "$pkgdir/usr/bin/freecad"

+   ln -sf /usr/lib/freecad/bin/FreeCAD "$pkgdir/usr/bin/FreeCAD"

+   ln -sf /usr/lib/freecad/bin/FreeCADCmd "$pkgdir/usr/bin/freecadcmd"

+   ln -sf /usr/lib/freecad/bin/FreeCADCmd "$pkgdir/usr/bin/FreeCADCmd"

+ }

file modified
+2 -2
@@ -31,8 +31,8 @@ 

          sha512sums.${CARCH})

  

  # load languages list and .xpi checksums

- source languages.${CARCH}  # sets $_languages

- source sha512sums.${CARCH} # sets $_sha512sums

+ source languages.${CARCH}  &> /dev/null # sets $_languages

+ source sha512sums.${CARCH} &> /dev/null # sets $_sha512sums

  

  # compile package names and .xpi sources

  _src_url=https://ftp.mozilla.org/pub/seamonkey/releases/${pkgver}/langpack

file modified
+2 -2
@@ -35,8 +35,8 @@ 

          sha512sums.${CARCH})

  

  # load languages list and .xpi checksums

- source languages.${CARCH}  # sets $_languages

- source sha512sums.${CARCH} # sets $_sha512sums

+ source languages.${CARCH}  &> /dev/null # sets $_languages

+ source sha512sums.${CARCH} &> /dev/null # sets $_sha512sums

  

  # compile package names and .xpi sources

  #_src_url=http://ftp.gnu.org/gnu/gnuzilla/${pkgver%_*}/langpacks                       # FIXME: normal releases - gnuzilla lang-packs

@@ -1,240 +0,0 @@ 

- diff --git a/uriloader/exthandler/HandlerList.jsm b/uriloader/exthandler/HandlerList.jsm

- index 04b9205..ff3aec5 100644

- --- a/uriloader/exthandler/HandlerList.jsm

- +++ b/uriloader/exthandler/HandlerList.jsm

- @@ -11,229 +11,25 @@ this.kHandlerListVersion = 1;

-  this.kHandlerList = {

-    default: {

-      schemes: {

- -      mailto: {

- +      irc: {

-          handlers: [

-            {

- -            name: "Gmail",

- -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",

- +            name: "KiwiIRC",

- +            uriTemplate: "https://web.libera.chat/?url=%s",

-            },

-          ],

-        },

- -    },

- -  },

- -  cs: {

- -    schemes: {

- -      mailto: {

- +      ircs: {

-          handlers: [

-            {

- -            name: "Seznam",

- -            uriTemplate: "https://email.seznam.cz/newMessageScreen?mailto=%s",

- -          },

- -          {

- -            name: "Gmail",

- -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",

- +            name: "KiwiIRC",

- +            uriTemplate: "https://web.libera.chat/?url=%s",

-            },

-          ],

-        },

- -    },

- -  },

- -  csb: {

- -    schemes: {

-        mailto: {

-          handlers: [

-            {

- -            name: "Poczta Interia.pl",

- -            uriTemplate: "http://poczta.interia.pl/mh/?mailto=%s",

- -          },

- -          {

- -            name: "OnetPoczta",

- -            uriTemplate: "http://poczta.onet.pl/napisz.html?uri=%s",

- -          },

- -        ],

- -      },

- -    },

- -  },

- -  "es-CL": {

- -    schemes: {

- -      mailto: {

- -        handlers: [

- -          {

- -            name: "Gmail",

- -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",

- -          },

- -          {

- -            name: "Outlook",

- -            uriTemplate:

- -              "https://outlook.live.com/default.aspx?rru=compose&to=%s",

- -          },

- -        ],

- -      },

- -    },

- -  },

- -  "ja-JP-mac": {

- -    schemes: {

- -      mailto: {

- -        handlers: [

- -          {

- -            name: "Yahoo!メール",

- -            uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s",

- -          },

- -          {

- -            name: "Gmail",

- -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",

- -          },

- -        ],

- -      },

- -    },

- -  },

- -  ja: {

- -    schemes: {

- -      mailto: {

- -        handlers: [

- -          {

- -            name: "Yahoo!メール",

- -            uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s",

- -          },

- -          {

- -            name: "Gmail",

- -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",

- -          },

- -        ],

- -      },

- -    },

- -  },

- -  kk: {

- -    schemes: {

- -      mailto: {

- -        handlers: [

- -          {

- -            name: "Яндекс.Почта",

- -            uriTemplate: "https://mail.yandex.ru/compose?mailto=%s",

- -          },

- -          {

- -            name: "Mail.Ru",

- -            uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",

- -          },

- -          {

- -            name: "Gmail",

- -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",

- -          },

- -        ],

- -      },

- -    },

- -  },

- -  ltg: {

- -    schemes: {

- -      mailto: {

- -        handlers: [

- -          {

- -            name: "Gmail",

- -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",

- -          },

- -          {

- -            name: "inbox.lv mail",

- -            uriTemplate: "https://mail.inbox.lv/compose?to=%s",

- -          },

- -        ],

- -      },

- -    },

- -  },

- -  lv: {

- -    schemes: {

- -      mailto: {

- -        handlers: [

- -          {

- -            name: "Gmail",

- -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",

- -          },

- -          {

- -            name: "inbox.lv mail",

- -            uriTemplate: "https://mail.inbox.lv/compose?to=%s",

- -          },

- -        ],

- -      },

- -    },

- -  },

- -  pl: {

- -    schemes: {

- -      mailto: {

- -        handlers: [

- -          {

- -            name: "Poczta Interia.pl",

- -            uriTemplate: "https://poczta.interia.pl/mh/?mailto=%s",

- -          },

- -          {

- -            name: "Gmail",

- -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",

- -          },

- -        ],

- -      },

- -    },

- -  },

- -  ru: {

- -    schemes: {

- -      mailto: {

- -        handlers: [

- -          {

- -            name: "Яндекс.Почту",

- -            uriTemplate: "https://mail.yandex.ru/compose?mailto=%s",

- -          },

- -          {

- -            name: "Mail.Ru",

- -            uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",

- -          },

- -          {

- -            name: "Gmail",

- -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",

- -          },

- -        ],

- -      },

- -    },

- -  },

- -  sah: {

- -    schemes: {

- -      mailto: {

- -        handlers: [

- -          {

- -            name: "Яндекс.Почта",

- -            uriTemplate: "https://mail.yandex.ru/compose?mailto=%s",

- -          },

- -          {

- -            name: "Mail.Ru",

- -            uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",

- -          },

- -        ],

- -      },

- -    },

- -  },

- -  uk: {

- -    schemes: {

- -      mailto: {

- -        handlers: [

- -          {

- -            name: "Gmail",

- -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",

- -          },

- -          {

- -            name: "Outlook",

- -            uriTemplate:

- -              "https://outlook.live.com/default.aspx?rru=compose&to=%s",

- -          },

- -        ],

- -      },

- -    },

- -  },

- -  uz: {

- -    schemes: {

- -      mailto: {

- -        handlers: [

- -          {

- -            name: "Gmail",

- -            uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",

- -          },

- -          {

- -            name: "Mail.Ru",

- -            uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",

-            },

-          ],

-        },

@@ -1,1095 +0,0 @@ 

- From d8ea43891548f1e2a205cf73bb5b39f916a0ee8d Mon Sep 17 00:00:00 2001

- From: grizzlyuser <grizzlyuser@protonmail.com>

- Date: Sat, 12 Mar 2022 17:14:25 +0100

- Subject: [PATCH] FSDG: Replace upstream default bookmarks

- 

- ---

-  browser/base/content/default-bookmarks.html | 50 +++++++++------------

-  1 file changed, 21 insertions(+), 29 deletions(-)

- 

- diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html

- index b2d18d3098..e2e643bcf2 100644

- --- a/browser/base/content/default-bookmarks.html

- +++ b/browser/base/content/default-bookmarks.html

- @@ -1,14 +1,14 @@

-  #filter substitution

-  

- -#define mozilla_icon data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3E %3Cpath d='M0 0h16v16H0z'/%3E %3Cpath d='M13.994 10.356H15V12h-3.171V7.741c0-1.308-.435-1.81-1.29-1.81-1.04 0-1.46.737-1.46 1.8v2.63h1.006V12H6.918V7.741c0-1.308-.435-1.81-1.291-1.81-1.039 0-1.459.737-1.459 1.8v2.63h1.441V12H1v-1.644h1.006V6.079H1V4.435h3.168v1.139a2.507 2.507 0 0 1 2.3-1.29A2.452 2.452 0 0 1 8.931 5.91 2.535 2.535 0 0 1 11.4 4.284 2.448 2.448 0 0 1 14 6.9v3.458z' fill='%23fff'/%3E %3C/svg%3E

- -

- -#define firefox_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAHY0lEQVR4Aa3VA5RrSdfG8f+uOidJp/umczm2ffFhbNvG9722bdv22LZt+3I81+04B1XvfpPmWHut3yk06smus1Z4L8uXDv6MHzpowA8eWFS8FaY9eU+cCvxaFfF8W/FWGDy8a6n7DM7/H96DR3ldu0MVb8a0J+9CI1qXJP11a+79GOdP1f11FW/EtCfvQpx8mziFxMHEEEV1KYkrKl6Pea1Nbnrs/7hz7q2KUQsqRcUE/eV1acb/pyFQ7b9N3fguzNTxVsXrMa/avFgPb6SnukY8W6EgXvszrszjivH08F0VLZFK0rbUgRt9H2aS+lORznUxnTMV45kJG6fNPZSGnEodTJwUFGbphqdSll/H/SxWjEc92kYxSoO0uzEcwo90g/9rlKpHpCmX491MxQgzuvjtE0UieyqxhYZA3UGp8CjUtSMR2YrkFdf+/szi9X88+zM3/uncSx/81/f+7/HzPsu8q09i8MUNcCUHUTImceAAL+RC+UW1nMzHuUvxSVGBCloTgMT+GuOLipaGyg/OpLuE/jVI58wHb/zsdxD5tBVbDMQwOPe/8UDqHYuuPJjCZnP5nw/+mfyUPhADRtkAaIfosum23klBxH8b+KzCfuczG8IPXi4C5yHQwvDoPYhCBSkz1n9y1+WLd8xFzVUxxmIRjBIBVHXFZF58aEtW3exxsp0V8Aac8gpBnGQBRNymkP4VXKPdgdj8H2JB/DgMVwreATFhdoCdj/wY8x7+GM8/djyJ81hlnCPTUWfHb/0QlyRUelalEPcCHswIQARJPd64ohh/KHBagPcQB7sggHgIVHcM0wUyWWUAoNaEuobI9bP1dj9lw1nnMvehj/LS0wdinYO4wM1f/h6z3v9n1t3pTnAWBj04ZQA7LFROwMsu7QCpgcjuCh4Asg5Wa0ImgNDqqHTOtDyIgPPKkZ/cZOstzmT+Nw4jcA5JBO9SHjzzWKZt8CRd03ohD/RZALCigIwHawBmKgKSVoAiAi2VDCzsgo0bYB04lSojEAaQDyETsmTZf3PPdZ+irvMgTTF4SAVX7+SRC/dj5/f/C6D9d5UQLBAIFBJILIhtB1g2a8uZq+1+LwiAV8CSTujPwqoRbJjCJMdAeRVue+j/WLh4T2I3jcCEhN4ShmDFYR2IAXC8OHdDaMYAYBxU82AFAgPShHoejAEgUEViy2h5UbS9LLBajf5oMr866wc0wlWQvEEyNQKbIcSSwZBNIfAO41NQ9ZXd0IgBAQdUDAQWpjQhcfi6gCgguDtTm3vIUBdhdwUA/Pggqmy49/n/pr/q8ZMq4DziEwI0QOtpiT1kXUqQRqC8ohaDy0BqoGzxOUE6q9DwMBiOvtzm5OLi3migAFEwpjnOCzmKhZXUkyr1uEwtLqky1aStNk4jqhFFDVZb6ykYMjBodQxw5RAKZUgSqAq+YmmWzFxF0P8L61Z8pHhf5/S+bfHQJm1OLcuzw4YPcWH3/qysTcebFHyESTOkhLjUokt8M8VFCVYDbLXhvdCfARfiG3lkykDr2qhbXJTRUZBAngMwootGI3tbrbcIsR3ugp3Yhbun89l9/ko+qCDVGpQruHKJqDakBmnq2KyXaDZKrDX1KWau+ij0ZqAvgwR1JFuFmihwPTkdDQN9co3C6IMnwujs0sppELcOV+NHVc2wzv2eb+74J6ZP6kGazeEgZZJqiaRWJo6qbDb5MU7c4ixYmYUhC7YJaQxVgYrgSxa3sgNftdww31+usFuvuykfWDzU/4HytL0llTVz+SbiAScTryKxFFc6dlnnQVZP+wEo2grT7ACb5V7g2BnXsVfxHsLEgfGQTYb/1kJqWpKV3VDLM1iXi/a8PDrtqmecl451DwLg8oG1DtnMmcsKq/bQ1V3BmBTsfzgIfHucwINxICivADt8eADkBLJGtcc0ydHsmU7QEXBFfzwTeFwRnLFtDoBD7nv5+vv61v2XXzHlfR7oKtQxLkFcCqkDK8qMHdIex4gSMxaoKZBtS8lQ18NtJsPSmv/Nyfc3nma4RjsA8Jnq1HU+WC9cY01z865pJQrdDcQkrW6IpGOfun3oxLnw6m/SEBIyVFbOIMhmiXJy35oL+vYDBhkuGxY3YaTuy9TLA+Jv2inu2j2ph9NrTUMmCyIGjwEnyiCtUaUWnGlLR1hIlM6rKwpUX5qBiTuI02Du94aqx8zJhEsVI4IPduUZV+7vDC0CDv9GdeolUjObL18ckutqMKkQkc2kiFHOITLCwyiUp1bNUhuYRFrrxPoMzdDM/XbUf/gZvvYsozX+Cl5d5vh690afrk3+0hR4XyoxqYmQICaTSwjClI6cA3EIvhWi0QiIm6rRgaQh1ikfsMK43/xv8YWfASuUe6sBAIzqPmNwjb1nJdnP5PDbOpPgJMXjWhDAC4JgvEWUaQkoib/o/NzQb37S1fP0+Dt/6wHGKqe6v1yZvuG+zc69p3m7d4dnW8TjAaEdwmFKEcztkfSG67KVG346aeV8YEglincRYLQClVcdKsery6lI1VVNJbyF+jdp8gPG4E08mAAAAABJRU5ErkJggg==

- -

- -#define bugzilla_icon data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnYCL7J0pY9wwETY9kYEM9AAAAAEBAYAhVVVUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1bjTOS1Vb/wAA2/8JEqT/Q0g8kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnMqoiJtJ/0haST/NEkp/yQnW/8AAPD8AAHY/RsgP/JZUI+GKitih4ObUEAAAAAAAAAAAAAAAAAAAAAAKnouwip5Lv9ooW//a6Jz/y9GIv8JBXb/AADO/gEBvf8AAK7/FRJp/z9BfP8iLGj1AAAAAAAAAAAAAAAAL4YzwiB0I/+UwJ3/bK+C/02eZ/9CTjz/DBa1/wABxf8BAOj/AACp/w8Oc/sJCv//EhCN9AAAAAAAAAAANJA6iC2MMv93tYL/TZ5U/3mzjP9NoWr/NEss/wYIU/8CBOn/ARCX/wwNqP0TD6X/Cgyex5qacDAAAAAAAAAAADKUN/ZirWj/d76R/0SgXf9Ln1P/eLSM/1mda/8rOkb/CQiD/wMQvf8UEnT/MTAt4P//MwUhZyN8AAAAAAAAAAAznDf5UqlZ/228jP9NqnD/Qp9c/0yiVP+Dv5b/VaVw/0VxXf9PZXD/S3pQ/y54Nf8jcCf/I2wn/wAAAAA0ozjIM6E4/zOeOP+Uz6z/XLR+/06scv9BoV3/TqZX/4XBmP9XqHP/hr6Z/yp+Lf8leSr1JXUqbQAAAAA3rTz7Nqo7/zWmOqM3oz7rUK1W/43Mpf9etYD/T61z/0KjXf9Rqln/msup/46/lf8pgy7/JFg6sAAAAAAAAAAAOK8+8jqvOiMAAAAAAAAAADSlOv85pT//kM6o/2K5hP9Ysnv/YLJ2/ziXPv8piS3/V6Ri/yZQQ9wAAAAAAAAAAAAAAAAAAAAAAAAAADetP0E2qzz/OKg98UWsS/+e1K3/pNe4/4XDjv8ojy3/T7df/5fIqv8sjTH/K4kw/yqFLv8AAAAAAAAAAAAAAAA4sT3xN7A8+QAAAAA4qz3yNag6/zSlOf80oTn/csJ+/6/jwv9fjHj/MmRMdQAAAAAAAAAAAAAAAAAAAAAAAAAAOrdA/zm0QHQAAAAAAAAAADasO/k2qTvuRX5lpjqGT/gznDr/O3FXigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADq9QiMAAAAAAAAAAAAAAAA4sj7/Nq09s0uOaSI1qTplM6U68wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrc//zu0P0EAAAAAOK4+UjWsPPgAAAAAAAAAAAAAAAAAAAAA/48AAP8HAAD4AQAA8AAAAOAAAADAAQAAwAMAAMAAAACAAwAAAAMAAHADAADwAAAA5AcAAO4HAAD+bwAA/u8AAA==

- -

- -#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAABgElEQVR4AWPouPiRpmjUAjgatSBj+aG0OVuyVhymsgWl2y475zXySikwwIC4lpFDVk3avG0BrXP9mmeV7bhCvgXuxW3M7JwMeAGfpByZFpjHFzAQB2KmrSfZAtuMKgaiAZ+MUuLc7SRY4FbYwkA60HAJiJm8uubQAwIWeJV1MlAAOAREHDJrcFqQMG+ngIK6oKyykLwqAyMjeXZwiUjgtKD+yGMIwyGzmoGBTAs4hcXrgObgi4OiVkpCiUtYov7YU5wW1B194t0ww69ldvjktYouwWRYIGdkQ1Q+iJ28hp2Xn7B5zKzIPAlNw6S52wlbkL3mJJecOq+CBqeIJC6TjUJTMlcdz9lwLmriSuPgJBVbj/D+5SSXRequQVhNN4nIoEJhV77jKgs7B6bprJw85XtuU8GCpNlbSS3gSA4ii4QiTAvElDWpWeH41kxg5eZDSypUrtFKd1zTcA1EpHRDS5rUyQEts+VN7JjYOGR0TWhY6RdsOhc/Y9NoswUJjVoAAE+h555Rgcg2AAAAAElFTkSuQmCC

- -

- -#define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABOFBMVEUAAAAAzdwAydcAyNgA//8AzOYAydcAyNgAyNgA2NgAytoAzNkAytgAydgA29sA0egAyNgAyNgA//8AyNgAydgA//8Ay9cAydcAytkAz90Ay9gA1eoAydgAytsAyNgAytgAydkAydgAydgAyNgAydgAyNcAy9oAydgA//8AytsAy9kAytkAyNgAydgAydkAy9kAzP8AydgAydgAydgAz98AzN0AyNcAyNsAydcAydgAydgAydcAytgAytcAydcAydcAytcAydcAyNcAydcAy9gAztgAydcAydgAzOAAydcAyNgAyNgAytwAyNcAyNgAy9wAyNcAyNcAyNgAydgAyNcAydcAydgA0uEAydkAyNgAyeQA4+MAyNgAydkAzN0AyNsA1f8AyNgAydgAydcA1eMAydgAydcAyNdj6PGJAAAAZ3RSTlMAJFpBAQqm8qwNPiiPygcLv8QEw5cDQMA1JU4MwiuDbl/+6+m4+0XLAj9KePz9cjYFvervEA/IDsfFr+xcgeaOYIDo+ica1OMZ9bXlHe73LM3M35itxs8Rf5ATCbFeHjgGttC5ErzO3WvwaAAAAWxJREFUOMt9kudCwkAQhFcITQWCoaggiBqxoaixYUVsYMMGCmLXff838LIXCJAL84fvmCHsTg4AYMDhlIDkcnu8Po4w6BjiIA0joj+gY1BmGKLEiMIwHNFR9xGjuh8jpMQoYZjRGBGOA8QTHDEUB4hynABwcEqCT8GW2DNSnCYBnJzSoSk0NT2jcphlM/rRXpk5NkRgfmFxSWBml6MrOWNlWBUEEmDKtyYIrGttP66gSP4Nww8mUKzNLd5/zHaJbb1Tl9xnzR2WcGM/5QE8BLvJvf0Dc4HDo8IxUVECL5Vywv7s9Mzwz/WLcFHSsWy8w0sa9+qa/JtbOlUY3mnGLbjnCz9Q4JEfnhCrNb5nXi3w754p8MIPKVWpt6psGJ+vFJBbBUO3GlozzYdsSmCV1NlntiTnegNvPQ29Wx7h7fKrEUvg47PD/6oLpgh8m7//AZEav4b/J/bbb75SAzvR3crY+6y8fLGsQV9ZSvwHF4LQIhDjT+8AAAAASUVORK5CYII=

- +#define parabola_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC

- + 

- +#define fsf_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC

- + 

- +#define gnu_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC

- + 

- +#define libreplanet_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC

- + 

- +#define hnode_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC

-  <!-- 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/. -->

- @@ -29,31 +29,23 @@

-  <dl><p>

-      <dt><h3 personal_toolbar_folder="true" data-l10n-id="default-bookmarks-toolbarfolder">default-bookmarks-toolbarfolder</h3></dt>

-      <dd data-l10n-id="default-bookmarks-toolbarfolder-description">default-bookmarks-toolbarfolder-description</dd>

- -#ifndef NIGHTLY_BUILD

-          <dl><p>

- -            <dt><a href="https://www.mozilla.org/firefox/central/" icon="@firefox_icon@" data-l10n-id="default-bookmarks-getting-started">default-bookmarks-getting-started</a></dt>

- +            <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a></dt>

-          </dl><p>

- -    <dt><h3 data-l10n-id="default-bookmarks-firefox-heading">default-bookmarks-firefox-heading</h3></dt>

- +    <dt><h3>Parabola GNU/Linux-libre</h3></dt>

-          <dl><p>

- -            <dt><a href="https://support.mozilla.org/products/firefox" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-get-help">default-bookmarks-firefox-get-help</a></dt>

- -            <dt><a href="https://support.mozilla.org/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-customize">default-bookmarks-firefox-customize</a></dt>

- -            <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>

- -            <dt><a href="https://www.mozilla.org/about/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-about">default-bookmarks-firefox-about</a></dt>

- -        </dl><p>

- -#else

- -        <dl><p>

- -            <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>

- -        </dl><p>

- -    <dt><h3 data-l10n-id="default-bookmarks-nightly-heading">default-bookmarks-nightly-heading</h3></dt>

- +            <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a>

- +            <dt><a href="https://www.parabola.nu/packages/" icon="@parabola_icon@">Parabola GNU/Linux-libre Packages</a>

- +            <dt><a href="https://wiki.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Wiki</a>

- +            <dt><a href="https://labs.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Labs</a>

- +    </dl><p>

- +    <dt><h3>Free Software Foundation</h3></dt>

-          <dl><p>

- -            <dt><a href="https://blog.nightly.mozilla.org/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-nightly-blog">default-bookmarks-nightly-blog</a></dt>

- -            <dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz" data-l10n-id="default-bookmarks-bugzilla">default-bookmarks-bugzilla</a></dt>

- -            <dt><a href="https://developer.mozilla.org/" icon="@mdn_icon@" shortcuturl="mdn" data-l10n-id="default-bookmarks-mdn">default-bookmarks-mdn</a></dt>

- -            <dt><a href="https://addons.mozilla.org/firefox/addon/nightly-tester-tools/" icon="@addon_icon@" data-l10n-id="default-bookmarks-nightly-tester-tools">default-bookmarks-nightly-tester-tools</a></dt>

- -            <dt><a href="about:crashes" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-crashes">default-bookmarks-crashes</a></dt>

- -            <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-planet">default-bookmarks-planet</a></dt>

- +            <dt><a href="https://www.fsf.org/" icon="@fsf_icon@">Free Software Foundation</a>

- +            <dt><a href="https://www.gnu.org/" icon="@gnu_icon@">The GNU Operating System and the Free Software Movement</a>

- +            <dt><a href="https://libreplanet.org/" icon="@libreplanet_icon@">LibrePlanet</a>

- +            <dt><a href="https://www.h-node.org/" icon="@hnode_icon@">h-node</a>

-          </dl><p>

- -#endif

-  </dl>

-  </body>

-  </html>

- -- 

- 2.35.1

- 

- From f4475bc77e63f16562aa8360233140522d72d8d4 Mon Sep 17 00:00:00 2001

- From: grizzlyuser <grizzlyuser@protonmail.com>

- Date: Sat, 7 May 2022 21:46:48 +0200

- Subject: [PATCH] Remove 'More from Mozilla' section in Preferences

- 

- Currently it contains functionality to provide links to nonfree software

- like Firefox Mobile, which is not compatible with the FSDG for the same

- reasons as desktop Firefox.

- ---

-  browser/app/profile/firefox.js                |  2 +-

-  .../static/browser_all_files_referenced.js    | 12 -------

-  browser/components/preferences/jar.mn         |  4 ---

-  .../more-from-mozilla-qr-code-advanced.svg    |  4 ---

-  .../more-from-mozilla-qr-code-simple-cn.svg   |  4 ---

-  .../more-from-mozilla-qr-code-simple.svg      |  4 ---

-  .../components/preferences/moreFromMozilla.js | 33 +------------------

-  browser/components/preferences/preferences.js |  9 -----

-  .../components/preferences/preferences.xhtml  | 12 -------

-  9 files changed, 2 insertions(+), 82 deletions(-)

-  delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-advanced.svg

-  delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg

-  delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple.svg

- 

- diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js

- index 76b495ea6c..d0c2b98b11 100644

- --- a/browser/app/profile/firefox.js

- +++ b/browser/app/profile/firefox.js

- @@ -1011,7 +1011,7 @@ pref("browser.preferences.experimental", true);

-  #else

-  pref("browser.preferences.experimental", false);

-  #endif

- -pref("browser.preferences.moreFromMozilla", true);

- +pref("browser.preferences.moreFromMozilla", false);

-  pref("browser.preferences.experimental.hidden", false);

-  pref("browser.preferences.defaultPerformanceSettings.enabled", true);

-  

- diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js

- index 4c59b84a7c..44d36d3b28 100644

- --- a/browser/base/content/test/static/browser_all_files_referenced.js

- +++ b/browser/base/content/test/static/browser_all_files_referenced.js

- @@ -33,7 +33,6 @@ var gExceptionPaths = [

-    "chrome://browser/content/assets/moz-vpn.svg",

-    "chrome://browser/content/assets/vpn-logo.svg",

-    "chrome://browser/content/assets/focus-promo.png",

- -  "chrome://browser/content/preferences/more-from-mozilla-qr-code-advanced.svg",

-    "chrome://browser/content/assets/klar-qr-code.svg",

-  

-    // These app marketplace icons are referenced based on the user's locale

- @@ -136,17 +135,6 @@ var whitelist = [

-    // extensions/pref/autoconfig/src/nsReadConfig.cpp

-    { file: "resource://gre/defaults/autoconfig/prefcalls.js" },

-  

- -  // browser/components/preferences/moreFromMozilla.js

- -  // These files URLs are constructed programatically at run time.

- -  {

- -    file:

- -      "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg",

- -  },

- -  {

- -    file:

- -      "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg",

- -  },

- -

-    { file: "resource://gre/greprefs.js" },

-  

-    // layout/mathml/nsMathMLChar.cpp

- diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn

- index 912d9edf08..dd4697a368 100644

- --- a/browser/components/preferences/jar.mn

- +++ b/browser/components/preferences/jar.mn

- @@ -14,12 +14,8 @@ browser.jar:

-     content/browser/preferences/containers.js

-     content/browser/preferences/sync.js

-     content/browser/preferences/experimental.js

- -   content/browser/preferences/moreFromMozilla.js

-     content/browser/preferences/fxaPairDevice.xhtml

-     content/browser/preferences/fxaPairDevice.js

-     content/browser/preferences/findInPage.js

- -   content/browser/preferences/more-from-mozilla-qr-code-simple.svg

- -   content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg

- -   content/browser/preferences/more-from-mozilla-qr-code-advanced.svg

-     content/browser/preferences/web-appearance-dark.svg

-     content/browser/preferences/web-appearance-light.svg

- diff --git a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg b/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg

- deleted file mode 100644

- index 4848d3e20c..0000000000

- --- a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg

- +++ /dev/null

- @@ -1,4 +0,0 @@

- -<!-- 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" fill="content" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4 2h105a2 2 0 0 1 2 2v105a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2ZM0 4a4 4 0 0 1 4-4h105a4 4 0 0 1 4 4v105a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4Zm10 6h22.448v22.448H10V10Zm6.414 3.207h-3.207V29.24H29.24V13.207H16.414ZM38.862 10h6.414v3.207h3.207v3.207h-3.207v3.207h3.207v-3.207h3.207V10h6.413v3.207h3.207V10h3.207v6.414h-9.62v6.414h3.206v3.207h3.207v-3.207h3.207V19.62h3.207v-3.207h3.207v3.207h3.207v-6.414h3.207V22.828h-3.207v3.207H70.93v6.413h-3.207v-3.207h-3.207v6.414H61.31v-6.414h-3.207v3.207h-3.206v-6.413h-6.414v-3.207h-6.414v3.207h-3.207v-3.207h-3.207v-6.414h6.414v-3.207h-3.207V10Zm6.414 22.448h-3.207v-6.413h3.207v6.413Zm-9.62 9.621h6.413v-3.207h-3.207v-3.207h6.414v-3.207h3.207v-3.207h3.207v3.207h3.207v6.414H51.69v-3.207h-3.207v3.207h3.207v3.207h-6.414v3.207h-3.207V54.897h-3.207v3.206h-3.207v-3.206h-3.207V51.69h-3.207v-3.207h3.207v-3.207h3.207v3.207h3.207v-3.207h-3.207v-3.207Zm-3.208 0v3.207h-3.207v-3.207h3.207Zm-3.207-3.207v-3.207h6.414v6.414h-3.207v-3.207h-3.207Zm-9.62 0v-3.207h6.414v3.207h3.206v3.207h-6.413v-3.207H19.62Zm0 0v3.207h-3.207v3.207h-3.207v-3.207H10v-3.207H19.621Zm6.414 19.241V51.69h3.206v3.207h3.207v3.206h-6.413Zm0 3.207v-3.207h-3.207V48.483h3.207v-3.207H19.62v3.207h-6.414v6.414h6.414v3.206h3.207v3.207h-6.414v-3.207H10v19.242h12.828v-3.207H19.62V70.93h6.414v6.414h6.413v-3.207h3.207V83.759h3.207v-3.207h3.207v16.034h16.034v3.207H48.483V103h9.62v-3.207h3.207V103h16.035v-3.207H67.724v-3.207H61.31V93.38H70.931v-3.207h12.828v6.414h-3.207V93.38h-6.414v3.207h6.414V103H93.379v-3.207h3.207v-3.207h3.207v3.207H103V93.38h-3.207v-3.207H90.172v-3.206h3.207v-3.207h3.207V70.93h-9.62v-3.207H96.586v-3.207H93.38V61.31h3.207v-3.207H93.38v-3.206h3.207V51.69h3.207V64.517H103V51.69h-3.207v-3.207H103v-3.207h-3.207v3.207h-3.207v3.207H93.38v-3.207h-3.207v3.207h-3.206v3.207h-3.207v-6.414h3.207v-3.207H96.586v-3.207h3.207v-3.207h-3.207v-3.207h-6.414v3.207H83.76v3.207h-6.414v-3.207h-3.207v6.414H70.93v3.207h3.207v-3.207H83.759v3.207h-6.414v3.207h3.207v3.207H70.93v3.206H80.552v3.207h3.207v-3.207h3.207v3.207h3.206v3.207h-3.206v3.207h-3.207v-3.207h-6.414V61.31H70.93v3.207h3.207v3.207h-6.414v6.414h-3.207V70.93H61.31v3.207h-3.207V70.93h-3.206v3.207H51.69V83.759h-3.207v3.207h-3.207v-6.414h-3.207v-3.207h3.207v-3.207h-3.207v3.207h-3.207V70.93h-3.207v-6.414h3.207v3.207h3.207V61.31h-6.414v-3.207h-3.207v3.207h-6.413Zm0 3.207V61.31h-3.207v3.207H19.62v3.207h3.207v-3.207h3.207Zm3.206 6.414h3.207v3.207h-3.207V70.93Zm0 0v-3.207h3.207v-3.207h-6.413v6.414h3.206Zm25.656 16.035h-6.414v3.206h-3.207v3.207H58.103v-3.207h3.207v-3.206h3.207v-3.207h3.207v6.413h3.207V83.76h-3.207v-3.207h-3.207v-3.207H61.31v3.207h-3.207v3.207h-3.206v3.207Zm3.206 0h3.207v-3.207h3.207v-3.207H61.31v3.207h-3.207v3.207Zm0 0h-3.206v3.206h3.206v-3.206Zm-3.206-12.828v3.207h3.206v-3.207h-3.206Zm28.862-3.207v-3.207h-6.414v3.207H70.93v3.207h6.414V70.93h6.414Zm0 0v3.207h3.207V70.93h-3.207Zm6.413-16.034h-3.206v3.206h3.206v-3.206Zm-6.413 3.206v-3.206h-3.207v3.206h3.207Zm6.413-19.24v3.206h3.207v-3.207h-3.207Zm0 16.034V51.69h3.207v3.207h-3.207Zm3.207 28.862v-3.207h-3.207v3.207h3.207Zm-3.207 9.62v6.414h3.207V93.38h-3.207Zm0 0v-3.207h-3.206v3.207h3.206Zm-6.413 3.207v3.207h3.207v-3.207h-3.207ZM54.897 38.862H64.517v3.207h-9.62v-3.207Zm19.24-25.655h-6.413V10h6.414v3.207Zm-12.827 9.62h-3.207v-3.206h3.207v3.207ZM80.552 10H103v22.448H80.552V10Zm6.413 3.207H83.76V29.24H99.793V13.207H86.966Zm-70.551 3.207H26.035V26.035H16.414V16.414Zm70.552 0H96.586V26.035h-9.62V16.414ZM35.656 29.24h3.206v3.207h-3.207v-3.207Zm38.482 0h3.207v6.414h-3.207v-6.414Zm-6.414 6.414h3.207v3.207h-3.207v-3.207Zm32.07 32.07H103V77.344h-3.207V67.724Zm-6.415 6.413h-3.207v3.207h3.207v-3.207Zm-19.241 3.207H70.93v3.207h3.207v-3.207Zm6.414 0h-3.207V86.966H86.966V77.345h-6.414ZM10 80.552h22.448V103H10V80.552Zm6.414 3.207h-3.207V99.793H29.24V83.76H16.414Zm64.138-3.207h3.207v3.207h-3.207v-3.207Zm-64.138 6.413H26.035V96.587H16.414v-9.62Zm19.241 0h3.207v6.414h-3.207v-6.413Zm6.414 12.828h3.207V103h-3.207v-3.207Z" fill="#141422"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.882.772 1.83.938 2.81l.002.015c-1.048-2.609-2.822-3.663-4.273-5.954a11.08 11.08 0 0 1-.218-.355 2.928 2.928 0 0 1-.102-.19 1.685 1.685 0 0 1-.144-.383.024.024 0 0 0-.015-.008.032.032 0 0 0-.017 0l-.005.002-.007.004.004-.006c-2.326 1.361-3.116 3.882-3.187 5.144a4.633 4.633 0 0 0-2.55.982 2.782 2.782 0 0 0-.239-.181 4.295 4.295 0 0 1-.026-2.264c-.854.414-1.613 1-2.229 1.723h-.004c-.367-.465-.341-1.999-.32-2.32a1.656 1.656 0 0 0-.31.165c-.323.231-.626.49-.904.775a8.089 8.089 0 0 0-.866 1.039v.001-.002a7.821 7.821 0 0 0-1.242 2.806l-.013.06c-.017.082-.08.49-.091.579l-.002.02a8.82 8.82 0 0 0-.15 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.359a9.523 9.523 0 0 0-.6-4.652v.002ZM54.395 60.29c.043.02.083.043.128.063l.006.004a5.116 5.116 0 0 1-.134-.067Zm9.755-6.765v-.01l.001.01h-.001Z" fill="url(#a)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.883.772 1.83.938 2.81v.009l.002.01a8.387 8.387 0 0 1-.289 6.25c-1.061 2.277-3.629 4.611-7.65 4.497-4.344-.123-8.172-3.348-8.886-7.57-.13-.666 0-1.003.065-1.544-.089.42-.139.848-.148 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.358a9.525 9.525 0 0 0-.6-4.652h-.001Z" fill="url(#b)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.883.772 1.83.938 2.81v.009l.002.01a8.387 8.387 0 0 1-.289 6.25c-1.061 2.277-3.629 4.611-7.65 4.497-4.344-.123-8.172-3.348-8.886-7.57-.13-.666 0-1.003.065-1.544-.089.42-.139.848-.148 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.358a9.525 9.525 0 0 0-.6-4.652h-.001Z" fill="url(#c)"/><path d="m60.566 54.129.058.042a5.043 5.043 0 0 0-.86-1.121c-2.88-2.88-.755-6.241-.397-6.413l.004-.006c-2.326 1.362-3.116 3.883-3.187 5.145.108-.008.215-.017.325-.017a4.673 4.673 0 0 1 4.057 2.37Z" fill="url(#d)"/><path d="M56.514 54.705c-.015.23-.83 1.025-1.114 1.025-2.633 0-3.06 1.593-3.06 1.593.116 1.341 1.05 2.446 2.18 3.03.052.026.105.05.157.074.09.04.181.077.272.111a4.12 4.12 0 0 0 1.205.233c4.616.216 5.51-5.52 2.179-7.185a3.196 3.196 0 0 1 2.233.542 4.673 4.673 0 0 0-4.058-2.37c-.11 0-.217.01-.325.017a4.633 4.633 0 0 0-2.55.982c.142.12.301.28.637.61.628.62 2.24 1.26 2.243 1.336l.001.002Z" fill="url(#e)"/><path d="M56.514 54.705c-.015.23-.83 1.025-1.114 1.025-2.633 0-3.06 1.593-3.06 1.593.116 1.341 1.05 2.446 2.18 3.03.052.026.105.05.157.074.09.04.181.077.272.111a4.12 4.12 0 0 0 1.205.233c4.616.216 5.51-5.52 2.179-7.185a3.196 3.196 0 0 1 2.233.542 4.673 4.673 0 0 0-4.058-2.37c-.11 0-.217.01-.325.017a4.633 4.633 0 0 0-2.55.982c.142.12.301.28.637.61.628.62 2.24 1.26 2.243 1.336l.001.002Z" fill="url(#f)"/><path d="M53.202 52.452c.075.047.137.09.192.127a4.295 4.295 0 0 1-.026-2.264c-.855.414-1.614 1-2.23 1.723.046-.001 1.389-.025 2.064.414Z" fill="url(#g)"/><path d="M47.323 56.705c.715 4.222 4.542 7.447 8.886 7.57 4.021.113 6.59-2.222 7.65-4.498a8.387 8.387 0 0 0 .289-6.25v-.009c0-.007-.002-.01 0-.009l.002.016c.328 2.145-.763 4.222-2.469 5.629l-.005.012c-3.324 2.707-6.504 1.633-7.146 1.195a4.961 4.961 0 0 1-.135-.067c-1.938-.927-2.738-2.69-2.566-4.206a2.379 2.379 0 0 1-2.194-1.38 3.493 3.493 0 0 1 3.405-.136 4.611 4.611 0 0 0 3.476.136c-.003-.075-1.615-.716-2.243-1.335-.336-.331-.495-.49-.637-.61a2.78 2.78 0 0 0-.238-.181c-.055-.038-.117-.078-.192-.127-.675-.44-2.018-.415-2.063-.414h-.004c-.367-.465-.341-2-.32-2.32a1.66 1.66 0 0 0-.31.165c-.323.23-.626.49-.904.775-.319.32-.61.667-.87 1.036v.002-.002a7.82 7.82 0 0 0-1.242 2.805c-.005.019-.334 1.457-.172 2.203h.002Z" fill="url(#h)"/><path d="M59.763 53.05c.339.331.628.71.86 1.122.052.039.099.077.14.114 2.099 1.935.999 4.67.917 4.864 1.705-1.405 2.795-3.483 2.468-5.629-1.047-2.611-2.824-3.665-4.272-5.956a11.265 11.265 0 0 1-.218-.355 2.923 2.923 0 0 1-.102-.191 1.686 1.686 0 0 1-.144-.383.024.024 0 0 0-.015-.008.035.035 0 0 0-.018 0l-.004.003-.007.004c-.358.17-2.483 3.533.397 6.41l-.002.004Z" fill="url(#i)"/><path d="M60.762 54.287a1.93 1.93 0 0 0-.139-.114l-.057-.042a3.196 3.196 0 0 0-2.233-.542c3.33 1.665 2.437 7.4-2.179 7.184a4.12 4.12 0 0 1-1.205-.232 4.906 4.906 0 0 1-.428-.186l.007.004c.643.44 3.822 1.513 7.146-1.195l.005-.012c.083-.193 1.183-2.929-.917-4.864v-.001Z" fill="url(#j)"/><path d="M52.34 57.321s.427-1.593 3.06-1.593c.285 0 1.1-.794 1.114-1.025a4.612 4.612 0 0 1-3.476-.136 3.492 3.492 0 0 0-3.405.136 2.378 2.378 0 0 0 2.194 1.38c-.172 1.514.629 3.278 2.566 4.206.043.02.084.043.128.063-1.13-.585-2.065-1.69-2.181-3.03Z" fill="url(#k)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.882.772 1.83.938 2.81l.002.015c-1.048-2.609-2.822-3.663-4.273-5.954a11.265 11.265 0 0 1-.218-.355 2.923 2.923 0 0 1-.102-.19 1.685 1.685 0 0 1-.144-.383.024.024 0 0 0-.015-.008.033.033 0 0 0-.017 0l-.005.002-.007.004.004-.006c-2.326 1.361-3.116 3.882-3.187 5.144.108-.008.215-.017.325-.017a4.673 4.673 0 0 1 4.057 2.37 3.197 3.197 0 0 0-2.233-.542c3.331 1.665 2.437 7.4-2.178 7.184a4.117 4.117 0 0 1-1.205-.232 4.828 4.828 0 0 1-.429-.186l.007.004a4.825 4.825 0 0 1-.135-.067c.043.02.084.043.128.063-1.13-.584-2.064-1.69-2.18-3.03 0 0 .427-1.593 3.06-1.593.285 0 1.099-.794 1.114-1.024-.004-.076-1.616-.717-2.244-1.336-.336-.331-.495-.49-.636-.61a2.765 2.765 0 0 0-.24-.181 4.293 4.293 0 0 1-.025-2.264c-.855.414-1.614 1-2.23 1.723h-.004c-.366-.465-.34-1.999-.32-2.32a1.653 1.653 0 0 0-.309.165 6.75 6.75 0 0 0-.905.775 8.08 8.08 0 0 0-.866 1.039v.001-.002a7.82 7.82 0 0 0-1.242 2.805l-.013.062c-.017.081-.095.495-.106.584-.072.427-.117.858-.137 1.29v.049a9.261 9.261 0 0 0 18.386 1.566l.042-.359a9.525 9.525 0 0 0-.6-4.652Zm-.919.475.002.01-.002-.01Z" fill="url(#l)"/><defs><radialGradient id="b" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.247 48.782) scale(19.3057)"><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(56.08 56.666) scale(19.3057)"><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(58.468 44.481) scale(13.9847)"><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(53.929 61.684) scale(9.19171)"><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(4.73773 -1.14544 1.34103 5.5467 57.013 55.01)"><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(55.84 48.065) scale(6.61363)"><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(61.097 43.764) scale(28.2178)"><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(2.1701 20.56421 -13.49616 1.42422 58.751 45.329)"><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(55.84 50.454) scale(17.614)"><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(60.38 51.41) scale(19.2794)"><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="63.842" y1="49.59" x2="48.468" y2="64.423" 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="63.656" y1="49.512" x2="50.577" y2="62.593" 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 --git a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg

- deleted file mode 100644

- index 5052db9702..0000000000

- --- a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg

- +++ /dev/null

- @@ -1,4 +0,0 @@

- -<!-- 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 --git a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg

- deleted file mode 100644

- index 279595db10..0000000000

- --- a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg

- +++ /dev/null

- @@ -1,4 +0,0 @@

- -<!-- 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 --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js

- index 1208a5dbcd..ff91f7421e 100644

- --- a/browser/components/preferences/moreFromMozilla.js

- +++ b/browser/components/preferences/moreFromMozilla.js

- @@ -81,38 +81,7 @@ var gMoreFromMozillaPane = {

-    },

-  

-    renderProducts() {

- -    let products = [

- -      {

- -        id: "firefox-mobile",

- -        title_string_id: "more-from-moz-firefox-mobile-title",

- -        description_string_id: "more-from-moz-firefox-mobile-description",

- -        region: "global",

- -        button: {

- -          id: "fxMobile",

- -          type: "link",

- -          label_string_id: "more-from-moz-learn-more-link",

- -          actionURL: AppConstants.isChinaRepack()

- -            ? "https://www.firefox.com.cn/browsers/mobile/"

- -            : "https://www.mozilla.org/firefox/browsers/mobile/",

- -        },

- -        qrcode: {

- -          title: {

- -            string_id: "more-from-moz-qr-code-box-firefox-mobile-title",

- -          },

- -          image_src_prefix:

- -            "chrome://browser/content/preferences/more-from-mozilla-qr-code",

- -          button: {

- -            id: "qr-code-send-email",

- -            label: {

- -              string_id: "more-from-moz-qr-code-box-firefox-mobile-button",

- -            },

- -            actionURL: AppConstants.isChinaRepack()

- -              ? "https://www.firefox.com.cn/mobile/get-app/"

- -              : "https://www.mozilla.org/firefox/mobile/get-app/?v=mfm",

- -          },

- -        },

- -      },

- -    ];

- +    let products = [];

-  

-      if (BrowserUtils.shouldShowVPNPromo()) {

-        const vpn = {

- diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js

- index f6dc2b3781..34c7d8c528 100644

- --- a/browser/components/preferences/preferences.js

- +++ b/browser/components/preferences/preferences.js

- @@ -10,7 +10,6 @@

-  /* import-globals-from privacy.js */

-  /* import-globals-from sync.js */

-  /* import-globals-from experimental.js */

- -/* import-globals-from moreFromMozilla.js */

-  /* import-globals-from findInPage.js */

-  /* import-globals-from /browser/base/content/utilityOverlay.js */

-  /* import-globals-from /toolkit/content/preferencesBindings.js */

- @@ -203,14 +202,6 @@ function init_all() {

-      register_module("paneExperimental", gExperimentalPane);

-    }

-  

- -  NimbusFeatures.moreFromMozilla.recordExposureEvent({ once: true });

- -  if (NimbusFeatures.moreFromMozilla.getVariable("enabled")) {

- -    document.getElementById("category-more-from-mozilla").hidden = false;

- -    gMoreFromMozillaPane.option = NimbusFeatures.moreFromMozilla.getVariable(

- -      "template"

- -    );

- -    register_module("paneMoreFromMozilla", gMoreFromMozillaPane);

- -  }

-    // The Sync category needs to be the last of the "real" categories

-    // registered and inititalized since many tests wait for the

-    // "sync-pane-loaded" observer notification before starting the test.

- diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml

- index 81059f3d2e..be23729276 100644

- --- a/browser/components/preferences/preferences.xhtml

- +++ b/browser/components/preferences/preferences.xhtml

- @@ -33,7 +33,6 @@

-    <link rel="localization" href="browser/branding/sync-brand.ftl"/>

-    <link rel="localization" href="browser/browser.ftl"/>

-    <link rel="localization" href="browser/preferences/preferences.ftl"/>

- -  <link rel="localization" href="browser/preferences/moreFromMozilla.ftl"/>

-    <!-- Used by fontbuilder.js -->

-    <link rel="localization" href="browser/preferences/fonts.ftl"/>

-    <link rel="localization" href="toolkit/featuregates/features.ftl"/>

- @@ -152,16 +151,6 @@

-            <image class="category-icon"/>

-            <label class="category-name" flex="1" data-l10n-id="pane-experimental-title"></label>

-          </richlistitem>

- -        <richlistitem id="category-more-from-mozilla"

- -                      class="category"

- -                      hidden="true"

- -                      data-l10n-id="more-from-moz-category"

- -                      data-l10n-attrs="tooltiptext"

- -                      value="paneMoreFromMozilla"

- -                      align="center">

- -          <image class="category-icon"/>

- -          <label class="category-name" flex="1" data-l10n-id="more-from-moz-title"></label>

- -        </richlistitem>

-        </richlistbox>

-  

-        <spacer flex="1"/>

- @@ -214,7 +203,6 @@

-  #include containers.inc.xhtml

-  #include sync.inc.xhtml

-  #include experimental.inc.xhtml

- -#include moreFromMozilla.inc.xhtml

-          </vbox>

-        </vbox>

-      </vbox>

- -- 

- 2.36.0

- 

- 

- From 66dec07e773e35b82aa42120441dea0fb185986d Mon Sep 17 00:00:00 2001

- From: grizzlyuser <grizzlyuser@protonmail.com>

- Date: Sat, 7 May 2022 21:51:06 +0200

- Subject: [PATCH] Remove promos of Firefox Focus and Klar from Private

-  Browsing

- 

- Please correct me if I'm wrong, but these are not compatible with FSDG

- for the same reasons as the original Firefox.

- ---

-  browser/app/profile/firefox.js                |   2 +-

-  .../static/browser_all_files_referenced.js    |   2 -

-  .../newtab/lib/OnboardingMessageProvider.jsm  | 215 ------------------

-  .../newtab/lib/PanelTestProvider.jsm          |  84 -------

-  .../content/assets/focus-qr-code.svg          | 114 ----------

-  .../content/assets/klar-qr-code.svg           | 114 ----------

-  6 files changed, 1 insertion(+), 530 deletions(-)

-  delete mode 100644 browser/components/privatebrowsing/content/assets/focus-qr-code.svg

-  delete mode 100644 browser/components/privatebrowsing/content/assets/klar-qr-code.svg

- 

- diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js

- index d0c2b98b11..54cc9de7e6 100644

- --- a/browser/app/profile/firefox.js

- +++ b/browser/app/profile/firefox.js

- @@ -1907,7 +1907,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,be,ca,ch,de,es,fi,fr,g

-  pref("browser.promo.focus.disallowed_regions", "cn");

-  

-  // Default to enabling focus promos to be shown where allowed.

- -pref("browser.promo.focus.enabled", true);

- +pref("browser.promo.focus.enabled", false);

-  

-  // Comma separated string of mozilla vpn supported platforms.

-  pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux");

- diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js

- index 44d36d3b28..6823855d56 100644

- --- a/browser/base/content/test/static/browser_all_files_referenced.js

- +++ b/browser/base/content/test/static/browser_all_files_referenced.js

- @@ -32,8 +32,6 @@ var gExceptionPaths = [

-    "chrome://activity-stream/content/data/content/assets/remote/",

-    "chrome://browser/content/assets/moz-vpn.svg",

-    "chrome://browser/content/assets/vpn-logo.svg",

- -  "chrome://browser/content/assets/focus-promo.png",

- -  "chrome://browser/content/assets/klar-qr-code.svg",

-  

-    // These app marketplace icons are referenced based on the user's locale

-    // in browser/components/newtab/content-src/aboutwelcome/components/MobileDownloads.jsx

- diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm

- index 940332f27f..1f7378bbae 100644

- --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm

- +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm

- @@ -95,220 +95,6 @@ const ONBOARDING_MESSAGES = () => [

-        ],

-      },

-    },

- -  {

- -    id: "PB_NEWTAB_FOCUS_PROMO",

- -    type: "default",

- -    template: "pb_newtab",

- -    groups: ["pbNewtab"],

- -    content: {

- -      infoBody: "fluent:about-private-browsing-info-description-simplified",

- -      infoEnabled: true,

- -      infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg",

- -      infoLinkText: "fluent:about-private-browsing-learn-more-link",

- -      infoTitle: "",

- -      infoTitleEnabled: false,

- -      promoEnabled: true,

- -      promoType: "FOCUS",

- -      promoHeader: "fluent:about-private-browsing-focus-promo-header-c",

- -      promoImageLarge: "chrome://browser/content/assets/focus-promo.png",

- -      promoLinkText: "fluent:about-private-browsing-focus-promo-cta",

- -      promoLinkType: "button",

- -      promoSectionStyle: "below-search",

- -      promoTitle: "fluent:about-private-browsing-focus-promo-text-c",

- -      promoTitleEnabled: true,

- -      promoButton: {

- -        action: {

- -          type: "SHOW_SPOTLIGHT",

- -          data: {

- -            content: {

- -              id: "FOCUS_PROMO",

- -              template: "multistage",

- -              modal: "tab",

- -              backdrop: "transparent",

- -              screens: [

- -                {

- -                  id: "DEFAULT_MODAL_UI",

- -                  content: {

- -                    logo: {

- -                      imageURL:

- -                        "chrome://browser/content/assets/focus-logo.svg",

- -                      height: "48px",

- -                    },

- -                    title: {

- -                      string_id: "spotlight-focus-promo-title",

- -                    },

- -                    subtitle: {

- -                      string_id: "spotlight-focus-promo-subtitle",

- -                    },

- -                    dismiss_button: {

- -                      action: {

- -                        navigate: true,

- -                      },

- -                    },

- -                    ios: {

- -                      action: {

- -                        data: {

- -                          args:

- -                            "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",

- -                          where: "tabshifted",

- -                        },

- -                        type: "OPEN_URL",

- -                        navigate: true,

- -                      },

- -                    },

- -                    android: {

- -                      action: {

- -                        data: {

- -                          args:

- -                            "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",

- -                          where: "tabshifted",

- -                        },

- -                        type: "OPEN_URL",

- -                        navigate: true,

- -                      },

- -                    },

- -                    tiles: {

- -                      type: "mobile_downloads",

- -                      data: {

- -                        QR_code: {

- -                          image_url:

- -                            "chrome://browser/content/assets/focus-qr-code.svg",

- -                          alt_text: {

- -                            string_id: "spotlight-focus-promo-qr-code",

- -                          },

- -                          image_overrides: {

- -                            de:

- -                              "chrome://browser/content/assets/klar-qr-code.svg",

- -                          },

- -                        },

- -                        marketplace_buttons: ["ios", "android"],

- -                      },

- -                    },

- -                  },

- -                },

- -              ],

- -            },

- -          },

- -        },

- -      },

- -    },

- -    priority: 2,

- -    frequency: {

- -      custom: [

- -        {

- -          cap: 3,

- -          period: 604800000, // Max 3 per week

- -        },

- -      ],

- -      lifetime: 12,

- -    },

- -    targeting: "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en')",

- -  },

- -  {

- -    id: "PB_NEWTAB_KLAR_PROMO",

- -    type: "default",

- -    template: "pb_newtab",

- -    groups: ["pbNewtab"],

- -    content: {

- -      infoBody: "fluent:about-private-browsing-info-description-simplified",

- -      infoEnabled: true,

- -      infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg",

- -      infoLinkText: "fluent:about-private-browsing-learn-more-link",

- -      infoTitle: "",

- -      infoTitleEnabled: false,

- -      promoEnabled: true,

- -      promoType: "FOCUS",

- -      promoHeader: "fluent:about-private-browsing-focus-promo-header-c",

- -      promoImageLarge: "chrome://browser/content/assets/focus-promo.png",

- -      promoLinkText: "Download Firefox Klar",

- -      promoLinkType: "button",

- -      promoSectionStyle: "below-search",

- -      promoTitle:

- -        "Firefox Klar clears your history every time while blocking ads and trackers.",

- -      promoTitleEnabled: true,

- -      promoButton: {

- -        action: {

- -          type: "SHOW_SPOTLIGHT",

- -          data: {

- -            content: {

- -              id: "KLAR_PROMO",

- -              template: "multistage",

- -              modal: "tab",

- -              backdrop: "transparent",

- -              screens: [

- -                {

- -                  id: "DEFAULT_MODAL_UI",

- -                  order: 0,

- -                  content: {

- -                    logo: {

- -                      imageURL:

- -                        "chrome://browser/content/assets/focus-logo.svg",

- -                      height: "48px",

- -                    },

- -                    title: "Get Firefox Klar",

- -                    subtitle: {

- -                      string_id: "spotlight-focus-promo-subtitle",

- -                    },

- -                    dismiss_button: {

- -                      action: {

- -                        navigate: true,

- -                      },

- -                    },

- -                    ios: {

- -                      action: {

- -                        data: {

- -                          args:

- -                            "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754",

- -                          where: "tabshifted",

- -                        },

- -                        type: "OPEN_URL",

- -                        navigate: true,

- -                      },

- -                    },

- -                    android: {

- -                      action: {

- -                        data: {

- -                          args:

- -                            "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar",

- -                          where: "tabshifted",

- -                        },

- -                        type: "OPEN_URL",

- -                        navigate: true,

- -                      },

- -                    },

- -                    tiles: {

- -                      type: "mobile_downloads",

- -                      data: {

- -                        QR_code: {

- -                          image_url:

- -                            "chrome://browser/content/assets/klar-qr-code.svg",

- -                          alt_text: {

- -                            string_id: "spotlight-focus-promo-qr-code",

- -                          },

- -                        },

- -                        marketplace_buttons: ["ios", "android"],

- -                      },

- -                    },

- -                  },

- -                },

- -              ],

- -            },

- -          },

- -        },

- -      },

- -    },

- -    priority: 2,

- -    frequency: {

- -      custom: [

- -        {

- -          cap: 3,

- -          period: 604800000, // Max 3 per week

- -        },

- -      ],

- -      lifetime: 12,

- -    },

- -    targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'",

- -  },

-    {

-      id: "PB_NEWTAB_INFO_SECTION",

-      template: "pb_newtab",