diff options
author | grizzlyuser <grizzlyuser@protonmail.com> | 2023-06-07 11:55:57 +0200 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2023-06-08 23:03:40 -0400 |
commit | 6a9adffc897cfffe7e5c6727b1667e2469535fe2 (patch) | |
tree | a180b1a7c16942de75449b3d57e4cf6fd315ea8a /libre/iceweasel/9004-FSDG-misc.patch | |
parent | 39bc37d5eb92d1bb0b6afc1b1c9edd058e8ea7f7 (diff) |
[iceweasel]: upgrade to v114.0
1. Update according to the changes from upstreams.
2. To build, needed to copy 'document.ico' from 'unofficial' branding
folder. I believe it has no trademarks attached to it and is OK for
Parabola as it appears to have no special license notice, meaning it's
MPL-2.0 as is most of the Firefox code. Ideally, it'd be better to
remove the wireframe sphere logo from the center and replace it with
Iceweasel logo, and that's what I did initially. But after some digging
into license compatibility of MPL-2.0 and multi-license of Iceweasel
logo (MPL 1.1/GPL 2.0/LGPL 2.1), and reading recommendations to consult
with a lawyer for this case (combining modified works), I decided that's
too much of a hassle.
2. FSDG: Disable and remove URLs of Contile and autoupdate of system
addons.
3. Remove dependencies to old versions of python and python-pydantic,
since system python-typing-extensions can be used instead of vendored
one (after removal of it from the source tree in prepare()).
4. Bring back the patch for version constraint of python-zstandard to
depend on current system version.
Diffstat (limited to 'libre/iceweasel/9004-FSDG-misc.patch')
-rw-r--r-- | libre/iceweasel/9004-FSDG-misc.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index 2e74686a2..4d2680c6a 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -259,18 +259,18 @@ index f6dc2b3781..34c7d8c528 100644 // 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 +index 37544d2092..32b95bf95e 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"/> +@@ -31,7 +31,6 @@ <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 --> + <!-- Used by fontbuilder.js --> <link rel="localization" href="browser/preferences/fonts.ftl"/> - <link rel="localization" href="toolkit/featuregates/features.ftl"/> -@@ -152,16 +151,6 @@ +- <link rel="localization" href="browser/preferences/moreFromMozilla.ftl"/> + <link rel="localization" href="browser/preferences/preferences.ftl"/> + <link rel="localization" href="locales-preview/translations.ftl"/> + <link rel="localization" href="toolkit/branding/accounts.ftl"/> +@@ -156,16 +155,6 @@ <image class="category-icon"/> <label class="category-name" flex="1" data-l10n-id="pane-experimental-title"></label> </richlistitem> |