thunderbird: 91.1.0 -> 91.1.1
no-buildconfig-90.patch is applied by firefox/common.nix. D124361.diff is incorporated into the upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1727113
This commit is contained in:
parent
22fb3ec5a0
commit
5a690eb641
@ -1,22 +0,0 @@
|
|||||||
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)
|
|
||||||
|
|
@ -2,21 +2,14 @@
|
|||||||
|
|
||||||
callPackage (import ../../../browsers/firefox/common.nix rec {
|
callPackage (import ../../../browsers/firefox/common.nix rec {
|
||||||
pname = "thunderbird";
|
pname = "thunderbird";
|
||||||
ffversion = "91.1.0";
|
ffversion = "91.1.1";
|
||||||
application = "comm/mail";
|
application = "comm/mail";
|
||||||
binaryName = pname;
|
binaryName = pname;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://mozilla/thunderbird/releases/${ffversion}/source/thunderbird-${ffversion}.source.tar.xz";
|
url = "mirror://mozilla/thunderbird/releases/${ffversion}/source/thunderbird-${ffversion}.source.tar.xz";
|
||||||
sha512 = "3zl164k4lp7m33s0097cbf8kbb4v1rs1q2qr58bsrdpc65fh20k88s1yd9h5phvydml14y6b1p2fhx723dcrcfkagdjhp3wsqjzyrf4";
|
sha512 = "2da102f9ec42489fc785ccdabcc7fdbc826f2df5e8e76c65866a44a221e762f59647ea265fe4907c18f0d3f1e04199e809235b4587ea17bdc1155e829f57ff2f";
|
||||||
};
|
};
|
||||||
patches = [
|
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; {
|
meta = with lib; {
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies.
|
|
||||||
--- a/comm/mail/base/jar.mn
|
|
||||||
+++ b/comm/mail/base/jar.mn
|
|
||||||
@@ -119,9 +119,6 @@ messenger.jar:
|
|
||||||
% override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js
|
|
||||||
% override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml
|
|
||||||
|
|
||||||
-* content/messenger/buildconfig.html (content/buildconfig.html)
|
|
||||||
-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html
|
|
||||||
-
|
|
||||||
# L10n resources and overrides.
|
|
||||||
% override chrome://mozapps/locale/profile/profileDowngrade.dtd chrome://messenger/locale/profileDowngrade.dtd
|
|
||||||
% override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd
|
|
Loading…
x
Reference in New Issue
Block a user