aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--PKGBUILD10
-rw-r--r--deb_patches/armhf-reduce-linker-memory-use.patch12
-rw-r--r--deb_patches/build-with-libstdc++-7.patch38
-rw-r--r--deb_patches/lower-python3-requirement.patch79
-rw-r--r--deb_patches/python3-remove-fstrings.patch26
-rw-r--r--deb_patches/python3-remove-variable-annotations.patch18
-rw-r--r--deb_patches/silence-gtk-style-assertions.patch2
-rw-r--r--remove_addons.patch41
8 files changed, 123 insertions, 103 deletions
diff --git a/PKGBUILD b/PKGBUILD
index dece6d9..c458d3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=librewolf
_pkgname=LibreWolf
# how to get ci vars instead?
-pkgver=83.0
+pkgver=84.0
pkgrel=1
pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
arch=(x86_64 aarch64)
@@ -40,18 +40,18 @@ source_aarch64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/
arm.patch
https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch)
-sha256sums_x86_64=('d69e84e8b8449f828683d274c24e03095858362bfed21b08bdd7fe715eea5398'
+sha256sums_x86_64=('23273ef0165b243f5d0908c38e7854d38070282c9b526e8d93b7503cd5f69138'
'0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
'SKIP'
'SKIP'
'682bf4bf5d79db0080aa132235a95b25745c8ef944d2a2e1fed985489d894df5'
- '41719289b309912c4b6bc86b41594f671427979481a90c32a9d3d0bf1cdd6d44')
-sha256sums_aarch64=('d69e84e8b8449f828683d274c24e03095858362bfed21b08bdd7fe715eea5398'
+ 'f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6')
+sha256sums_aarch64=('23273ef0165b243f5d0908c38e7854d38070282c9b526e8d93b7503cd5f69138'
'0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
'SKIP'
'SKIP'
'682bf4bf5d79db0080aa132235a95b25745c8ef944d2a2e1fed985489d894df5'
- '41719289b309912c4b6bc86b41594f671427979481a90c32a9d3d0bf1cdd6d44'
+ 'f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6'
'6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7'
'2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
diff --git a/deb_patches/armhf-reduce-linker-memory-use.patch b/deb_patches/armhf-reduce-linker-memory-use.patch
index 6449227..24b3a35 100644
--- a/deb_patches/armhf-reduce-linker-memory-use.patch
+++ b/deb_patches/armhf-reduce-linker-memory-use.patch
@@ -6,7 +6,7 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -2056,15 +2056,16 @@ def select_linker(linker, c_compiler, de
- set_config('LINKER_KIND', select_linker.KIND)
+ set_config("LINKER_KIND", select_linker.KIND)
-@depends_if(select_linker, macos_sdk)
@@ -15,13 +15,13 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
+def linker_ldflags(linker, macos_sdk, host):
flags = list((linker and linker.LINKER_FLAG) or [])
if macos_sdk:
- if linker and linker.KIND == 'ld64':
- flags.append('-Wl,-syslibroot,%s' % macos_sdk)
+ if linker and linker.KIND == "ld64":
+ flags.append("-Wl,-syslibroot,%s" % macos_sdk)
else:
- flags.append('-Wl,--sysroot=%s' % macos_sdk)
+ flags.append("-Wl,--sysroot=%s" % macos_sdk)
-
-+ elif host.cpu == 'arm':
-+ flags.append('-Wl,--no-keep-memory')
++ elif host.cpu == "arm":
++ flags.append("-Wl,--no-keep-memory")
return flags
diff --git a/deb_patches/build-with-libstdc++-7.patch b/deb_patches/build-with-libstdc++-7.patch
index 82cf9cc..fbd1531 100644
--- a/deb_patches/build-with-libstdc++-7.patch
+++ b/deb_patches/build-with-libstdc++-7.patch
@@ -5,29 +5,29 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1252,6 +1252,7 @@ try_compile(includes=['cstddef'],
- '# endif',
- '#endif',
- ]),
-+ flags=['--gcc-toolchain=/usr/lib/gcc-mozilla'],
- check_msg='for new enough STL headers from libstdc++',
- when=needs_libstdcxx_newness_check,
- onerror=die_on_old_libstdcxx)
+ "#endif",
+ ]
+ ),
++ flags=["--gcc-toolchain=/usr/lib/gcc-mozilla"],
+ check_msg="for new enough STL headers from libstdc++",
+ when=needs_libstdcxx_newness_check,
+ onerror=die_on_old_libstdcxx,
@@ -1433,6 +1434,10 @@ set_config('_DEPEND_CFLAGS', depend_cfla
- set_config('_HOST_DEPEND_CFLAGS', depend_cflags(host_c_compiler))
+ set_config("_HOST_DEPEND_CFLAGS", depend_cflags(host_c_compiler))
-+add_old_configure_assignment('CFLAGS', ['--gcc-toolchain=/usr/lib/gcc-mozilla'])
-+add_old_configure_assignment('CXXFLAGS', ['--gcc-toolchain=/usr/lib/gcc-mozilla'])
++add_old_configure_assignment("CFLAGS", ["--gcc-toolchain=/usr/lib/gcc-mozilla"])
++add_old_configure_assignment("CXXFLAGS", ["--gcc-toolchain=/usr/lib/gcc-mozilla"])
+
+
@depends(c_compiler)
def preprocess_option(compiler):
# The uses of PREPROCESS_OPTION depend on the spacing for -o/-Fi.
@@ -2137,6 +2142,7 @@ def linker_ldflags(linker, macos_sdk, ho
- flags.append('-Wl,--sysroot=%s' % macos_sdk)
- elif host.cpu == 'arm':
- flags.append('-Wl,--no-keep-memory')
-+ flags.append('-static-libstdc++')
+ flags.append("-Wl,--sysroot=%s" % macos_sdk)
+ elif host.cpu == "arm":
+ flags.append("-Wl,--no-keep-memory")
++ flags.append("-static-libstdc++")
return flags
@@ -45,10 +45,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861
--- a/layout/style/test/moz.build
+++ b/layout/style/test/moz.build
@@ -18,6 +18,7 @@ DIRS += ['gtest']
- HostSimplePrograms([
- 'host_ListCSSProperties',
- ])
-+HOST_CXXFLAGS += ['--gcc-toolchain=/usr/lib/gcc-mozilla']
+ "host_ListCSSProperties",
+ ]
+ )
++HOST_CXXFLAGS += ["--gcc-toolchain=/usr/lib/gcc-mozilla"]
MOCHITEST_MANIFESTS += [
- 'mochitest.ini',
+ "mochitest.ini",
diff --git a/deb_patches/lower-python3-requirement.patch b/deb_patches/lower-python3-requirement.patch
index e60bf71..b08c811 100644
--- a/deb_patches/lower-python3-requirement.patch
+++ b/deb_patches/lower-python3-requirement.patch
@@ -4,65 +4,68 @@ Bug 1622963 - Require python 3.6 for the build system. r=firefox-build-system-re
Differential Revision: https://phabricator.services.mozilla.com/D77754
-diff -r ede1c973aa85 build/moz.configure/init.configure
---- a/build/moz.configure/init.configure Sun Jun 14 02:41:45 2020 +0000
-+++ b/build/moz.configure/init.configure Sun Jun 14 19:10:48 2020 +0200
-@@ -237,7 +237,7 @@
+diff -r 81f3a9d8e5f4 build/moz.configure/init.configure
+--- a/build/moz.configure/init.configure Tue Nov 17 21:27:44 2020 +0000
++++ b/build/moz.configure/init.configure Wed Nov 18 08:22:17 2020 +0100
+@@ -216,7 +216,7 @@
# Python 3
# ========
--option(env='PYTHON3', nargs=1, help='Python 3 interpreter (3.6 or later)')
-+option(env='PYTHON3', nargs=1, help='Python 3 interpreter (3.5 or later)')
+-option(env="PYTHON3", nargs=1, help="Python 3 interpreter (3.6 or later)")
++option(env="PYTHON3", nargs=1, help="Python 3 interpreter (3.5 or later)")
- option(env='VIRTUALENV_NAME', nargs=1, default='init_py3',
- help='Name of the in-objdir virtualenv')
-@@ -334,20 +334,20 @@
- '(%s): %s' % (python, e))
+ option(
+ env="VIRTUALENV_NAME",
+@@ -327,7 +327,7 @@
+ )
else:
# Fall back to the search routine.
-- python, version = find_python3_executable(min_version='3.6.0')
-+ python, version = find_python3_executable(min_version='3.5.0')
+- python, version = find_python3_executable(min_version="3.6.0")
++ python, version = find_python3_executable(min_version="3.5.0")
# The API returns a bytes whereas everything in configure is unicode.
if python:
- python = ensure_text(python)
+@@ -335,15 +335,15 @@
if not python:
-- raise FatalCheckError('Python 3.6 or newer is required to build. '
-+ raise FatalCheckError('Python 3.5 or newer is required to build. '
- 'Ensure a `python3.x` executable is in your '
- 'PATH or define PYTHON3 to point to a Python '
-- '3.6 executable.')
-+ '3.5 executable.')
+ raise FatalCheckError(
+- "Python 3.6 or newer is required to build. "
++ "Python 3.5 or newer is required to build. "
+ "Ensure a `python3.x` executable is in your "
+ "PATH or define PYTHON3 to point to a Python "
+- "3.6 executable."
++ "3.5 executable."
+ )
- if version < (3, 6, 0):
-- raise FatalCheckError('Python 3.6 or newer is required to build; '
+ if version < (3, 5, 0):
-+ raise FatalCheckError('Python 3.5 or newer is required to build; '
- '%s is Python %d.%d' % (python, version[0],
- version[1]))
+ raise FatalCheckError(
+- "Python 3.6 or newer is required to build; "
++ "Python 3.5 or newer is required to build; "
+ "%s is Python %d.%d" % (python, version[0], version[1])
+ )
-diff -r ede1c973aa85 python/mozbuild/mozbuild/pythonutil.py
---- a/python/mozbuild/mozbuild/pythonutil.py Sun Jun 14 02:41:45 2020 +0000
-+++ b/python/mozbuild/mozbuild/pythonutil.py Sun Jun 14 19:10:48 2020 +0200
-@@ -45,7 +45,7 @@
+diff -r 81f3a9d8e5f4 python/mozbuild/mozbuild/pythonutil.py
+--- a/python/mozbuild/mozbuild/pythonutil.py Tue Nov 17 21:27:44 2020 +0000
++++ b/python/mozbuild/mozbuild/pythonutil.py Wed Nov 18 08:22:17 2020 +0100
+@@ -44,7 +44,7 @@
def _find_python_executable(major):
if major not in (2, 3):
- raise ValueError('Expected a Python major version of 2 or 3')
-- min_versions = {2: '2.7.0', 3: '3.6.0'}
-+ min_versions = {2: '2.7.0', 3: '3.5.0'}
+ raise ValueError("Expected a Python major version of 2 or 3")
+- min_versions = {2: "2.7.0", 3: "3.6.0"}
++ min_versions = {2: "2.7.0", 3: "3.5.0"}
def ret(min_version=min_versions[major]):
from mozfile import which
-diff -r ede1c973aa85 python/mozbuild/mozbuild/virtualenv.py
---- a/python/mozbuild/mozbuild/virtualenv.py Sun Jun 14 02:41:45 2020 +0000
-+++ b/python/mozbuild/mozbuild/virtualenv.py Sun Jun 14 19:10:48 2020 +0200
-@@ -687,7 +687,7 @@
+diff -r 81f3a9d8e5f4 python/mozbuild/mozbuild/virtualenv.py
+--- a/python/mozbuild/mozbuild/virtualenv.py Tue Nov 17 21:27:44 2020 +0000
++++ b/python/mozbuild/mozbuild/virtualenv.py Wed Nov 18 08:22:17 2020 +0100
+@@ -691,7 +691,7 @@
major, minor, micro = sys.version_info[:3]
minimum_python_versions = {
- 2: LooseVersion('2.7.3'),
-- 3: LooseVersion('3.6.0'),
-+ 3: LooseVersion('3.5.0'),
+ 2: LooseVersion("2.7.3"),
+- 3: LooseVersion("3.6.0"),
++ 3: LooseVersion("3.5.0"),
}
- our = LooseVersion('%d.%d.%d' % (major, minor, micro))
+ our = LooseVersion("%d.%d.%d" % (major, minor, micro))
diff --git a/deb_patches/python3-remove-fstrings.patch b/deb_patches/python3-remove-fstrings.patch
index f121f06..abc5be8 100644
--- a/deb_patches/python3-remove-fstrings.patch
+++ b/deb_patches/python3-remove-fstrings.patch
@@ -163,7 +163,7 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
+ return "https://mozilla.github.io/glean/book/user/pings/{}.html".format(ping_name)
- def if_empty(ping_name: str, custom_pings_cache: Dict[str, pings.Ping] = {}) -> bool:
+ def if_empty(
--- a/third_party/python/glean_parser/glean_parser/parser.py
+++ b/third_party/python/glean_parser/glean_parser/parser.py
@@ -46,7 +46,8 @@ def _update_validator(validator):
@@ -380,7 +380,7 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
--- a/third_party/python/glean_parser/glean_parser/metrics.py
+++ b/third_party/python/glean_parser/glean_parser/metrics.py
@@ -138,7 +138,7 @@ class Metric:
- """
+
metric_type = metric_info["type"]
if not isinstance(metric_type, str):
- raise TypeError(f"Unknown metric type {metric_type}")
@@ -408,3 +408,25 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
return translate_metrics(
input_filepaths,
+--- a/toolkit/components/glean/build_scripts/glean_parser_ext/js.py Tue Nov 17 21:27:44 2020 +0000
++++ b/toolkit/components/glean/build_scripts/glean_parser_ext/js.py Wed Nov 18 10:51:04 2020 +0100
+@@ -57,7 +57,7 @@
+ """
+ The metric's unique identifier, including the category and name
+ """
+- return f"{category}.{metric_name}"
++ return "{}.{}".format(category, metric_name)
+
+
+ def type_name(type):
+--- a/toolkit/components/glean/build_scripts/glean_parser_ext/rust.py Tue Nov 17 21:27:44 2020 +0000
++++ b/toolkit/components/glean/build_scripts/glean_parser_ext/rust.py Wed Nov 18 10:51:04 2020 +0100
+@@ -175,7 +175,7 @@
+
+ metric_name = util.snake_case(metric.name)
+ category_name = util.snake_case(category_name)
+- full_path = f"{category_name}::{metric_name}"
++ full_path = "{}::{}".format(category_name, metric_name)
+ objs_by_type[key].append((get_metric_id(metric), full_path))
+
+ # Now for the modules for each category.
diff --git a/deb_patches/python3-remove-variable-annotations.patch b/deb_patches/python3-remove-variable-annotations.patch
index 2ffd7ed..aea5fd8 100644
--- a/deb_patches/python3-remove-variable-annotations.patch
+++ b/deb_patches/python3-remove-variable-annotations.patch
@@ -77,9 +77,9 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
"BUG_NUMBER": (check_bug_number, CheckType.error),
"BASELINE_PING": (check_valid_in_baseline, CheckType.error),
@@ -282,7 +278,7 @@ def lint_metrics(
- :param file: The stream to write errors to.
- :returns: List of nits.
- """
+ if parser_config is None:
+ parser_config = {}
+
- nits: List[GlinterNit] = []
+ nits = []
for (category_name, category) in sorted(list(objs.items())):
@@ -92,8 +92,8 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
- nits: List = []
+ nits = []
for path in input_filepaths:
- # yamllint needs both the file content and the path.
- file_content = None
+ if not path.is_file() and parser_config.get("allow_missing_files", False):
+ continue
--- a/third_party/python/glean_parser/glean_parser/metrics.py
+++ b/third_party/python/glean_parser/glean_parser/metrics.py
@@ -33,10 +33,10 @@ class DataSensitivity(enum.Enum):
@@ -136,13 +136,13 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
--- a/third_party/python/glean_parser/glean_parser/parser.py
+++ b/third_party/python/glean_parser/glean_parser/parser.py
@@ -339,8 +339,8 @@ def parse_objects(
- value from the `metrics.yaml`, rather than having it overridden when
- the metric expires.
- """
+ if config is None:
+ config = {}
+
- all_objects: ObjectTree = OrderedDict()
- sources: Dict[Any, Path] = {}
+ all_objects = OrderedDict()
+ sources = {}
filepaths = util.ensure_list(filepaths)
for filepath in filepaths:
- content, filetype = yield from _load_file(filepath)
+ content, filetype = yield from _load_file(filepath, config)
diff --git a/deb_patches/silence-gtk-style-assertions.patch b/deb_patches/silence-gtk-style-assertions.patch
index b63a658..36ec8e3 100644
--- a/deb_patches/silence-gtk-style-assertions.patch
+++ b/deb_patches/silence-gtk-style-assertions.patch
@@ -14,7 +14,7 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
// Some old distros/themes don't properly use the .selection style, so
// fall back to the regular text view style.
@@ -1413,6 +1413,7 @@ bool nsLookAndFeel::WidgetUsesImage(Widg
- };
+ GTK_STATE_FLAG_BACKDROP, GTK_STATE_FLAG_INSENSITIVE};
GtkStyleContext* style = GetStyleContext(aNodeType);
+ if (!style) return false;
diff --git a/remove_addons.patch b/remove_addons.patch
index a5b8781..04fe18d 100644
--- a/remove_addons.patch
+++ b/remove_addons.patch
@@ -1,30 +1,25 @@
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
-index f71ece6..bd91686 100644
+index 0eb3c53..fb94b5c 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
-@@ -5,9 +5,6 @@
+@@ -4,4 +4,4 @@
+ # 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/.
- DIRS += [
-- 'doh-rollout',
- 'formautofill',
-- 'screenshots',
-- 'webcompat',
-- 'report-site-issue'
-+ 'screenshots'
- ]
+-DIRS += ["doh-rollout", "formautofill", "screenshots", "webcompat", "report-site-issue"]
++DIRS += ["formautofill", "screenshots"]
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
-index 05f0242..7c9737a 100644
+index 496379c..dd6f359 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
-@@ -61,7 +61,6 @@ libs-%:
+@@ -61,7 +61,6 @@ l10n-%:
ifneq (,$(wildcard ../extensions/formautofill/locales))
@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
endif
- @$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
- @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
+ @$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
@@ -82,7 +81,6 @@ endif
@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
@$(MAKE) chrome AB_CD=$*
@@ -34,17 +29,17 @@ index 05f0242..7c9737a 100644
package-win32-installer: $(SUBMAKEFILES)
$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
diff --git a/browser/locales/filter.py b/browser/locales/filter.py
-index 1fc9b14..d8a9ee2 100755
+index bb2e992..7d7768e 100644
--- a/browser/locales/filter.py
+++ b/browser/locales/filter.py
-@@ -13,7 +13,6 @@ def test(mod, path, entity=None):
- "browser",
- "browser/extensions/formautofill",
- "browser/extensions/fxmonitor",
-- "browser/extensions/report-site-issue",
- "extensions/spellcheck",
- "other-licenses/branding/firefox",
- "browser/branding/official",
+@@ -20,7 +20,6 @@ def test(mod, path, entity=None):
+ "browser",
+ "browser/extensions/formautofill",
+ "browser/extensions/fxmonitor",
+- "browser/extensions/report-site-issue",
+ "extensions/spellcheck",
+ "other-licenses/branding/firefox",
+ "browser/branding/official",
diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
index f4cb7ca..4efac13 100644
--- a/browser/locales/l10n.ini
@@ -58,7 +53,7 @@ index f4cb7ca..4efac13 100644
[includes]
# non-central apps might want to use %(topsrcdir)s here, or other vars
diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
-index 0b53c52..f8b605d 100644
+index b9b18fe..af7c583 100644
--- a/browser/locales/l10n.toml
+++ b/browser/locales/l10n.toml
@@ -133,10 +133,6 @@ locales = [
bgstack15