Merge #136685: thunderbird-91: patch an addon problem

This commit is contained in:
Vladimír Čunát 2021-09-05 20:54:26 +02:00
commit 7cf9185aae
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 28 additions and 0 deletions

View File

@ -0,0 +1,22 @@
diff --git a/comm/mail/config/mozconfigs/common b/comm/mail/config/mozconfigs/common
--- a/comm/mail/config/mozconfigs/common
+++ b/comm/mail/config/mozconfigs/common
@@ -1,6 +1,3 @@
ac_add_options --enable-application=comm/mail
-# Disable enforcing that add-ons are signed by the trusted root.
-MOZ_REQUIRE_SIGNING=
-
. "$topsrcdir/build/mozconfig.common.override"
diff --git a/comm/mail/moz.configure b/comm/mail/moz.configure
--- a/comm/mail/moz.configure
+++ b/comm/mail/moz.configure
@@ -12,6 +12,7 @@
imply_option("MOZ_CRASHREPORTER_URL", "https://crash-reports.thunderbird.net/")
imply_option("--enable-default-browser-agent", False)
+imply_option("MOZ_REQUIRE_SIGNING", False)
@depends(target_is_windows, target_is_linux)

View File

@ -11,6 +11,12 @@ callPackage (import ../../../browsers/firefox/common.nix rec {
};
patches = [
./no-buildconfig-90.patch
# There is a bug in Thunderbird 91 where add-ons are required
# to be signed when the build is run with default settings.
# https://bugzilla.mozilla.org/show_bug.cgi?id=1727113
# https://phabricator.services.mozilla.com/D124361
./D124361.diff
];
meta = with lib; {